From 392fbb3dd27259adc0a0ff1127bc19ad5c317ce5 Mon Sep 17 00:00:00 2001 From: "apatrick@google.com" Date: Fri, 14 Dec 2012 00:34:07 +0000 Subject: Revert 172805 > Made the registration and deletion of transfer buffers async. > > Added an IPC to request multiple transfer buffer IDs up front. > > Every renderer command buffer proxy gets some IPCs immediately after initialization. > > Removed request_id arg from CreateTransferBuffer. It wasn't being used. > > Review URL: https://chromiumcodereview.appspot.com/11308296 TBR=apatrick@chromium.org Review URL: https://codereview.chromium.org/11578020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173018 0039d316-1c4b-4281-b951-d872f2087c98 --- .../service/command_buffer_service.cc | 41 +++++++--------------- 1 file changed, 13 insertions(+), 28 deletions(-) (limited to 'gpu/command_buffer/service/command_buffer_service.cc') diff --git a/gpu/command_buffer/service/command_buffer_service.cc b/gpu/command_buffer/service/command_buffer_service.cc index 391f335..8b00595 100644 --- a/gpu/command_buffer/service/command_buffer_service.cc +++ b/gpu/command_buffer/service/command_buffer_service.cc @@ -116,26 +116,20 @@ void CommandBufferService::SetGetOffset(int32 get_offset) { get_offset_ = get_offset; } -Buffer CommandBufferService::CreateTransferBuffer(size_t size, - int32* id) { - *id = -1; - - SharedMemory buffer; - if (!buffer.CreateAnonymous(size)) - return Buffer(); - - static int32 next_id = 1; - *id = next_id++; - - if (!RegisterTransferBuffer(*id, &buffer, size)) - return Buffer(); +int32 CommandBufferService::CreateTransferBuffer(size_t size, + int32 id_request) { + return transfer_buffer_manager_->CreateTransferBuffer(size, id_request); +} - return GetTransferBuffer(*id); +int32 CommandBufferService::RegisterTransferBuffer( + base::SharedMemory* shared_memory, size_t size, int32 id_request) { + return transfer_buffer_manager_->RegisterTransferBuffer( + shared_memory, size, id_request); } -void CommandBufferService::DestroyTransferBuffer(int32 id) { - transfer_buffer_manager_->DestroyTransferBuffer(id); - if (id == ring_buffer_id_) { +void CommandBufferService::DestroyTransferBuffer(int32 handle) { + transfer_buffer_manager_->DestroyTransferBuffer(handle); + if (handle == ring_buffer_id_) { ring_buffer_id_ = -1; ring_buffer_ = Buffer(); num_entries_ = 0; @@ -144,17 +138,8 @@ void CommandBufferService::DestroyTransferBuffer(int32 id) { } } -Buffer CommandBufferService::GetTransferBuffer(int32 id) { - return transfer_buffer_manager_->GetTransferBuffer(id); -} - -bool CommandBufferService::RegisterTransferBuffer( - int32 id, - base::SharedMemory* shared_memory, - size_t size) { - return transfer_buffer_manager_->RegisterTransferBuffer(id, - shared_memory, - size); +Buffer CommandBufferService::GetTransferBuffer(int32 handle) { + return transfer_buffer_manager_->GetTransferBuffer(handle); } void CommandBufferService::SetToken(int32 token) { -- cgit v1.1