Thanks. Pushed :) On Mon, 2018-11-26 at 12:58 -0800, Mark Janes wrote: > Tested-by: Mark Janes <mark.a.ja...@intel.com> > > Erik Faye-Lund <erik.faye-l...@collabora.com> writes: > > > 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 <erik.faye-l...@collabora.com> > > --- > > Sorry about this! As I mentioned on the ticket, I don't have old > > enough > > intel HW to trigger this, but I think this should do the trick. > > > > 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 > > -- > > 2.19.1
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev