mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Front end: Prevent use of a block name, which has no other use in a shader.

Browse Source
This commit is contained in:
John Kessenich 2015-07-20 11:35:51 -06:00
parent 68965c0fa9
commit 78a5a0d7d8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -448,8 +448,16 @@ TIntermTyped* TParseContext::handleVariable(TSourceLoc loc, TSymbol* symbol, con
// The symbol table search was done in the lexical phase. // The symbol table search was done in the lexical phase.
// See if it was a variable. // See if it was a variable.
variable = symbol ? symbol->getAsVariable() : 0; variable = symbol ? symbol->getAsVariable() : 0;
if (symbol && ! variable) if (variable) {
if ((variable->getType().getBasicType() == EbtBlock ||
variable->getType().getBasicType() == EbtStruct) && variable->getType().getStruct() == nullptr) {
error(loc, "cannot be used (maybe an instance name is needed)", string->c_str(), "");
variable = nullptr;
}
} else {
if (symbol)
error(loc, "variable name expected", string->c_str(), ""); error(loc, "variable name expected", string->c_str(), "");
}
// Recovery, if it wasn't found or was not a variable. // Recovery, if it wasn't found or was not a variable.
if (! variable) if (! variable)