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

Merge pull request #663 from KhronosGroup/full-include-semantics

Browse source 
Includer interface change to support full include semantics (requires downstream changes)
This commit is contained in:
John Kessenich 2017-01-10 18:49:07 -07:00 • committed by GitHub
commit ce80197c22
9 changed files with 78 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -232,7 +232,7 @@ bool InitializeSymbolTable(const TString& builtIns, int version, EProfile profil
language, infoSink, spvVersion, true, EShMsgDefault,
true));
TShader::ForbidInclude includer;
TShader::ForbidIncluder includer;
TPpContext ppContext(*parseContext, "", includer);
TScanContext scanContext(*parseContext);
parseContext->setScanContext(&scanContext);
@ -1232,7 +1232,7 @@ int ShCompile(
compiler->infoSink.debug.erase();
TIntermediate intermediate(compiler->getLanguage());
TShader::ForbidInclude includer;
TShader::ForbidIncluder includer;
bool success = CompileDeferred(compiler, shaderStrings, numStrings, inputLengths, nullptr,
"", optLevel, resources, defaultVersion, ENoProfile, false,
forwardCompatible, messages, intermediate, includer);