From d6d35d87f1ae8711ddfe6b9c4b5e532617b21054 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 26 Nov 2018 20:36:04 +0100 Subject: [PATCH] mesa/main: fixup requirements for GL_PRIMITIVES_GENERATED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enum is also allowed by EXT_tessellation_shader, which is supported on older i965 HW (as opposed to OES_geometry_shader). This was missed when narrowing this code-path, leading to dEQP regressions. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108868 Fixes: f09d94fbd11 "mesa/main: fix validation of transform-feedback queries" Signed-off-by: Erik Faye-Lund Reviewed-by: Marek Olšák Tested-by: Mark Janes --- src/mesa/main/queryobj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index af558f0e227..67d1f76a21a 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -190,6 +190,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index) return NULL; case GL_PRIMITIVES_GENERATED: if (_mesa_has_EXT_transform_feedback(ctx) || + _mesa_has_EXT_tessellation_shader(ctx) || _mesa_has_OES_geometry_shader(ctx)) return &ctx->Query.PrimitivesGenerated[index]; else