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/transfer_buffer.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/transfer_buffer.cc')
| -rw-r--r-- | gpu/command_buffer/client/transfer_buffer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/transfer_buffer.cc b/gpu/command_buffer/client/transfer_buffer.cc index 7492159..7e0b25f 100644 --- a/gpu/command_buffer/client/transfer_buffer.cc +++ b/gpu/command_buffer/client/transfer_buffer.cc @@ -81,9 +81,9 @@ void TransferBuffer::FreePendingToken(void* p, unsigned int token) { void TransferBuffer::AllocateRingBuffer(unsigned int size) { for (;size >= min_buffer_size_; size /= 2) { - int32 id = -1; - buffer_ = helper_->command_buffer()->CreateTransferBuffer(size, &id); + int32 id = helper_->command_buffer()->CreateTransferBuffer(size, -1); if (id != -1) { + buffer_ = helper_->command_buffer()->GetTransferBuffer(id); ring_buffer_.reset(new AlignedRingBuffer( alignment_, id, |