[Mesa-dev] [PATCH] glsl/cs: Fix local_size_y and local_size_z

[Jordan Justen]

On Mon, Jun 9, 2014 at 5:29 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 10/06/14 00:51, Jordan Justen wrote:
>> flags.q.local_size has 3 bits. One each for x, y and z.
>>
>> Fixes piglit's:
>> * spec/ARB_compute_shader/linker/mismatched_local_work_sizes
>> * spec/ARB_compute_shader/compiler/default_local_size.comp
>> * spec/ARB_compute_shader/compiler/work_group_size_too_large
>> * spec/ARB_compute_shader/compiler/gl_WorkGroupSize_matches_layout.comp
>>
>> This was regressed in 738c9c3c.
>>
> The offending commit landed in 10.2. Cc: mesa-stable perhaps ?

Maybe "regressed" wasn't quite the right word since it can only be
seen when using MESA_EXTENSION_OVERRIDE to force enable an unsupported
extension.

-Jordan

> -Emil
>> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
>> ---
>>  src/glsl/ast_type.cpp | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
>> index 0ee2c49..77053d5 100644
>> --- a/src/glsl/ast_type.cpp
>> +++ b/src/glsl/ast_type.cpp
>> @@ -247,7 +247,7 @@ ast_type_qualifier::merge_in_qualifier(YYLTYPE *loc,
>>           q.flags.q.local_size != 0 &&
>>           state->in_qualifier->flags.q.local_size == 0;
>>
>> -      valid_in_mask.flags.q.local_size = 1;
>> +      valid_in_mask.flags.q.local_size = 7;
>>        break;
>>     default:
>>        _mesa_glsl_error(loc, state,
>>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev