<div dir="ltr">On 26 November 2013 00:08, Francisco Jerez <span dir="ltr"><<a href="mailto:currojerez@riseup.net" target="_blank">currojerez@riseup.net</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">---<br>
 src/mesa/main/uniform_query.cpp | 36 ++++++++++++++++++++++++++++++++++++<br>
 1 file changed, 36 insertions(+)<br>
<br>
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp<br>
index 88ad476..fec45be 100644<br>
--- a/src/mesa/main/uniform_query.cpp<br>
+++ b/src/mesa/main/uniform_query.cpp<br>
@@ -686,6 +686,9 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,<br>
    case GLSL_TYPE_SAMPLER:<br>
       match = (basicType == GLSL_TYPE_INT);<br>
       break;<br>
+   case GLSL_TYPE_IMAGE:<br>
+      match = (type == GL_INT);<br>
+      break;<br></blockquote><div><br>Why do samplers use basicType == GLSL_TYPE_INT and images use type == GL_INT?  There should be a comment explaining this difference.<br><br></div><div>With that fixed, this patch is:<br>
<br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br></div></div></div></div>