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

src/libANGLE/State.cpp

@@ -979,11 +979,12 @@ void State::detachTransformFeedback(GLuint transformFeedback)
     }
 }
 
-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;
         }

src/libANGLE/State.h

@@ -194,7 +194,7 @@ class State : angle::NonCopyable
     void detachTransformFeedback(GLuint transformFeedback);
 
     // Query binding manipulation
-    bool isQueryActive() const;
+    bool isQueryActive(GLenum type) const;
     bool isQueryActive(Query *query) const;
     void setActiveQuery(GLenum target, Query *query);
     GLuint getActiveQueryId(GLenum target) const;

src/libANGLE/validationES.cpp

@@ -1168,9 +1168,7 @@ bool ValidateBeginQueryBase(gl::Context *context, GLenum target, GLuint id)
     //       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;