diff options
author | Paul Berry <[email protected]> | 2013-07-24 14:57:24 -0700 |
---|---|---|
committer | Paul Berry <[email protected]> | 2013-08-01 20:24:32 -0700 |
commit | 20ae8e0c9168d900246d5940e07cf668dba8f0ce (patch) | |
tree | 009d51a6fa381d0ec3b2e26de7f57c7793d97aad /src/glsl/glsl_parser.yy | |
parent | c1f1d8522c4650f55fac3a57466c9788f80f82f6 (diff) |
glsl: Allow geometry shader input instance arrays to be unsized.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r-- | src/glsl/glsl_parser.yy | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 2c339add62a..a847d2a2d5c 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -2243,25 +2243,22 @@ instance_name_opt: /* empty */ { $$ = new(state) ast_interface_block(*state->default_uniform_qualifier, - NULL, NULL); + NULL, false, NULL); } | NEW_IDENTIFIER { $$ = new(state) ast_interface_block(*state->default_uniform_qualifier, - $1, NULL); + $1, false, NULL); } | NEW_IDENTIFIER '[' constant_expression ']' { $$ = new(state) ast_interface_block(*state->default_uniform_qualifier, - $1, $3); + $1, true, $3); } | NEW_IDENTIFIER '[' ']' { - _mesa_glsl_error(& @1, state, - "instance block arrays must be explicitly sized"); - $$ = new(state) ast_interface_block(*state->default_uniform_qualifier, - $1, NULL); + $1, true, NULL); } ; |