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

Track separate entry-point names and mangled names...

Browse source 
... and use each in the correct way at consumption sites.
This completes issue #513.
This commit is contained in:
John Kessenich 2016-09-19 18:09:30 -06:00
parent 632f575ecc
commit eee9d536bc
8 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
glslang/MachineIndependent/linkValidate.cpp
View file

@ -75,11 +75,11 @@ void TIntermediate::merge(TInfoSink& infoSink, TIntermediate& unit)
if (source != unit.source)
error(infoSink, "can't link compilation units from different source languages");
if (source == EShSourceHlsl && unit.entryPoint.size() > 0) {
if (entryPoint.size() > 0)
if (source == EShSourceHlsl && unit.entryPointName.size() > 0) {
if (entryPointName.size() > 0)
error(infoSink, "can't handle multiple entry points per stage");
else
entryPoint = unit.entryPoint;
entryPointName = unit.entryPointName;
}
numEntryPoints += unit.numEntryPoints;
numErrors += unit.numErrors;