On 27/09/15 23:05, Timothy Arceri wrote:
> On Fri, 2015-09-25 at 10:24 +0200, Samuel Iglesias Gonsalvez wrote:
>> Signed-off-by: Samuel Iglesias Gonsalvez <sigles...@igalia.com>
>
> Maybe change the commit message to something like:
>
> glsl: use correct number of uniform blocks in error message
>
> Otherwise:
>
> Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au>
>
OK, I will do it.
Thanks,
Sam
>> ---
>> src/glsl/linker.cpp | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>> index d6a62bf..be04f5b 100644
>> --- a/src/glsl/linker.cpp
>> +++ b/src/glsl/linker.cpp
>> @@ -2836,7 +2836,7 @@ check_resources(struct gl_context *ctx, struct
>> gl_shader_program *prog)
>>
>> if (total_uniform_blocks > ctx
>> ->Const.MaxCombinedUniformBlocks) {
>> linker_error(prog, "Too many combined uniform blocks
>> (%d/%d)\n",
>> - prog->NumUniformShaderStorageBlocks,
>> + total_uniform_blocks,
>> ctx->Const.MaxCombinedUniformBlocks);
>> } else {
>> for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
