diff options
| author | Samuel Iglesias Gonsálvez <[email protected]> | 2015-11-12 16:14:07 +0100 |
|---|---|---|
| committer | Samuel Iglesias Gonsálvez <[email protected]> | 2015-11-13 08:04:49 +0100 |
| commit | 5f004fd1970338c9a1db51b421ae0f6f687661d9 (patch) | |
| tree | fb0cc7e5b636fd7bb698fb7aefafe3e628a11747 /src/glsl | |
| parent | 8610cd6b8c71b92a8e68603c030961e36faa0ef4 (diff) | |
glsl: fix 'shared' layout qualifier related regressions
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 <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 5 |
1 files changed, 5 insertions, 0 deletions
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: |