diff options
author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:34:07 +0000 |
---|---|---|
committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:34:07 +0000 |
commit | 392fbb3dd27259adc0a0ff1127bc19ad5c317ce5 (patch) | |
tree | e5bf30506de98cae91afbfb48ea38a6a9e84fb47 /gpu/command_buffer/client/client_test_helper.cc | |
parent | 1eebbf98440fdb3fed0e8a921c2e31474f91bb1e (diff) | |
download | chromium_src-392fbb3dd27259adc0a0ff1127bc19ad5c317ce5.zip chromium_src-392fbb3dd27259adc0a0ff1127bc19ad5c317ce5.tar.gz chromium_src-392fbb3dd27259adc0a0ff1127bc19ad5c317ce5.tar.bz2 |
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
Diffstat (limited to 'gpu/command_buffer/client/client_test_helper.cc')
-rw-r--r-- | gpu/command_buffer/client/client_test_helper.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gpu/command_buffer/client/client_test_helper.cc b/gpu/command_buffer/client/client_test_helper.cc index 92af99d..d9942ef 100644 --- a/gpu/command_buffer/client/client_test_helper.cc +++ b/gpu/command_buffer/client/client_test_helper.cc @@ -60,15 +60,16 @@ int32 MockCommandBufferBase::GetNextFreeTransferBufferId() { return -1; } -Buffer MockCommandBufferBase::CreateTransferBuffer(size_t size, int32* id) { - *id = GetNextFreeTransferBufferId(); - if (*id >= 0) { - int32 ndx = *id - kTransferBufferBaseId; +int32 MockCommandBufferBase::CreateTransferBuffer( + size_t size, int32 id_request) { + int32 id = GetNextFreeTransferBufferId(); + if (id >= 0) { + int32 ndx = id - kTransferBufferBaseId; transfer_buffers_[ndx].reset(new int8[size]); transfer_buffer_buffers_[ndx].ptr = transfer_buffers_[ndx].get(); transfer_buffer_buffers_[ndx].size = size; } - return GetTransferBuffer(*id); + return id; } void MockCommandBufferBase::DestroyTransferBufferHelper(int32 id) { @@ -85,6 +86,14 @@ Buffer MockCommandBufferBase::GetTransferBuffer(int32 id) { return transfer_buffer_buffers_[id - kTransferBufferBaseId]; } +int32 MockCommandBufferBase::RegisterTransferBuffer( + base::SharedMemory* shared_memory, + size_t size, + int32 id_request) { + GPU_NOTREACHED(); + return -1; +} + void MockCommandBufferBase::FlushHelper(int32 put_offset) { state_.put_offset = put_offset; } |