From a652842982a0a790c1b6607cd4f50679a6778fad Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 7 Nov 2018 13:41:17 +0100 Subject: [PATCH] mesa/main: remove overly strict query-validation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tapani Pälli --- src/mesa/main/queryobj.c | 14 -------------- 1 file changed, 14 deletions(-) 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 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) || -- 2.30.2