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

Revert "Merge pull request #1792 from Roy-AMD/automapping-opengl-location"

Browse source 
This reverts commit 50ada66c27, reversing
changes made to 3464b6f519.
This commit is contained in:
John Kessenich 2019-07-23 04:10:36 -06:00
parent 50ada66c27
commit 302fe97e7b
4 changed files with 491 additions and 1130 deletions
Download patch file Download diff file Expand all files Collapse all files

20
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -1852,7 +1852,7 @@ const char* TShader::getInfoDebugLog()
return infoSink->debug.c_str();
}
TProgram::TProgram() : reflection(0), linked(false)
TProgram::TProgram() : reflection(0), ioMapper(nullptr), linked(false)
{
pool = new TPoolAllocator;
infoSink = new TInfoSink;
@ -1864,6 +1864,7 @@ TProgram::TProgram() : reflection(0), linked(false)
TProgram::~TProgram()
{
delete ioMapper;
delete infoSink;
delete reflection;
@ -2034,24 +2035,21 @@ void TProgram::dumpReflection() { if (reflection != nullptr) reflection->dump();
//
// I/O mapping implementation.
//
bool TProgram::mapIO(TIoMapResolver* pResolver, TIoMapper* pIoMapper)
bool TProgram::mapIO(TIoMapResolver* resolver)
{
if (! linked)
if (! linked || ioMapper)
return false;
TIoMapper* ioMapper = nullptr;
TIoMapper defaultIOMapper;
if (pIoMapper == nullptr)
ioMapper = &defaultIOMapper;
else
ioMapper = pIoMapper;
ioMapper = new TIoMapper;
for (int s = 0; s < EShLangCount; ++s) {
if (intermediate[s]) {
if (! ioMapper->addStage((EShLanguage)s, *intermediate[s], *infoSink, pResolver))
if (! ioMapper->addStage((EShLanguage)s, *intermediate[s], *infoSink, resolver))
return false;
}
}
return ioMapper->doMap(pResolver, *infoSink);
return true;
}
} // end namespace glslang