gpu: Allow waiting on sync tokens without sync token client.

gpu/command_buffer/service/gles2_cmd_decoder.h

 // 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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include <stdint.h>
@@ skipping 18 matching lines @@
 class GLSurface;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace gpu {
 
 struct Mailbox;
+struct SyncToken;
 
 namespace gles2 {
 
 class ContextGroup;
 class ErrorState;
 class FeatureInfo;
 class GLES2Util;
 class ImageManager;
 class Logger;
 class QueryManager;
@@ skipping 29 matching lines @@
 typedef base::Callback<void(const std::string& key,
                             const std::string& shader)> ShaderCacheCallback;
 
 // This class implements the AsyncAPIInterface interface, decoding GLES2
 // commands and calling GL.
 class GPU_EXPORT GLES2Decoder : public base::SupportsWeakPtr<GLES2Decoder>,
                                 public CommonDecoder {
  public:
   typedef error::Error Error;
   typedef base::Callback<void(uint64_t release)> FenceSyncReleaseCallback;
-  typedef base::Callback<bool(gpu::CommandBufferNamespace namespace_id,
-                              gpu::CommandBufferId command_buffer_id,
-                              uint64_t release)>
-      WaitFenceSyncCallback;
+  typedef base::Callback<bool(const gpu::SyncToken&)> WaitSyncTokenCallback;
   typedef base::Callback<void(void)> NoParamCallback;
 
   // The default stencil mask, which has all bits set.  This really should be a
   // GLuint, but we can't #include gl_bindings.h in this file without causing
   // macro redefinitions.
   static const unsigned int kDefaultStencilMask;
 
   // Creates a decoder.
   static GLES2Decoder* Create(ContextGroup* group);
 
@@ skipping 172 matching lines @@
                             int width,
                             int height,
                             int depth) = 0;
 
   virtual ErrorState* GetErrorState() = 0;
 
   // A callback for messages from the decoder.
   virtual void SetShaderCacheCallback(const ShaderCacheCallback& callback) = 0;
 
   // Sets the callback for fence sync release and wait calls. The wait call
-  // returns true if the channel is still scheduled.
+  // returns false if the wait was a nop or invalid and the command buffer is
+  // still scheduled.
   virtual void SetFenceSyncReleaseCallback(
       const FenceSyncReleaseCallback& callback) = 0;
-  virtual void SetWaitFenceSyncCallback(
-      const WaitFenceSyncCallback& callback) = 0;
+  virtual void SetWaitSyncTokenCallback(
+      const WaitSyncTokenCallback& callback) = 0;
 
   // Sets the callback for the DescheduleUntilFinished and
   // RescheduleAfterFinished calls.
   virtual void SetDescheduleUntilFinishedCallback(
       const NoParamCallback& callback) = 0;
   virtual void SetRescheduleAfterFinishedCallback(
       const NoParamCallback& callback) = 0;
 
   virtual void WaitForReadPixels(base::Closure callback) = 0;
   virtual uint32_t GetTextureUploadCount() = 0;
@@ skipping 35 matching lines @@
   bool initialized_;
   bool debug_;
   bool log_commands_;
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_