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

GLSL: Initiate version GLSL 460, including accept extraneous semicolons.

Browse source
This commit is contained in:
John Kessenich 2017-07-23 14:44:59 -06:00
parent fda6edcbad
commit de16e52b25
10 changed files with 1627 additions and 1517 deletions
Download patch file Download diff file Expand all files Collapse all files

11
glslang/MachineIndependent/glslang.y
View file

@ -2872,8 +2872,10 @@ translation_unit
parseContext.intermediate.setTreeRoot($$);
}
| translation_unit external_declaration {
$$ = parseContext.intermediate.growAggregate($1, $2);
parseContext.intermediate.setTreeRoot($$);
if ($2 != nullptr) {
$$ = parseContext.intermediate.growAggregate($1, $2);
parseContext.intermediate.setTreeRoot($$);
}
}
;
@ -2884,6 +2886,11 @@ external_declaration
| declaration {
$$ = $1;
}
| SEMICOLON {
parseContext.requireProfile($1.loc, ~EEsProfile, "extraneous semicolon");
parseContext.profileRequires($1.loc, ~EEsProfile, 460, nullptr, "extraneous semicolon");
$$ = nullptr;
}
;
function_definition