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

Chris Forbes chrisf at ijw.co.nz
Mon Jun 9 17:08:40 PDT 2014


Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>

On Tue, Jun 10, 2014 at 11:51 AM, Jordan Justen
<jordan.l.justen at intel.com> 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.
>
> 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,
> --
> 2.0.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list