From: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon, 9 Jun 2014 21:14:15 +0000 (-0700)
Subject: glsl/cs: Fix local_size_y and local_size_z
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=380dd3be0256f2fb56d4722a0a894c3cba2b728b;p=mesa.git

glsl/cs: Fix local_size_y and local_size_z

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@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
---

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 0ee2c495aa4..77053d5b12e 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,