[Mesa-dev] [PATCH v2 1/5] glsl: Parse shared keyword for compute shader variables

[Jordan Justen]

v2:
 * Move shared parsing under storage qualifiers (tarceri)
 * Fail to compile if shared is used in non-compute shader (tarceri)
 * Use separate shared_storage bit for shared variables (tarceri)

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Cc: Timothy Arceri <timothy.arceri at collabora.com>
---

Notes:
    git://people.freedesktop.org/~jljusten/mesa cs-parse-shared-vars-v2
    http://patchwork.freedesktop.org/bundle/jljusten/cs-parse-shared-vars-v2
    
    With these environment overrides:
    
      export MESA_GL_VERSION_OVERRIDE=4.3
      export MESA_GLSL_VERSION_OVERRIDE=430
      export MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader
    
    This fixes the piglit test:
    
      tests/spec/arb_compute_shader/compiler/shared-variables.comp

 src/glsl/ast.h          | 1 +
 src/glsl/ast_to_hir.cpp | 6 ++++++
 src/glsl/glsl_lexer.ll  | 2 ++
 src/glsl/glsl_parser.yy | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index e803e6d..1b75234 100644
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -448,6 +448,7 @@ struct ast_type_qualifier {
 	 unsigned patch:1;
 	 unsigned uniform:1;
 	 unsigned buffer:1;
+	 unsigned shared_storage:1;
 	 unsigned smooth:1;
 	 unsigned flat:1;
 	 unsigned noperspective:1;
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 0306530..42ccf0d 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -3089,6 +3089,12 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
                        "members");
    }
 
+   if (qual->flags.q.shared_storage && state->stage != MESA_SHADER_COMPUTE) {
+      _mesa_glsl_error(loc, state,
+                       "the shared storage qualifiers can only be used with "
+                       "compute shaders");
+   }
+
    if (qual->flags.q.row_major || qual->flags.q.column_major) {
       validate_matrix_layout_for_type(state, loc, var->type, var);
    }
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 2142817..e59f93e 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -414,6 +414,8 @@ writeonly      KEYWORD_WITH_ALT(420, 300, 420, 310, yyextra->ARB_shader_image_lo
 
 atomic_uint     KEYWORD_WITH_ALT(420, 300, 420, 310, yyextra->ARB_shader_atomic_counters_enable, ATOMIC_UINT);
 
+shared          KEYWORD_WITH_ALT(430, 310, 430, 310, yyextra->ARB_compute_shader_enable, SHARED);
+
 struct		return STRUCT;
 void		return VOID_TOK;
 
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 4636435..4ac8e45 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -165,6 +165,7 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
 %token IMAGE1DSHADOW IMAGE2DSHADOW IMAGE1DARRAYSHADOW IMAGE2DARRAYSHADOW
 %token COHERENT VOLATILE RESTRICT READONLY WRITEONLY
 %token ATOMIC_UINT
+%token SHARED
 %token STRUCT VOID_TOK WHILE
 %token <identifier> IDENTIFIER TYPE_IDENTIFIER NEW_IDENTIFIER
 %type <identifier> any_identifier
@@ -1929,6 +1930,11 @@ storage_qualifier:
       memset(& $$, 0, sizeof($$));
       $$.flags.q.buffer = 1;
    }
+   | SHARED
+   {
+      memset(& $$, 0, sizeof($$));
+      $$.flags.q.shared_storage = 1;
+   }
    ;
 
 memory_qualifier:
-- 
2.6.2