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

Linker: Track the mangled entry-point name along with the non-mangled one.

Browse Source
This commit is contained in:
John Kessenich 2016-12-09 17:29:07 -07:00
parent 4b6ce415ef
commit bf6d7f43fd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.1686" #define GLSLANG_REVISION "Overload400-PrecQual.1687"
#define GLSLANG_DATE "09-Dec-2016" #define GLSLANG_DATE "09-Dec-2016"

10
glslang/MachineIndependent/linkValidate.cpp
View File

@ -85,11 +85,13 @@ void TIntermediate::merge(TInfoSink& infoSink, TIntermediate& unit)
if (unit.getNumEntryPoints() > 0) { if (unit.getNumEntryPoints() > 0) {
if (getNumEntryPoints() > 0) if (getNumEntryPoints() > 0)
error(infoSink, "can't handle multiple entry points per stage"); error(infoSink, "can't handle multiple entry points per stage");
else else {
entryPointName = unit.entryPointName; entryPointName = unit.getEntryPointName();
entryPointMangledName = unit.getEntryPointMangledName();
}
} }
numEntryPoints += unit.numEntryPoints; numEntryPoints += unit.getNumEntryPoints();
numErrors += unit.numErrors; numErrors += unit.getNumErrors();
numPushConstants += unit.numPushConstants; numPushConstants += unit.numPushConstants;
callGraph.insert(callGraph.end(), unit.callGraph.begin(), unit.callGraph.end()); callGraph.insert(callGraph.end(), unit.callGraph.begin(), unit.callGraph.end());