Mesa (master): mesa/main: remove overly strict query-validation
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Nov 23 09:49:00 UTC 2018
Module: Mesa
Branch: master
Commit: a652842982a0a790c1b6607cd4f50679a6778fad
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a652842982a0a790c1b6607cd4f50679a6778fad
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Nov 7 13:41:17 2018 +0100
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 at collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
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 27086a4b68..af558f0e22 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) ||
More information about the mesa-commit
mailing list