diff options
| author | Kenneth Graunke <[email protected]> | 2016-06-01 19:27:02 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-08-30 22:09:36 -0700 |
| commit | d82f8d9772813949d0f5455cd0edad9003be0fb0 (patch) | |
| tree | 7d0b6d08ff752cc9e60ed97491ddeaf378c0a01b | |
| parent | a0b1260fe0577e504c8ef31c07e13025324af8f8 (diff) | |
glsl: Handle patch qualifier on interface blocks.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 11 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 581367ba1cf..6e9c32ef4bd 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -7498,10 +7498,12 @@ ast_interface_block::hir(exec_list *instructions, _mesa_glsl_error(&loc, state, "geometry shader inputs must be arrays"); } else if ((state->stage == MESA_SHADER_TESS_CTRL || state->stage == MESA_SHADER_TESS_EVAL) && + !this->layout.flags.q.patch && this->array_specifier == NULL && var_mode == ir_var_shader_in) { _mesa_glsl_error(&loc, state, "per-vertex tessellation shader inputs must be arrays"); } else if (state->stage == MESA_SHADER_TESS_CTRL && + !this->layout.flags.q.patch && this->array_specifier == NULL && var_mode == ir_var_shader_out) { _mesa_glsl_error(&loc, state, "tessellation control shader outputs must be arrays"); @@ -7617,6 +7619,8 @@ ast_interface_block::hir(exec_list *instructions, if (var_mode == ir_var_shader_in || var_mode == ir_var_uniform) var->data.read_only = true; + var->data.patch = this->layout.flags.q.patch; + if (state->stage == MESA_SHADER_GEOMETRY && var_mode == ir_var_shader_in) handle_geometry_shader_input_decl(state, loc, var); else if ((state->stage == MESA_SHADER_TESS_CTRL || diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 3f35b2f8e33..9e1fd9e3e67 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -2758,6 +2758,17 @@ interface_qualifier: memset(& $$, 0, sizeof($$)); $$.flags.q.buffer = 1; } + | auxiliary_storage_qualifier interface_qualifier + { + if (!$1.flags.q.patch) { + _mesa_glsl_error(&@1, state, "invalid interface qualifier"); + } + if ($2.has_auxiliary_storage()) { + _mesa_glsl_error(&@1, state, "duplicate patch qualifier"); + } + $$ = $2; + $$.flags.q.patch = 1; + } ; instance_name_opt: diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index b33cd3a1342..436ddd067b3 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -959,6 +959,7 @@ _mesa_ast_process_interface_block(YYLTYPE *locp, temp_type_qualifier.flags.q.in = true; temp_type_qualifier.flags.q.out = true; temp_type_qualifier.flags.q.buffer = true; + temp_type_qualifier.flags.q.patch = true; interface_type_mask = temp_type_qualifier.flags.i; /* Get the block's interface qualifier. The interface_qualifier |