[Mesa-dev] [PATCH 23/23] mesa: Handle binding of uniforms to image units with glUniform*().

[Paul Berry]

On 26 November 2013 00:08, Francisco Jerez <currojerez at riseup.net> wrote:

> ---
>  src/mesa/main/uniform_query.cpp | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>
> diff --git a/src/mesa/main/uniform_query.cpp
> b/src/mesa/main/uniform_query.cpp
> index 88ad476..fec45be 100644
> --- a/src/mesa/main/uniform_query.cpp
> +++ b/src/mesa/main/uniform_query.cpp
> @@ -686,6 +686,9 @@ _mesa_uniform(struct gl_context *ctx, struct
> gl_shader_program *shProg,
>     case GLSL_TYPE_SAMPLER:
>        match = (basicType == GLSL_TYPE_INT);
>        break;
> +   case GLSL_TYPE_IMAGE:
> +      match = (type == GL_INT);
> +      break;
>

Why do samplers use basicType == GLSL_TYPE_INT and images use type ==
GL_INT?  There should be a comment explaining this difference.

With that fixed, this patch is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131211/015cf249/attachment.html>