summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 07:02:51 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 07:02:51 +0000
commit24a14624be0d8582f04ec81872356cc6c556a8e6 (patch)
tree6449904269ea6b346645652bf23edc5af06f2d59 /gpu
parent1b4c5adfde8e10e203cf5f43873e48e2c2b1afff (diff)
downloadchromium_src-24a14624be0d8582f04ec81872356cc6c556a8e6.zip
chromium_src-24a14624be0d8582f04ec81872356cc6c556a8e6.tar.gz
chromium_src-24a14624be0d8582f04ec81872356cc6c556a8e6.tar.bz2
gpu: Issue a glFinish to ensure that query result is available before GetQueryObjectuivEXT returns.
A shallow finish is not enough here as there's no guarantee that occlusion or sync queries complete unless glFinish is called. BUG=373415 R=piman Review URL: https://codereview.chromium.org/289863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 866b88b..53bd25f 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -3484,8 +3484,7 @@ void GLES2Implementation::GetQueryObjectuivEXT(
if (!query->CheckResultsAvailable(helper_)) {
helper_->WaitForToken(query->token());
if (!query->CheckResultsAvailable(helper_)) {
- // TODO(gman): Speed this up.
- WaitForCmd();
+ FinishHelper();
CHECK(query->CheckResultsAvailable(helper_));
}
}