Deschedule command buffer while polling fences

Use the normal deschedule path when waiting for fences, and use a separate callback to poll for the fences to complete (not the normal rescheduled command buffer message). This lets us run commands on other command buffers while waiting for this command buffer to finish.

BUG=112349


Review URL: http://codereview.chromium.org/9553012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125234 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 5 deletions

diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index 7df1b16..fc9593d4 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -191,6 +191,7 @@ void GpuScheduler::SetCommandProcessedCallback(
 void GpuScheduler::DeferToFence(base::Closure task) {
   unschedule_fences_.push(make_linked_ptr(
        new UnscheduleFence(gfx::GLFence::Create(), task)));
+  SetScheduled(false);
 }
 
 bool GpuScheduler::PollUnscheduleFences() {
@@ -202,6 +203,7 @@ bool GpuScheduler::PollUnscheduleFences() {
       if (unschedule_fences_.front()->fence->HasCompleted()) {
         unschedule_fences_.front()->task.Run();
         unschedule_fences_.pop();
+        SetScheduled(true);
       } else {
         return false;
       }
@@ -212,6 +214,7 @@ bool GpuScheduler::PollUnscheduleFences() {
     while (!unschedule_fences_.empty()) {
       unschedule_fences_.front()->task.Run();
       unschedule_fences_.pop();
+      SetScheduled(true);
     }
   }
 
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index a03ffdf..2ae048b 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -67,15 +67,15 @@ class GPU_EXPORT GpuScheduler
 
   void DeferToFence(base::Closure task);
 
+  // Polls the fences, invoking callbacks that were waiting to be triggered
+  // by them and returns whether all fences were complete.
+  bool PollUnscheduleFences();
+
   CommandParser* parser() const {
     return parser_.get();
   }
 
  private:
-  // Polls the fences, invoking callbacks that were waiting to be triggered
-  // by them and returns whether all fences were complete.
-  bool PollUnscheduleFences();
-
   // Artificially reschedule if the scheduler is still unscheduled after a
   // timeout.
   void RescheduleTimeOut();