KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: Refactor uniform block parser rules. 

The existing code has a lot of duplication; the only difference between
the two cases is whether we merge in an additional layout qualifier.

Apparently creating a layout_qualifieropt rule that can be empty causes
a lot of conflicts and confusion.  However, refactoring out the guts of
the ast_uniform_block creation works fine.

Reviewed-by: Carl Worth <cworth@cworth.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Kenneth Graunke 2012-11-27 23:21:56 -08:00 committed by Ian Romanick
parent b226a058db
commit 0d2e6336a2
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/glsl/glsl_parser.yy
View File

@ -220,7 +220,7 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
%type <node> declaration
%type <node> declaration_statement
%type <node> jump_statement
%type <node> uniform_block
%type <node> uniform_block basic_uniform_block
%type <struct_specifier> struct_specifier
%type <declarator_list> struct_declaration_list
%type <declarator_list> struct_declaration
@ -1884,6 +1884,21 @@ function_definition:
/* layout_qualifieropt is packed into this rule */
uniform_block:
basic_uniform_block
{
$$ = $1;
}
| layout_qualifier basic_uniform_block
{
ast_uniform_block *block = (ast_uniform_block *) $2;
if (!block->layout.merge_qualifier(& @1, state, $1)) {
YYERROR;
}
$$ = block;
}
;
basic_uniform_block:
UNIFORM NEW_IDENTIFIER '{' member_list '}' ';'
{
void *ctx = state;
@ -1900,26 +1915,6 @@ uniform_block:
"required for defining uniform blocks\n");
}
}
| layout_qualifier UNIFORM NEW_IDENTIFIER '{' member_list '}' ';'
{
void *ctx = state;
ast_type_qualifier qual = *state->default_uniform_qualifier;
if (!qual.merge_qualifier(& @1, state, $1)) {
YYERROR;
}
$$ = new(ctx) ast_uniform_block(qual, $3, $5);
if (!state->ARB_uniform_buffer_object_enable) {
_mesa_glsl_error(& @1, state,
"#version 140 / GL_ARB_uniform_buffer_object "
"required for defining uniform blocks\n");
} else if (state->ARB_uniform_buffer_object_warn) {
_mesa_glsl_warning(& @1, state,
"#version 140 / GL_ARB_uniform_buffer_object "
"required for defining uniform blocks\n");
}
}
;
member_list: