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

GLSL: Allow desktop shaders to call functions from outside main().

Browse Source 
Fixes issue #239.
This commit is contained in:
John Kessenich 2016-12-05 21:36:48 -07:00
parent ec2e27adf8
commit 9df6aa5361
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Test/baseResults/110scope.vert.out
View File

@ -1,9 +1,8 @@
110scope.vert 110scope.vert
ERROR: 0:5: 'a' : redefinition ERROR: 0:5: 'a' : redefinition
ERROR: 0:34: 'f' : can't call user function from global scope
ERROR: 0:57: 'z' : undeclared identifier ERROR: 0:57: 'z' : undeclared identifier
ERROR: 0:57: 'z' : redefinition ERROR: 0:57: 'z' : redefinition
ERROR: 4 compilation errors. No code generated. ERROR: 3 compilation errors. No code generated.
Shader version: 110 Shader version: 110

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1674" #define GLSLANG_REVISION "Overload400-PrecQual.1676"
#define GLSLANG_DATE "03-Dec-2016" #define GLSLANG_DATE "05-Dec-2016"

7
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -1109,9 +1109,10 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
// if builtIn == true, it's definitely a built-in function with EOpNull // if builtIn == true, it's definitely a built-in function with EOpNull
if (! builtIn) { if (! builtIn) {
call->setUserDefined(); call->setUserDefined();
if (symbolTable.atGlobalLevel()) if (symbolTable.atGlobalLevel()) {
error(loc, "can't call user function from global scope", fnCandidate->getName().c_str(), ""); requireProfile(loc, ~EEsProfile, "calling user function from global scope");
else intermediate.addToCallGraph(infoSink, "main(", fnCandidate->getMangledName());
} else
intermediate.addToCallGraph(infoSink, currentCaller, fnCandidate->getMangledName()); intermediate.addToCallGraph(infoSink, currentCaller, fnCandidate->getMangledName());
} }