commit f0e0449ef3af46aa5a78027d06bfea8c4f5f80c0
author Jamie Madill <jmadill@chromium.org> Sat Aug 26 15:28:42 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Aug 28 02:43:08 2017 +0000
tree f937be7b7caee0b7392cfdc8e340858bf2fe57a3
parent ff325f1b07a349749306509c4f2376401bc50a9e

Format ES3 query entry points.

Also refactor some query extension entry points.

BUG=angleproject:747

Change-Id: I5a8a3b2616a3872b5645a655641ec9c12739f804
Reviewed-on: https://chromium-review.googlesource.com/636062
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 2f68f57..3e6f497 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1916,7 +1916,7 @@
     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 @@
     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 @@
     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))