diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 23:33:07 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 23:33:07 +0000 |
| commit | 82ca9b9f30b2c497b9f224086de0089a6cb7a419 (patch) | |
| tree | 824b85b9a4af6c0c1c4a8e78f0c04d69b51e248a /gpu | |
| parent | ce774646f8d218901629e371e329e2b3c9a34ce4 (diff) | |
| download | chromium_src-82ca9b9f30b2c497b9f224086de0089a6cb7a419.zip chromium_src-82ca9b9f30b2c497b9f224086de0089a6cb7a419.tar.gz chromium_src-82ca9b9f30b2c497b9f224086de0089a6cb7a419.tar.bz2 | |
Revert 100801 - Ensure that compositor does not block the renderer process by issuing too many SwapBuffers.
This might have regressed with r84372. It caused there to be one additional token queued in the swap buffers token queue than before.
BUG=95649
Review URL: http://codereview.chromium.org/7867053
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7880009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 29db8d3..956ac62 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -964,9 +964,8 @@ void GLES2Implementation::SwapBuffers() { swap_buffers_tokens_.push(helper_->InsertToken()); helper_->SwapBuffers(); helper_->CommandBufferHelper::Flush(); - // Wait if we added too many swap buffers. Add 1 to kMaxSwapBuffers to - // compensate for TODO above. - if (swap_buffers_tokens_.size() > kMaxSwapBuffers + 1) { + // Wait if we added too many swap buffers. + if (swap_buffers_tokens_.size() > kMaxSwapBuffers) { helper_->WaitForToken(swap_buffers_tokens_.front()); swap_buffers_tokens_.pop(); } |