[Mesa-dev] [PATCH] st/mesa: count shader images in MaxCombinedShaderOutputResources

[Ilia Mirkin]

On Mon, Feb 15, 2016 at 10:07 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> On Mon, Feb 15, 2016 at 10:00 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
>> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>>
>> ---
>> This is on top of Ilia's Gallium images series. Ilia, I think it makes sense
>> for you to include this in your initial push if you agree.
>
> I don't disagree, but Dave might :) He can figure out how to work this
> out when he gets to it.
>
>>
>>  src/mesa/state_tracker/st_extensions.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
>> index 5763ba7..e58ff83 100644
>> --- a/src/mesa/state_tracker/st_extensions.c
>> +++ b/src/mesa/state_tracker/st_extensions.c
>> @@ -373,6 +373,7 @@ void st_init_limits(struct pipe_screen *screen,
>>           c->Program[MESA_SHADER_TESS_EVAL].MaxImageUniforms +
>>           c->Program[MESA_SHADER_GEOMETRY].MaxImageUniforms +
>>           c->Program[MESA_SHADER_FRAGMENT].MaxImageUniforms;
>> +   c->MaxCombinedShaderOutputResources += c->MaxCombinedImageUniforms;
>
> I think that should just be c->Program[MESA_SHADER_FRAGMENT].MaxImageUniforms.

Nope, nevermind. Misread.