<div dir="ltr">On 28 January 2014 11:22, Jordan Justen <span dir="ltr"><<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>><br>
---<br>
src/mesa/main/shaderapi.c | 6 ++++++<br>
1 file changed, 6 insertions(+)<br>
<br>
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c<br>
index a8336c9..fb107d5 100644<br>
--- a/src/mesa/main/shaderapi.c<br>
+++ b/src/mesa/main/shaderapi.c<br>
@@ -603,6 +603,12 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param<br>
if (check_gs_query(ctx, shProg))<br>
*params = shProg->Geom.VerticesOut;<br>
return;<br>
+ case GL_GEOMETRY_SHADER_INVOCATIONS:<br>
+ if (!has_core_gs)<br></blockquote><div><br></div><div>This needs to be:<br><br></div><div> if (!has_core_gs || !ctx->Extensions.ARB_gpu_shader5)<br><br></div><div>so that the query will generate the proper error message on platforms that don't support ARB_gpu_shader5.<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+ break;<br>
+ if (check_gs_query(ctx, shProg))<br>
+ *params = shProg->Geom.Invocations;<br>
+ return;<br>
case GL_GEOMETRY_INPUT_TYPE:<br>
if (!has_core_gs)<br>
break;<br>
<span class=""><font color="#888888">--<br>
1.8.5.3<br></font></span></blockquote><div><br></div><div>With that fixed, the patch is:<br><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br></div></div></div></div>