| Index: gpu/command_buffer/service/gpu_scheduler.cc
|
| diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
|
| index f37c1a04249b5ec633af764b6406fe1578e2ff77..468f817f32970a79d988ba05a3659a0f89783ad2 100644
|
| --- a/gpu/command_buffer/service/gpu_scheduler.cc
|
| +++ b/gpu/command_buffer/service/gpu_scheduler.cc
|
| @@ -29,21 +29,6 @@ GpuScheduler::GpuScheduler(CommandBuffer* 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() {
|
| @@ -150,6 +135,29 @@ void GpuScheduler::set_token(int32 token) {
|
| command_buffer_->SetToken(token);
|
| }
|
|
|
| +bool GpuScheduler::SetGetBuffer(int32 transfer_buffer_id) {
|
| + // NOTE: This seems kind of strange. We need to update both the parser
|
| + // AND the command buffer.
|
| + 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);
|
| +
|
| + command_buffer_->SetGetBuffer(transfer_buffer_id);
|
| + SetGetOffset(0);
|
| + return true;
|
| +}
|
| +
|
| bool GpuScheduler::SetGetOffset(int32 offset) {
|
| if (parser_->set_get(offset)) {
|
| command_buffer_->SetGetOffset(static_cast<int32>(parser_->get()));
|
|
|