From: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Date: Thu, 12 Nov 2015 15:14:07 +0000 (+0100)
Subject: glsl: fix 'shared' layout qualifier related regressions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f004fd1970338c9a1db51b421ae0f6f687661d9;p=mesa.git

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 <siglesias@igalia.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

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: