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

Fixed that the passed resolver wasn't actually used.

Browse Source
This commit is contained in:
Patrick 2023-11-25 15:05:07 +01:00
parent bb2d06b0a3
commit 41137b6df3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glslang/MachineIndependent/iomapper.cpp
View File

@ -1430,7 +1430,11 @@ bool TIoMapper::addStage(EShLanguage stage, TIntermediate& intermediate, TInfoSi
resolver = &defaultResolver; resolver = &defaultResolver;
} }
#else #else
resolver = &defaultResolver; // BEGIN @MEWIN - 2023-11-25 - Fixed that the passed resolver wasn't actually used.
if (resolver == nullptr) {
resolver = &defaultResolver;
}
// END @MEWIN
#endif #endif
resolver->addStage(stage, intermediate); resolver->addStage(stage, intermediate);

10
glslang/MachineIndependent/iomapper.h
View File

@ -54,11 +54,11 @@ struct TVarEntryInfo { // @MEWIN - 2022-12-08 - Added initializers to fix compil
TIntermSymbol* symbol = nullptr; TIntermSymbol* symbol = nullptr;
bool live = false; bool live = false;
bool upgradedToPushConstant = false; bool upgradedToPushConstant = false;
int newBinding = 0; int newBinding = -1;
int newSet = 0; int newSet = -1;
int newLocation = 0; int newLocation = -1;
int newComponent = 0; int newComponent = -1;
int newIndex = 0; int newIndex = -1;
EShLanguage stage = EShLangVertex; EShLanguage stage = EShLangVertex;
void clearNewAssignments() { void clearNewAssignments() {