Revert 93066 - Execute all GL commands up to the put offset reported by a each flush.This means g...

gpu/command_buffer/service/gpu_scheduler.h

 // Copyright (c) 2011 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_SERVICE_GPU_SCHEDULER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_
 
 #include <map>
 #include <queue>
 #include <vector>
@@ skipping 25 matching lines @@
 
 namespace gpu {
 namespace gles2 {
 class ContextGroup;
 }
 
 // This class processes commands in a command buffer. It is event driven and
 // posts tasks to the current message loop to do additional work.
 class GpuScheduler : public CommandBufferEngine {
  public:
+  // Scheduler quantum: makes ProcessCommands continue until the specified time
+  // has passed, or the command buffer yields or runs out of commands.
+  static const int kMinimumSchedulerQuantumMicros = 2000;
+
   // If a group is not passed in one will be created.
-  static GpuScheduler* Create(CommandBuffer* command_buffer,
-                              SurfaceManager* surface_manager,
-                              gles2::ContextGroup* group);
+  GpuScheduler(CommandBuffer* command_buffer,
+               SurfaceManager* surface_manager,
+               gles2::ContextGroup* group);
 
   // This constructor is for unit tests.
-  static GpuScheduler* CreateForTests(CommandBuffer* command_buffer,
-                                      gles2::GLES2Decoder* decoder,
-                                      CommandParser* parser);
+  GpuScheduler(CommandBuffer* command_buffer,
+               gles2::GLES2Decoder* decoder,
+               CommandParser* parser,
+               int commands_per_update);
 
   virtual ~GpuScheduler();
 
   // Perform platform specific and common initialization.
   bool Initialize(gfx::PluginWindowHandle hwnd,
                   const gfx::Size& size,
                   const gles2::DisallowedExtensions& disallowed_extensions,
                   const char* allowed_extensions,
                   const std::vector<int32>& attribs,
                   gfx::GLShareGroup* share_group);
 
   void Destroy();
   void DestroyCommon();
 
   bool SetParent(GpuScheduler* parent_scheduler, uint32 parent_texture_id);
 
-  void PutChanged();
+  void PutChanged(bool sync);
 
   // Sets whether commands should be processed by this scheduler. Setting to
   // false unschedules. Setting to true reschedules. Whether or not the
   // scheduler is currently scheduled is "reference counted". Every call with
   // false must eventually be paired by a call with true.
   void SetScheduled(bool is_scheduled);
 
   // Returns whether the scheduler is currently scheduled to process commands.
   bool IsScheduled();
 
@@ skipping 57 matching lines @@
   // is processed.
   void SetResizeCallback(Callback1<gfx::Size>::Type* callback);
 
   // Sets a callback which is called when a SwapBuffers command is processed.
   // Must be called after Initialize().
   // It is not defined on which thread this callback is called.
   void SetSwapBuffersCallback(Callback0::Type* callback);
 
   void SetCommandProcessedCallback(Callback0::Type* callback);
 
+  // Sets a callback which is called after a Set/WaitLatch command is processed.
+  // The bool parameter will be true for SetLatch, and false for a WaitLatch
+  // that is blocked. An unblocked WaitLatch will not trigger a callback.
+  void SetLatchCallback(const base::Callback<void(bool)>& callback) {
+    decoder_->SetLatchCallback(callback);
+  }
+
   // Sets a callback which is called when set_token() is called, and passes the
   // just-set token to the callback.  DCHECKs that no callback has previously
   // been registered for this notification.
   void SetTokenCallback(const base::Callback<void(int32)>& callback);
 
   // Get the GLES2Decoder associated with this scheduler.
   gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
 
  protected:
   // Perform common initialization. Takes ownership of GLSurface and GLContext.
   bool InitializeCommon(
       const scoped_refptr<gfx::GLSurface>& surface,
       const scoped_refptr<gfx::GLContext>& context,
       const gfx::Size& size,
       const gles2::DisallowedExtensions& disallowed_extensions,
       const char* allowed_extensions,
       const std::vector<int32>& attribs);
 
 
  private:
-  // If a group is not passed in one will be created.
-  GpuScheduler(CommandBuffer* command_buffer,
-               gles2::GLES2Decoder* decoder,
-               CommandParser* parser);
+  // Helper which causes a call to ProcessCommands to be scheduled later.
+  void ScheduleProcessCommands();
 
   // Called via a callback just before we are supposed to call the
   // user's resize callback.
   void WillResize(gfx::Size size);
 
   // Called via a callback just before we are supposed to call the
   // user's swap buffers callback.
   void WillSwapBuffers();
+  void ProcessCommands();
 
   // The GpuScheduler holds a weak reference to the CommandBuffer. The
   // CommandBuffer owns the GpuScheduler and holds a strong reference to it
   // through the ProcessCommands callback.
   CommandBuffer* command_buffer_;
 
+  int commands_per_update_;
+
   scoped_ptr<gles2::GLES2Decoder> decoder_;
   scoped_ptr<CommandParser> parser_;
 
   // Greater than zero if this is waiting to be rescheduled before continuing.
   int unscheduled_count_;
 
   scoped_ptr<Callback0::Type> scheduled_callback_;
 
 #if defined(OS_MACOSX) || defined(TOUCH_UI)
   uint64 swap_buffers_count_;
@@ skipping 12 matching lines @@
   ScopedRunnableMethodFactory<GpuScheduler> method_factory_;
   scoped_ptr<Callback1<gfx::Size>::Type> wrapped_resize_callback_;
   scoped_ptr<Callback0::Type> wrapped_swap_buffers_callback_;
   scoped_ptr<Callback0::Type> command_processed_callback_;
   base::Callback<void(int32)> set_token_callback_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_