[Mesa-dev] [PATCH 6/8] mesa: Implement image uniform queries.

[Francisco Jerez]

Matt Turner <mattst88 at gmail.com> writes:

> On Sat, Jan 31, 2015 at 10:27 AM, Francisco Jerez <currojerez at riseup.net> wrote:
>> ---
>>  src/mesa/main/uniform_query.cpp | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
>> index 32870d0..82e5e38 100644
>> --- a/src/mesa/main/uniform_query.cpp
>> +++ b/src/mesa/main/uniform_query.cpp
>> @@ -362,7 +362,8 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
>>               &&
>>               (uni->type->base_type == GLSL_TYPE_INT
>>                || uni->type->base_type == GLSL_TYPE_UINT
>> -              || uni->type->base_type == GLSL_TYPE_SAMPLER))) {
>> +              || uni->type->base_type == GLSL_TYPE_SAMPLER
>> +               || uni->type->base_type == GLSL_TYPE_IMAGE))) {
>>          memcpy(paramsOut, src, bytes);
>>        } else {
>>          union gl_constant_value *const dst =
>> @@ -381,6 +382,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
>>                   break;
>>                case GLSL_TYPE_INT:
>>                case GLSL_TYPE_SAMPLER:
>> +              case GLSL_TYPE_IMAGE:
>>                   dst[i].f = (float) src[i].i;
>>                   break;
>>                case GLSL_TYPE_BOOL:
>> --
>> 2.1.3
>
> Remove the tabs in the couple of lines you're adding in this patch,
> and this series is
>
> Reviewed-by: Matt Turner <mattst88 at gmail.com>

Thank you Matt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150504/366f954a/attachment-0001.sig>