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

[Francisco Jerez]

Paul Berry <stereotype441 at gmail.com> writes:

> 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.
>

Instead I've changed it to use basicType == GLSL_TYPE_INT too.  They are
equivalent.

Thanks.

> With that fixed, this patch is:
>
> Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 229 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131212/25fafe82/attachment.pgp>