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

GLSL: Promote HLSL entry-point renaming code to be used by GLSL as well.

Browse source 
Fixes #1045.
This commit is contained in:
John Kessenich 2017-09-11 21:48:19 -06:00
parent 4f4683d251
commit 9855bdad00
16 changed files with 1066 additions and 957 deletions
Download patch file Download diff file Expand all files Collapse all files

16
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -91,18 +91,16 @@ TParseContextBase* CreateParseContext(TSymbolTable& symbolTable, TIntermediate&
int version, EProfile profile, EShSource source,
EShLanguage language, TInfoSink& infoSink,
SpvVersion spvVersion, bool forwardCompatible, EShMessages messages,
bool parsingBuiltIns, const std::string sourceEntryPointName = "")
bool parsingBuiltIns, std::string sourceEntryPointName = "")
{
#ifndef ENABLE_HLSL
(void)sourceEntryPointName; // Unused argument.
#endif
switch (source) {
case EShSourceGlsl:
intermediate.setEntryPointName("main");
case EShSourceGlsl: {
if (sourceEntryPointName.size() == 0)
intermediate.setEntryPointName("main");
TString entryPoint = sourceEntryPointName.c_str();
return new TParseContext(symbolTable, intermediate, parsingBuiltIns, version, profile, spvVersion,
language, infoSink, forwardCompatible, messages);
language, infoSink, forwardCompatible, messages, &entryPoint);
}
#ifdef ENABLE_HLSL
case EShSourceHlsl:
return new HlslParseContext(symbolTable, intermediate, parsingBuiltIns, version, profile, spvVersion,