BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add grammar productions for the syntax "layout(...) uniform;" for setting global defaults.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22112 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-20 22:54:40 +00:00
parent 60d9f7a881
commit 211cba242b
4 changed files with 121 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
glslang/MachineIndependent/glslang.y
View file

@ -1119,7 +1119,7 @@ declaration
$$ = 0;
}
| type_qualifier SEMICOLON {
// setting defaults
parseContext.updateQualifierDefaults($1.line, $1.qualifier);
$$ = 0;
}
| type_qualifier IDENTIFIER SEMICOLON {
@ -1137,7 +1137,7 @@ block_structure
: type_qualifier IDENTIFIER LEFT_BRACE { parseContext.nestedBlockCheck($1.line); } struct_declaration_list RIGHT_BRACE {
--parseContext.structNestingLevel;
parseContext.blockName = $2.string;
parseContext.publicBlockType = $1;
parseContext.currentBlockDefaults = $1.qualifier;
$$.line = $1.line;
$$.typeList = $5;
}
@ -1395,7 +1395,7 @@ single_declaration
: fully_specified_type {
$$.type = $1;
$$.intermAggregate = 0;
parseContext.updateDefaults($1.line, $$.type, 0);
parseContext.updateTypedDefaults($1.line, $$.type.qualifier, 0);
}
| fully_specified_type IDENTIFIER {
$$.intermAggregate = 0;
@ -1404,7 +1404,7 @@ single_declaration
parseContext.nonInitConstCheck($2.line, *$2.string, $$.type);
parseContext.nonInitCheck($2.line, *$2.string, $$.type);
parseContext.updateDefaults($2.line, $$.type, $2.string);
parseContext.updateTypedDefaults($2.line, $$.type.qualifier, $2.string);
}
| fully_specified_type IDENTIFIER array_specifier {
$$.intermAggregate = 0;
@ -1419,7 +1419,7 @@ single_declaration
TVariable* variable;
parseContext.arrayCheck($3.line, *$2.string, $1, variable);
}
parseContext.updateDefaults($2.line, $$.type, $2.string);
parseContext.updateTypedDefaults($2.line, $$.type.qualifier, $2.string);
}
| fully_specified_type IDENTIFIER array_specifier EQUAL initializer {
$$.intermAggregate = 0;