From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 7 Nov 2018 12:41:17 +0000 (+0100)
Subject: mesa/main: remove overly strict query-validation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a652842982a0a790c1b6607cd4f50679a6778fad;p=mesa.git

mesa/main: remove overly strict query-validation

The rules encoded in this code also applies to OpenGL ES 3.0 and up,
but the per-enum validation has already been taught about these rules.
So let's get rid of this duplicate, narrow version of the validation.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 27086a4b683..af558f0e227 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -163,20 +163,6 @@ get_pipe_stats_binding_point(struct gl_context *ctx,
 static struct gl_query_object **
 get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index)
 {
-
-   /* From GL_EXT_occlusion_query_boolean spec:
-    *
-    *    "Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT,
-    *    and GetQueryivEXT:
-    *
-    *   ANY_SAMPLES_PASSED_EXT                         0x8C2F
-    *   ANY_SAMPLES_PASSED_CONSERVATIVE_EXT            0x8D6A"
-    */
-   if ((_mesa_is_gles(ctx) && ctx->Version == 20) &&
-       (target != GL_ANY_SAMPLES_PASSED &&
-        target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE))
-      return NULL;
-
    switch (target) {
    case GL_SAMPLES_PASSED:
       if (_mesa_has_ARB_occlusion_query(ctx) ||