List sync points to wait on in AsyncFlush message

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 636 matching lines @@
 
   Logger* GetLogger() override;
 
   void BeginDecoding() override;
   void EndDecoding() override;
 
   ErrorState* GetErrorState() override;
   const ContextState* GetContextState() override { return &state_; }
 
   void SetShaderCacheCallback(const ShaderCacheCallback& callback) override;
-  void SetWaitSyncPointCallback(const WaitSyncPointCallback& callback) override;
 
   AsyncPixelTransferManager* GetAsyncPixelTransferManager() override;
   void ResetAsyncPixelTransferManagerForTest() override;
   void SetAsyncPixelTransferManagerForTest(
       AsyncPixelTransferManager* manager) override;
   void SetIgnoreCachedStateForTest(bool ignore) override;
   void ProcessFinishedAsyncTransfers();
 
   bool GetServiceTextureId(uint32 client_texture_id,
                            uint32* service_texture_id) override;
@@ skipping 1112 matching lines @@
   GLenum offscreen_saved_color_format_;
 
   scoped_ptr<QueryManager> query_manager_;
 
   scoped_ptr<VertexArrayManager> vertex_array_manager_;
 
   scoped_ptr<ImageManager> image_manager_;
 
   base::Callback<void(gfx::Size, float)> resize_callback_;
 
-  WaitSyncPointCallback wait_sync_point_callback_;
-
   ShaderCacheCallback shader_cache_callback_;
 
   scoped_ptr<AsyncPixelTransferManager> async_pixel_transfer_manager_;
 
   // The format of the back buffer_
   GLenum back_buffer_color_format_;
   bool back_buffer_has_depth_;
   bool back_buffer_has_stencil_;
 
   bool surfaceless_;
@@ skipping 1690 matching lines @@
 
 ErrorState* GLES2DecoderImpl::GetErrorState() {
   return state_.GetErrorState();
 }
 
 void GLES2DecoderImpl::SetShaderCacheCallback(
     const ShaderCacheCallback& callback) {
   shader_cache_callback_ = callback;
 }
 
-void GLES2DecoderImpl::SetWaitSyncPointCallback(
-    const WaitSyncPointCallback& callback) {
-  wait_sync_point_callback_ = callback;
-}
-
 AsyncPixelTransferManager*
     GLES2DecoderImpl::GetAsyncPixelTransferManager() {
   return async_pixel_transfer_manager_.get();
 }
 
 void GLES2DecoderImpl::ResetAsyncPixelTransferManagerForTest() {
   async_pixel_transfer_manager_.reset();
 }
 
 void GLES2DecoderImpl::SetAsyncPixelTransferManagerForTest(
@@ skipping 6415 matching lines @@
   reset_status_ = reset_status;
   current_decoder_error_ = error::kLostContext;
 }
 
 error::Error GLES2DecoderImpl::HandleInsertSyncPointCHROMIUM(
     uint32 immediate_data_size,
     const void* cmd_data) {
   return error::kUnknownCommand;
 }
 
-error::Error GLES2DecoderImpl::HandleWaitSyncPointCHROMIUM(
-    uint32 immediate_data_size,
-    const void* cmd_data) {
-  const gles2::cmds::WaitSyncPointCHROMIUM& c =
-      *static_cast<const gles2::cmds::WaitSyncPointCHROMIUM*>(cmd_data);
-  uint32 sync_point = c.sync_point;
-  if (wait_sync_point_callback_.is_null())
-    return error::kNoError;
-
-  return wait_sync_point_callback_.Run(sync_point) ?
-      error::kNoError : error::kDeferCommandUntilLater;
-}
-
 error::Error GLES2DecoderImpl::HandleDiscardBackbufferCHROMIUM(
     uint32 immediate_data_size,
     const void* cmd_data) {
   if (surface_->DeferDraws())
     return error::kDeferCommandUntilLater;
   if (!surface_->SetBackbufferAllocation(false))
     return error::kLostContext;
   backbuffer_needs_clear_bits_ |= GL_COLOR_BUFFER_BIT;
   backbuffer_needs_clear_bits_ |= GL_DEPTH_BUFFER_BIT;
   backbuffer_needs_clear_bits_ |= GL_STENCIL_BUFFER_BIT;
@@ skipping 21 matching lines @@
       if (it != state_.current_queries.end())
         state_.current_queries.erase(it);
 
       query->Destroy(true);
     }
     query_manager_->RemoveQuery(client_ids[ii]);
   }
 }
 
 bool GLES2DecoderImpl::ProcessPendingQueries(bool did_finish) {
+  MakeCurrent();
   if (query_manager_.get() == NULL) {
     return false;
   }
   if (!query_manager_->ProcessPendingQueries(did_finish)) {
     current_decoder_error_ = error::kOutOfBounds;
   }
   return query_manager_->HavePendingQueries();
 }
 
 // Note that if there are no pending readpixels right now,
@@ skipping 1490 matching lines @@
   }
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu