Format ES3 query entry points.

src/libANGLE/Context.cpp

@@ -656,14 +656,6 @@ GLuint Context::createFenceNV()
     return handle;
 }
 
-// Returns an unused query name
-GLuint Context::createQuery()
-{
-    GLuint handle = mQueryHandleAllocator.allocate();
-    mQueryMap.assign(handle, nullptr);
-    return handle;
-}
-
 void Context::deleteBuffer(GLuint buffer)
 {
     if (mState.mBuffers->getBuffer(buffer))
@@ -869,19 +861,6 @@ void Context::deleteFenceNV(GLuint fence)
     }
 }
 
-void Context::deleteQuery(GLuint query)
-{
-    Query *queryObject = nullptr;
-    if (mQueryMap.erase(query, &queryObject))
-    {
-        mQueryHandleAllocator.release(query);
-        if (queryObject)
-        {
-            queryObject->release(this);
-        }
-    }
-}
-
 Buffer *Context::getBuffer(GLuint handle) const
 {
     return mState.mBuffers->getBuffer(handle);
@@ -1181,45 +1160,37 @@ void Context::bindTransformFeedback(GLuint transformFeedbackHandle)
     mGLState.setTransformFeedbackBinding(this, transformFeedback);
 }
 
-Error Context::beginQuery(GLenum target, GLuint query)
+void Context::beginQuery(GLenum target, GLuint query)
 {
     Query *queryObject = getQuery(query, true, target);
     ASSERT(queryObject);
 
     // begin query
-    Error error = queryObject->begin();
-    if (error.isError())
-    {
-        return error;
-    }
+    ANGLE_CONTEXT_TRY(queryObject->begin());
 
     // set query as active for specified target only if begin succeeded
     mGLState.setActiveQuery(this, target, queryObject);
-
-    return NoError();
 }
 
-Error Context::endQuery(GLenum target)
+void Context::endQuery(GLenum target)
 {
     Query *queryObject = mGLState.getActiveQuery(target);
     ASSERT(queryObject);
 
-    gl::Error error = queryObject->end();
+    handleError(queryObject->end());
 
     // Always unbind the query, even if there was an error. This may delete the query object.
     mGLState.setActiveQuery(this, target, nullptr);
-
-    return error;
 }
 
-Error Context::queryCounter(GLuint id, GLenum target)
+void Context::queryCounter(GLuint id, GLenum target)
 {
     ASSERT(target == GL_TIMESTAMP_EXT);
 
     Query *queryObject = getQuery(id, true, target);
     ASSERT(queryObject);
 
-    return queryObject->queryCounter();
+    handleError(queryObject->queryCounter());
 }
 
 void Context::getQueryiv(GLenum target, GLenum pname, GLint *params)
@@ -4952,4 +4923,37 @@ void Context::uniform4uiv(GLint location, GLsizei count, const GLuint *value)
     program->setUniform4uiv(location, count, value);
 }
 
+void Context::genQueries(GLsizei n, GLuint *ids)
+{
+    for (GLsizei i = 0; i < n; i++)
+    {
+        GLuint handle = mQueryHandleAllocator.allocate();
+        mQueryMap.assign(handle, nullptr);
+        ids[i] = handle;
+    }
+}
+
+void Context::deleteQueries(GLsizei n, const GLuint *ids)
+{
+    for (int i = 0; i < n; i++)
+    {
+        GLuint query = ids[i];
+
+        Query *queryObject = nullptr;
+        if (mQueryMap.erase(query, &queryObject))
+        {
+            mQueryHandleAllocator.release(query);
+            if (queryObject)
+            {
+                queryObject->release(this);
+            }
+        }
+    }
+}
+
+GLboolean Context::isQuery(GLuint id)
+{
+    return (getQuery(id, false, GL_NONE) != nullptr) ? GL_TRUE : GL_FALSE;
+}
+
 }  // namespace gl

src/libANGLE/Context.h

@@ -120,10 +120,6 @@ class Context final : public ValidationContext
     GLuint createFenceNV();
     void deleteFenceNV(GLuint fence);
 
-    // Queries are owned by the Context;
-    GLuint createQuery();
-    void deleteQuery(GLuint query);
-
     // Vertex arrays are owned by the Context
     GLuint createVertexArray();
     void deleteVertexArray(GLuint vertexArray);
@@ -174,9 +170,9 @@ class Context final : public ValidationContext
     void bindTransformFeedback(GLuint transformFeedbackHandle);
     void bindDrawIndirectBuffer(GLuint bufferHandle);
 
-    Error beginQuery(GLenum target, GLuint query);
-    Error endQuery(GLenum target);
-    Error queryCounter(GLuint id, GLenum target);
+    void beginQuery(GLenum target, GLuint query);
+    void endQuery(GLenum target);
+    void queryCounter(GLuint id, GLenum target);
     void getQueryiv(GLenum target, GLenum pname, GLint *params);
     void getQueryObjectiv(GLuint id, GLenum pname, GLint *params);
     void getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
@@ -780,6 +776,10 @@ class Context final : public ValidationContext
     void uniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
     void validateProgram(GLuint program);
 
+    void genQueries(GLsizei n, GLuint *ids);
+    void deleteQueries(GLsizei n, const GLuint *ids);
+    GLboolean isQuery(GLuint id);
+
     void uniform1ui(GLint location, GLuint v0);
     void uniform2ui(GLint location, GLuint v0, GLuint v1);
     void uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);

src/libANGLE/validationES.cpp

@@ -1916,7 +1916,7 @@ bool ValidateReadnPixelsRobustANGLE(Context *context,
     return true;
 }
 
-bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n)
+bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n, GLuint *ids)
 {
     if (!context->getExtensions().occlusionQueryBoolean &&
         !context->getExtensions().disjointTimerQuery)
@@ -1928,7 +1928,7 @@ bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n)
     return ValidateGenOrDelete(context, n);
 }
 
-bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n)
+bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n, const GLuint *ids)
 {
     if (!context->getExtensions().occlusionQueryBoolean &&
         !context->getExtensions().disjointTimerQuery)
@@ -1940,6 +1940,18 @@ bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n)
     return ValidateGenOrDelete(context, n);
 }
 
+bool ValidateIsQueryEXT(gl::Context *context, GLuint id)
+{
+    if (!context->getExtensions().occlusionQueryBoolean &&
+        !context->getExtensions().disjointTimerQuery)
+    {
+        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
+        return false;
+    }
+
+    return true;
+}
+
 bool ValidateBeginQueryBase(gl::Context *context, GLenum target, GLuint id)
 {
     if (!ValidQueryType(context, target))

src/libANGLE/validationES.h

@@ -160,8 +160,9 @@ bool ValidateReadnPixelsRobustANGLE(Context *context,
                                     GLsizei *rows,
                                     void *data);
 
-bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n);
-bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n);
+bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n, GLuint *ids);
+bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n, const GLuint *ids);
+bool ValidateIsQueryEXT(gl::Context *context, GLuint id);
 bool ValidateBeginQueryBase(Context *context, GLenum target, GLuint id);
 bool ValidateBeginQueryEXT(Context *context, GLenum target, GLuint id);
 bool ValidateEndQueryBase(Context *context, GLenum target);

src/libANGLE/validationES3.cpp

@@ -2833,4 +2833,15 @@ bool ValidateUniform4uiv(Context *context, GLint location, GLsizei count, const
     return ValidateUniformES3(context, GL_UNSIGNED_INT_VEC4, location, count);
 }
 
+bool ValidateIsQuery(Context *context, GLuint id)
+{
+    if (context->getClientMajorVersion() < 3)
+    {
+        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
+        return false;
+    }
+
+    return true;
+}
+
 }  // namespace gl

src/libANGLE/validationES3.h

@@ -443,6 +443,8 @@ bool ValidateFramebufferTextureMultiviewSideBySideANGLE(Context *context,
                                                         GLsizei numViews,
                                                         const GLint *viewportOffsets);
 
+bool ValidateIsQuery(Context *context, GLuint id);
+
 bool ValidateUniform1ui(Context *context, GLint location, GLuint v0);
 bool ValidateUniform2ui(Context *context, GLint location, GLuint v0, GLuint v1);
 bool ValidateUniform3ui(Context *context, GLint location, GLuint v0, GLuint v1, GLuint v2);

src/libGLESv2/entry_points_gles_2_0_ext.cpp

@@ -52,15 +52,12 @@ void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!context->skipValidation() && !ValidateGenQueriesEXT(context, n))
+        if (!context->skipValidation() && !ValidateGenQueriesEXT(context, n, ids))
         {
             return;
         }
 
-        for (GLsizei i = 0; i < n; i++)
-        {
-            ids[i] = context->createQuery();
-        }
+        context->genQueries(n, ids);
     }
 }
 
@@ -71,15 +68,12 @@ void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!context->skipValidation() && !ValidateDeleteQueriesEXT(context, n))
+        if (!context->skipValidation() && !ValidateDeleteQueriesEXT(context, n, ids))
         {
             return;
         }
 
-        for (int i = 0; i < n; i++)
-        {
-            context->deleteQuery(ids[i]);
-        }
+        context->deleteQueries(n, ids);
     }
 }
 
@@ -90,7 +84,12 @@ GLboolean GL_APIENTRY IsQueryEXT(GLuint id)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        return (context->getQuery(id, false, GL_NONE) != nullptr) ? GL_TRUE : GL_FALSE;
+        if (!context->skipValidation() && !ValidateIsQueryEXT(context, id))
+        {
+            return GL_FALSE;
+        }
+
+        return context->isQuery(id);
     }
 
     return GL_FALSE;
@@ -103,17 +102,12 @@ void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateBeginQueryEXT(context, target, id))
+        if (!context->skipValidation() && !ValidateBeginQueryEXT(context, target, id))
         {
             return;
         }
 
-        Error error = context->beginQuery(target, id);
-        if (error.isError())
-        {
-            context->handleError(error);
-            return;
-        }
+        context->beginQuery(target, id);
     }
 }
 
@@ -124,17 +118,12 @@ void GL_APIENTRY EndQueryEXT(GLenum target)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateEndQueryEXT(context, target))
+        if (!context->skipValidation() && !ValidateEndQueryEXT(context, target))
         {
             return;
         }
 
-        Error error = context->endQuery(target);
-        if (error.isError())
-        {
-            context->handleError(error);
-            return;
-        }
+        context->endQuery(target);
     }
 }
 
@@ -145,17 +134,12 @@ void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateQueryCounterEXT(context, id, target))
+        if (!context->skipValidation() && !ValidateQueryCounterEXT(context, id, target))
         {
             return;
         }
 
-        Error error = context->queryCounter(id, target);
-        if (error.isError())
-        {
-            context->handleError(error);
-            return;
-        }
+        context->queryCounter(id, target);
     }
 }
 

src/libGLESv2/entry_points_gles_3_0.cpp

@@ -245,10 +245,7 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
             return;
         }
 
-        for (GLsizei i = 0; i < n; i++)
-        {
-            ids[i] = context->createQuery();
-        }
+        context->genQueries(n, ids);
     }
 }
 
@@ -264,10 +261,7 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
             return;
         }
 
-        for (int i = 0; i < n; i++)
-        {
-            context->deleteQuery(ids[i]);
-        }
+        context->deleteQueries(n, ids);
     }
 }
 
@@ -278,13 +272,12 @@ GLboolean GL_APIENTRY IsQuery(GLuint id)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (context->getClientMajorVersion() < 3)
+        if (!context->skipValidation() && !ValidateIsQuery(context, id))
         {
-            context->handleError(InvalidOperation());
             return GL_FALSE;
         }
 
-        return (context->getQuery(id, false, GL_NONE) != nullptr) ? GL_TRUE : GL_FALSE;
+        return context->isQuery(id);
     }
 
     return GL_FALSE;
@@ -297,17 +290,12 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateBeginQuery(context, target, id))
+        if (!context->skipValidation() && !ValidateBeginQuery(context, target, id))
         {
             return;
         }
 
-        Error error = context->beginQuery(target, id);
-        if (error.isError())
-        {
-            context->handleError(error);
-            return;
-        }
+        context->beginQuery(target, id);
     }
 }
 
@@ -318,17 +306,12 @@ void GL_APIENTRY EndQuery(GLenum target)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateEndQuery(context, target))
+        if (!context->skipValidation() && !ValidateEndQuery(context, target))
         {
             return;
         }
 
-        Error error = context->endQuery(target);
-        if (error.isError())
-        {
-            context->handleError(error);
-            return;
-        }
+        context->endQuery(target);
     }
 }
 
@@ -340,7 +323,7 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateGetQueryiv(context, target, pname, params))
+        if (!context->skipValidation() && !ValidateGetQueryiv(context, target, pname, params))
         {
             return;
         }
@@ -356,7 +339,7 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (!ValidateGetQueryObjectuiv(context, id, pname, params))
+        if (!context->skipValidation() && !ValidateGetQueryObjectuiv(context, id, pname, params))
         {
             return;
         }