commit e71ea19aba82368d4da6a6b9fd6d0669909b1700
author Corentin Wallez <cwallez@chromium.org> Tue Apr 19 13:16:37 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Mon May 02 10:34:07 2016 +0000
tree 7a8630123db744ca92bc260eda74fcb317ded601
parent 3f5726805388571cc5182cf1dc9d86e258412271

Allow queries of different types to be active at the same time

BUG=605775

Change-Id: I0e23fae25d450c504f174a080279cf51aebcd123
Reviewed-on: https://chromium-review.googlesource.com/340112
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 6ea31bf..eeafe45 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1168,9 +1168,7 @@
     //       of GL_ANY_SAMPLES_PASSED_EXT and GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
     //       no query may be active for either if glBeginQuery targets either.
 
-    // TODO(ewell): I think this needs to be changed for timer and occlusion queries to work at the
-    // same time
-    if (context->getState().isQueryActive())
+    if (context->getState().isQueryActive(target))
     {
         context->recordError(Error(GL_INVALID_OPERATION, "Other query is active"));
         return false;