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/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index b449bd1..9334184 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -979,11 +979,12 @@
     }
 }
 
-bool State::isQueryActive() const
+bool State::isQueryActive(GLenum type) const
 {
     for (auto &iter : mActiveQueries)
     {
-        if (iter.second.get() != NULL)
+        Query *query = iter.second.get();
+        if (query != nullptr && query->getType() == type)
         {
             return true;
         }