Use non-mutating getQuery in validation.

src/libANGLE/Context.cpp

@@ -1239,7 +1239,7 @@ void Context::bindProgramPipeline(ProgramPipelineID pipelineHandle)
 
 void Context::beginQuery(QueryType target, QueryID query)
 {
-    Query *queryObject = getQuery(query, true, target);
+    Query *queryObject = getOrCreateQuery(query, target);
     ASSERT(queryObject);
 
     // begin query
@@ -1267,7 +1267,7 @@ void Context::queryCounter(QueryID id, QueryType target)
 {
     ASSERT(target == QueryType::Timestamp);
 
-    Query *queryObject = getQuery(id, true, target);
+    Query *queryObject = getOrCreateQuery(id, target);
     ASSERT(queryObject);
 
     ANGLE_CONTEXT_TRY(queryObject->queryCounter(this));
@@ -1386,7 +1386,7 @@ FenceNV *Context::getFenceNV(FenceNVID handle)
     return mFenceNVMap.query(handle);
 }
 
-Query *Context::getQuery(QueryID handle, bool create, QueryType type)
+Query *Context::getOrCreateQuery(QueryID handle, QueryType type)
 {
     if (!mQueryMap.contains(handle))
     {
@@ -1394,7 +1394,7 @@ Query *Context::getQuery(QueryID handle, bool create, QueryType type)
     }
 
     Query *query = mQueryMap.query(handle);
-    if (!query && create)
+    if (!query)
     {
         ASSERT(type != QueryType::InvalidEnum);
         query = new Query(mImplementation.get(), type, handle);
@@ -7083,9 +7083,14 @@ void Context::deleteQueries(GLsizei n, const QueryID *ids)
     }
 }
 
+bool Context::isQueryGenerated(QueryID query) const
+{
+    return mQueryMap.contains(query);
+}
+
 GLboolean Context::isQuery(QueryID id)
 {
-    return ConvertToGLBoolean(getQuery(id, false, QueryType::InvalidEnum) != nullptr);
+    return ConvertToGLBoolean(getQuery(id) != nullptr);
 }
 
 void Context::uniformMatrix2x3fv(GLint location,

src/libANGLE/Context.h

@@ -385,7 +385,7 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
     Renderbuffer *getRenderbuffer(RenderbufferID handle) const;
     VertexArray *getVertexArray(VertexArrayID handle) const;
     Sampler *getSampler(SamplerID handle) const;
-    Query *getQuery(QueryID handle, bool create, QueryType type);
+    Query *getOrCreateQuery(QueryID handle, QueryType type);
     Query *getQuery(QueryID handle) const;
     TransformFeedback *getTransformFeedback(TransformFeedbackID handle) const;
     ProgramPipeline *getProgramPipeline(ProgramPipelineID handle) const;
@@ -553,6 +553,7 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
     bool isRenderbufferGenerated(RenderbufferID renderbuffer) const;
     bool isFramebufferGenerated(FramebufferID framebuffer) const;
     bool isProgramPipelineGenerated(ProgramPipelineID pipeline) const;
+    bool isQueryGenerated(QueryID query) const;
 
     bool usingDisplayTextureShareGroup() const;
 

src/libANGLE/validationES.cpp

@@ -1672,17 +1672,16 @@ bool ValidateBeginQueryBase(Context *context, QueryType target, QueryID id)
         return false;
     }
 
-    Query *queryObject = context->getQuery(id, true, target);
-
     // check that name was obtained with glGenQueries
-    if (!queryObject)
+    if (!context->isQueryGenerated(id))
     {
         context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
         return false;
     }
 
-    // check for type mismatch
-    if (queryObject->getType() != target)
+    // Check for type mismatch. If query is not yet started we're good to go.
+    Query *queryObject = context->getQuery(id);
+    if (queryObject && queryObject->getType() != target)
     {
         context->validationError(GL_INVALID_OPERATION, kQueryTargetMismatch);
         return false;
@@ -1748,14 +1747,15 @@ bool ValidateQueryCounterEXT(Context *context, QueryID id, QueryType target)
         return false;
     }
 
-    Query *queryObject = context->getQuery(id, true, target);
-    if (queryObject == nullptr)
+    if (!context->isQueryGenerated(id))
     {
         context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
         return false;
     }
 
-    if (context->getState().isQueryActive(queryObject))
+    // If query object is not started, that's fine.
+    Query *queryObject = context->getQuery(id);
+    if (queryObject && context->getState().isQueryActive(queryObject))
     {
         context->validationError(GL_INVALID_OPERATION, kQueryActive);
         return false;
@@ -1872,7 +1872,7 @@ bool ValidateGetQueryObjectValueBase(Context *context, QueryID id, GLenum pname,
         }
     }
 
-    Query *queryObject = context->getQuery(id, false, QueryType::InvalidEnum);
+    Query *queryObject = context->getQuery(id);
 
     if (!queryObject)
     {