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

glsl parser: allow in & out for interface block members

Browse Source 
Previously uniform blocks allowed for the 'uniform' keyword
to be used with members of a uniform blocks. With interface
blocks 'in' can be used on 'in' interface block members and
'out' can be used on 'out' interface block members.

The basic_interface_block rule will verify that the same
qualifier type is used with the block and each member.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen
2013-03-09 14:52:14 -08:00
parent 067cc08d6a
commit 9368604d99
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/glsl_parser.yy
+13 -26
View File
@@ -2067,41 +2067,28 @@ member_list:
}
;
/* Specifying "uniform" inside of a uniform block is redundant. */
uniformopt:
/* nothing */
| UNIFORM
;
member_declaration:
layout_qualifier uniformopt type_specifier struct_declarator_list ';'
fully_specified_type struct_declarator_list ';'
{
void *ctx = state;
ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
ast_fully_specified_type *type = $1;
type->set_location(yylloc);
type->qualifier = $1;
type->qualifier.flags.q.uniform = true;
type->specifier = $3;
if (type->qualifier.flags.q.attribute) {
_mesa_glsl_error(& @1, state,
"keyword 'attribute' cannot be used with "
"interface block member\n");
} else if (type->qualifier.flags.q.varying) {
_mesa_glsl_error(& @1, state,
"keyword 'varying' cannot be used with "
"interface block member\n");
}
$$ = new(ctx) ast_declarator_list(type);
$$->set_location(yylloc);
$$->ubo_qualifiers_valid = true;
$$->declarations.push_degenerate_list_at_head(& $4->link);
}
| uniformopt type_specifier struct_declarator_list ';'
{
void *ctx = state;
ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
type->set_location(yylloc);
type->qualifier.flags.q.uniform = true;
type->specifier = $2;
$$ = new(ctx) ast_declarator_list(type);
$$->set_location(yylloc);
$$->ubo_qualifiers_valid = true;
$$->declarations.push_degenerate_list_at_head(& $3->link);
$$->declarations.push_degenerate_list_at_head(& $2->link);
}
;