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

gpu/command_buffer/client/cmd_buffer_helper.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.
 
 // This file contains the implementation of the command buffer helper class.
 
 #include "../client/cmd_buffer_helper.h"
 #include "../common/command_buffer.h"
 #include "../common/trace_event.h"
 
 namespace gpu {
 
 namespace {
 const int kCommandsPerFlushCheck = 100;
 const double kFlushDelay = 1.0 / (5.0 * 60.0);
 }
 
 CommandBufferHelper::CommandBufferHelper(CommandBuffer* command_buffer)
     : command_buffer_(command_buffer),
-      ring_buffer_id_(-1),
-      ring_buffer_size_(0),
       entries_(NULL),
       total_entry_count_(0),
       usable_entry_count_(0),
       token_(0),
       put_(0),
       last_put_sent_(0),
       commands_issued_(0),
       last_flush_time_(0) {
 }
 
-bool CommandBufferHelper::AllocateRingBuffer() {
-  int32 id = command_buffer_->CreateTransferBuffer(ring_buffer_size_, -1);
-  if (id < 0) {
-    return false;
-  }
-
-  ring_buffer_ = command_buffer_->GetTransferBuffer(id);
+bool CommandBufferHelper::Initialize(int32 ring_buffer_size) {
+  ring_buffer_ = command_buffer_->GetRingBuffer();
   if (!ring_buffer_.ptr)
     return false;
 
-  ring_buffer_id_ = id;
-  command_buffer_->SetGetBuffer(id);
-
-  // TODO(gman): Do we really need to call GetState here? We know get & put = 0
-  // Also do we need to check state.num_entries?
   CommandBuffer::State state = command_buffer_->GetState();
   entries_ = static_cast<CommandBufferEntry*>(ring_buffer_.ptr);
-  int32 num_ring_buffer_entries =
-      ring_buffer_size_ / sizeof(CommandBufferEntry);
+  int32 num_ring_buffer_entries = ring_buffer_size / sizeof(CommandBufferEntry);
   if (num_ring_buffer_entries > state.num_entries) {
     return false;
   }
 
   const int32 kJumpEntries =
       sizeof(cmd::Jump) / sizeof(*entries_);  // NOLINT
 
   total_entry_count_ = num_ring_buffer_entries;
   usable_entry_count_ = total_entry_count_ - kJumpEntries;
   put_ = state.put_offset;
   return true;
 }
 
-bool CommandBufferHelper::Initialize(int32 ring_buffer_size) {
-  ring_buffer_size_ = ring_buffer_size;
-  return AllocateRingBuffer();
-}
-
 CommandBufferHelper::~CommandBufferHelper() {
 }
 
 bool CommandBufferHelper::FlushSync() {
   last_flush_time_ = clock();
   last_put_sent_ = put_;
   CommandBuffer::State state = command_buffer_->FlushSync(put_, get_offset());
   return state.error == error::kNoError;
 }
 
@@ skipping 120 matching lines @@
   }
   return space;
 }
 
 error::Error CommandBufferHelper::GetError() {
   CommandBuffer::State state = command_buffer_->GetState();
   return static_cast<error::Error>(state.error);
 }
 
 }  // namespace gpu