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

GLSL Linker: Track entry point across compilation units.

Browse Source 
This wasn't needed until the recent generalization of "main" to "entry point",
so makes some HLSL-specific code be generic now, for GLSL functional correctness.
This commit is contained in:
John Kessenich
2016-12-09 17:14:27 -07:00
parent 6a60c2f9ea
commit 4b6ce415ef
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@@ -3,4 +3,4 @@
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1686"
#define GLSLANG_DATE "08-Dec-2016"
#define GLSLANG_DATE "09-Dec-2016"

2
glslang/MachineIndependent/linkValidate.cpp
View File

@@ -82,7 +82,7 @@ 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.getNumEntryPoints() > 0) {
if (unit.getNumEntryPoints() > 0) {
if (getNumEntryPoints() > 0)
error(infoSink, "can't handle multiple entry points per stage");
else