summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2018-11-26 20:36:04 +0100
committerErik Faye-Lund <[email protected]>2018-11-26 22:12:07 +0100
commitd6d35d87f1ae8711ddfe6b9c4b5e532617b21054 (patch)
treeca51c7f85a258dc0a26978964ab7516c1280cc5d /src/mesa
parentc120dbfe4d18240315ecec9b43a61aeb9ab239ac (diff)
mesa/main: fixup requirements for GL_PRIMITIVES_GENERATED
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 <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Tested-by: Mark Janes <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/queryobj.c1
1 files changed, 1 insertions, 0 deletions
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