| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index 1d642fd1d16cc08c26481deb1f9100971493ddb9..9fc03a66f55553d66578e8a79fd611dc1affbe6f 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -627,6 +627,8 @@ class GLES2DecoderImpl : public GLES2Decoder {
|
| return vertex_array_manager_.get();
|
| }
|
| virtual bool ProcessPendingQueries() OVERRIDE;
|
| + virtual bool HasMoreIdleWork() OVERRIDE;
|
| + virtual void PerformIdleWork() OVERRIDE;
|
|
|
| virtual void SetResizeCallback(
|
| const base::Callback<void(gfx::Size)>& callback) OVERRIDE;
|
| @@ -2862,6 +2864,8 @@ void GLES2DecoderImpl::ProcessFinishedAsyncTransfers() {
|
| // from the client, as the client may have recieved an async
|
| // completion while issuing those commands.
|
| // "DidFlushStart" would be ideal if we had such a callback.
|
| + // TODO(reveman): We should avoid using a bool return value to determine
|
| + // if we need to restore some state. crbug.com/196303
|
| if (async_pixel_transfer_delegate_->BindCompletedAsyncTransfers())
|
| RestoreCurrentTexture2DBindings();
|
| }
|
| @@ -9245,6 +9249,20 @@ bool GLES2DecoderImpl::ProcessPendingQueries() {
|
| return query_manager_->HavePendingQueries();
|
| }
|
|
|
| +bool GLES2DecoderImpl::HasMoreIdleWork() {
|
| + return async_pixel_transfer_delegate_->NeedsProcessMorePendingTransfers();
|
| +}
|
| +
|
| +void GLES2DecoderImpl::PerformIdleWork() {
|
| + if (!async_pixel_transfer_delegate_->NeedsProcessMorePendingTransfers())
|
| + return;
|
| + // TODO(reveman): We should avoid using a bool return value to determine
|
| + // if we need to restore some state. crbug.com/196303
|
| + if (async_pixel_transfer_delegate_->ProcessMorePendingTransfers())
|
| + RestoreCurrentTexture2DBindings();
|
| + ProcessFinishedAsyncTransfers();
|
| +}
|
| +
|
| error::Error GLES2DecoderImpl::HandleBeginQueryEXT(
|
| uint32 immediate_data_size, const cmds::BeginQueryEXT& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
|
|