Revert "Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer""

gpu/command_buffer/service/gpu_scheduler.cc

 // 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.
 
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 using ::base::SharedMemory;
 
 namespace gpu {
 
 GpuScheduler::GpuScheduler(CommandBuffer* command_buffer,
                            gles2::GLES2Decoder* decoder,
                            CommandParser* parser)
     : command_buffer_(command_buffer),
       decoder_(decoder),
       parser_(parser),
       unscheduled_count_(0) {
-  // Map the ring buffer and create the parser.
-  if (!parser) {
-    Buffer ring_buffer = command_buffer_->GetRingBuffer();
-    if (ring_buffer.ptr) {
-      parser_.reset(new CommandParser(ring_buffer.ptr,
-                                      ring_buffer.size,
-                                      0,
-                                      ring_buffer.size,
-                                      0,
-                                      decoder_));
-    } else {
-      parser_.reset(new CommandParser(NULL, 0, 0, 0, 0,
-                                      decoder_));
-    }
-  }
 }
 
 GpuScheduler::~GpuScheduler() {
 }
 
 void GpuScheduler::PutChanged() {
   TRACE_EVENT1("gpu", "GpuScheduler:PutChanged", "this", this);
 
   CommandBuffer::State state = command_buffer_->GetState();
+
+  // If there is no parser, exit.
+  if (!parser_.get()) {
+    DCHECK_EQ(state.get_offset, state.put_offset);
+    return;
+  }
+
   parser_->set_put(state.put_offset);
   if (state.error != error::kNoError)
     return;
 
   // Check that the GPU has passed all fences.
   if (!PollUnscheduleFences())
     return;
 
   // One of the unschedule fence tasks might have unscheduled us.
   if (!IsScheduled())
@@ skipping 54 matching lines @@
 }
 
 Buffer GpuScheduler::GetSharedMemoryBuffer(int32 shm_id) {
   return command_buffer_->GetTransferBuffer(shm_id);
 }
 
 void GpuScheduler::set_token(int32 token) {
   command_buffer_->SetToken(token);
 }
 
+bool GpuScheduler::SetGetBuffer(int32 transfer_buffer_id) {
+  Buffer ring_buffer = command_buffer_->GetTransferBuffer(transfer_buffer_id);
+  if (!ring_buffer.ptr) {
+    return false;
+  }
+
+  if (!parser_.get()) {
+    parser_.reset(new CommandParser(decoder_));
+  }
+
+  parser_->SetBuffer(
+      ring_buffer.ptr,
+      ring_buffer.size,
+      0,
+      ring_buffer.size);
+
+  SetGetOffset(0);
+  return true;
+}
+
 bool GpuScheduler::SetGetOffset(int32 offset) {
   if (parser_->set_get(offset)) {
     command_buffer_->SetGetOffset(static_cast<int32>(parser_->get()));
     return true;
   }
   return false;
 }
 
 int32 GpuScheduler::GetGetOffset() {
   return parser_->get();
@@ skipping 54 matching lines @@
   return true;
 }
 
 GpuScheduler::UnscheduleFence::UnscheduleFence() : fence(0) {
 }
 
 GpuScheduler::UnscheduleFence::~UnscheduleFence() {
 }
 
 }  // namespace gpu