Implemented new fence syncs which replaces the old sync points.

gpu/command_buffer/tests/gl_manager.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.
 
 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 class GLContext;
 class GLShareGroup;
 class GLSurface;
 
 }
 
 namespace gpu {
 
 class CommandBufferService;
 class GpuScheduler;
+class SyncPointClient;
+class SyncPointOrderData;
+class SyncPointManager;
 class TransferBuffer;
 
 namespace gles2 {
 
 class ContextGroup;
 class MailboxManager;
 class GLES2Decoder;
 class GLES2CmdHelper;
 class GLES2Implementation;
 class ImageManager;
 class ShareGroup;
 
 };
 
 class GLManager : private GpuControl {
  public:
   struct Options {
     Options();
     // The size of the backbuffer.
     gfx::Size size;
+    // If not null will have a corresponding sync point manager.
+    SyncPointManager* sync_point_manager;
     // If not null will share resources with this context.
     GLManager* share_group_manager;
     // If not null will share a mailbox manager with this context.
     GLManager* share_mailbox_manager;
     // If not null will create a virtual manager based on this context.
     GLManager* virtual_manager;
     // Whether or not glBindXXX generates a resource.
     bool bind_generates_resource;
     // Whether or not the context is auto-lost when GL_OUT_OF_MEMORY occurs.
     bool lose_context_when_out_of_memory;
@@ skipping 57 matching lines @@
   void RetireSyncPoint(uint32 sync_point) override;
   void SignalSyncPoint(uint32 sync_point,
                        const base::Closure& callback) override;
   void SignalQuery(uint32 query, const base::Closure& callback) override;
   void SetSurfaceVisible(bool visible) override;
   uint32 CreateStreamTexture(uint32 texture_id) override;
   void SetLock(base::Lock*) override;
   bool IsGpuChannelLost() override;
   gpu::CommandBufferNamespace GetNamespaceID() const override;
   uint64_t GetCommandBufferID() const override;
+  uint64_t GenerateFenceSyncRelease() override;
+  bool IsFenceSyncRelease(uint64_t release) override;
+  bool IsFenceSyncFlushed(uint64_t release) override;
 
  private:
   void PumpCommands();
   bool GetBufferChanged(int32 transfer_buffer_id);
   void SetupBaseContext();
+  void OnFenceSyncRelease(uint64_t release);
+  bool OnWaitFenceSync(gpu::CommandBufferNamespace namespace_id,
+                       uint64_t command_buffer_id,
+                       uint64_t release);
 
+  SyncPointManager* sync_point_manager_;  // Non-owning.
+
+  scoped_refptr<SyncPointOrderData> sync_point_order_data_;
+  scoped_ptr<SyncPointClient> sync_point_client_;
   scoped_refptr<gles2::MailboxManager> mailbox_manager_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr<gles2::GLES2Decoder> decoder_;
   scoped_ptr<GpuScheduler> gpu_scheduler_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_ptr<gles2::GLES2CmdHelper> gles2_helper_;
   scoped_ptr<TransferBuffer> transfer_buffer_;
   scoped_ptr<gles2::GLES2Implementation> gles2_implementation_;
   bool context_lost_allowed_;
 
+  const uint64_t command_buffer_id_;
+  uint64_t next_fence_sync_release_;
+
   // Used on Android to virtualize GL for all contexts.
   static int use_count_;
   static scoped_refptr<gfx::GLShareGroup>* base_share_group_;
   static scoped_refptr<gfx::GLSurface>* base_surface_;
   static scoped_refptr<gfx::GLContext>* base_context_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_