From 5f004fd1970338c9a1db51b421ae0f6f687661d9 Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsálvez Date: Thu, 12 Nov 2015 16:14:07 +0100 Subject: glsl: fix 'shared' layout qualifier related regressions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 8b28b35 added 'shared' as a keyword for compute shaders but it broke the existing 'shared' layout qualifier support for uniform and shader storage blocks. This patch fixes 578 dEQP-GLES31.functional.ssbo.* tests. v2: - Move SHARED to interface_block_layout_qualifier (Timothy) - Don't remove "shared" case insensitive check (Timothy) - Remove the clearing of shared_storage flag (Timothy) Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Timothy Arceri --- src/glsl/glsl_parser.yy | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/glsl/glsl_parser.yy') diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 31e254a4fd3..adf6a05acce 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1652,6 +1652,11 @@ interface_block_layout_qualifier: memset(& $$, 0, sizeof($$)); $$.flags.q.packed = 1; } + | SHARED + { + memset(& $$, 0, sizeof($$)); + $$.flags.q.shared = 1; + } ; subroutine_qualifier: -- cgit v1.2.3