diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 23:37:41 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 23:37:41 +0000 |
| commit | a2dd7fa198230339703576a427afe86cb5f9cc42 (patch) | |
| tree | 82d8a7e74c7ca4cda68e9ddb50240dbb2ab775d4 /mojo/gles2/command_buffer_client_impl.cc | |
| parent | 1e2179d71f4c64e18d5102bc1190dc168ae525cd (diff) | |
| download | chromium_src-a2dd7fa198230339703576a427afe86cb5f9cc42.zip chromium_src-a2dd7fa198230339703576a427afe86cb5f9cc42.tar.gz chromium_src-a2dd7fa198230339703576a427afe86cb5f9cc42.tar.bz2 | |
Fix typo in mojo CommandBufferClientImpl::WaitForGetOffsetInRange
https://codereview.chromium.org/189123004/ had a typo in WaitForGetOffsetInRange
causing it to loop on the token instead of get offset, often leading to deadlocks.
This broke the mojo sample app which we do not have good automated test
coverage of.
R=jbauman
Review URL: https://codereview.chromium.org/196243005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/gles2/command_buffer_client_impl.cc')
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 213518a..60bb96a 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -91,7 +91,7 @@ void CommandBufferClientImpl::WaitForTokenInRange(int32 start, int32 end) { void CommandBufferClientImpl::WaitForGetOffsetInRange(int32 start, int32 end) { TryUpdateState(); - while (!InRange(start, end, last_state_.token) && + while (!InRange(start, end, last_state_.get_offset) && last_state_.error == gpu::error::kNoError) { MakeProgressAndUpdateState(); TryUpdateState(); |