<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Nov 26, 2018 at 2:45 PM Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com">erik.faye-lund@collabora.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This enum is also allowed by EXT_tessellation_shader, which is supported<br>
on older i965 HW (as opposed to OES_geometry_shader). This was missed<br>
when narrowing this code-path, leading to dEQP regressions.<br>
<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=108868" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=108868</a><br>
Fixes: f09d94fbd11 "mesa/main: fix validation of transform-feedback queries"<br>
Signed-off-by: Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com" target="_blank">erik.faye-lund@collabora.com</a>><br>
---<br>
Sorry about this! As I mentioned on the ticket, I don't have old enough<br>
intel HW to trigger this, but I think this should do the trick.<br>
<br>
src/mesa/main/queryobj.c | 1 +<br>
1 file changed, 1 insertion(+)<br>
<br>
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c<br>
index af558f0e227..67d1f76a21a 100644<br>
--- a/src/mesa/main/queryobj.c<br>
+++ b/src/mesa/main/queryobj.c<br>
@@ -190,6 +190,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index)<br>
return NULL;<br>
case GL_PRIMITIVES_GENERATED:<br>
if (_mesa_has_EXT_transform_feedback(ctx) ||<br>
+ _mesa_has_EXT_tessellation_shader(ctx) ||<br>
_mesa_has_OES_geometry_shader(ctx))<br>
return &ctx->Query.PrimitivesGenerated[index];<br>
else<br>
-- <br>
2.19.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>