From 41137b6df3e7c354581ab8bcf38530062f84f896 Mon Sep 17 00:00:00 2001
From: Patrick Wuttke <mewin@mewin.de>
Date: Sat, 25 Nov 2023 15:05:07 +0100
Subject: [PATCH] Fixed that the passed resolver wasn't actually used.

---
 glslang/MachineIndependent/iomapper.cpp |  6 +++++-
 glslang/MachineIndependent/iomapper.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/glslang/MachineIndependent/iomapper.cpp b/glslang/MachineIndependent/iomapper.cpp
index 63dedf76..89292cfd 100644
--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -1430,7 +1430,11 @@ bool TIoMapper::addStage(EShLanguage stage, TIntermediate& intermediate, TInfoSi
             resolver = &defaultResolver;
     }
 #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
     resolver->addStage(stage, intermediate);
 
diff --git a/glslang/MachineIndependent/iomapper.h b/glslang/MachineIndependent/iomapper.h
index f852f872..0e73f7fc 100644
--- a/glslang/MachineIndependent/iomapper.h
+++ b/glslang/MachineIndependent/iomapper.h
@@ -54,11 +54,11 @@ struct TVarEntryInfo { // @MEWIN - 2022-12-08 - Added initializers to fix compil
     TIntermSymbol* symbol = nullptr;
     bool live = false;
     bool upgradedToPushConstant = false;
-    int newBinding = 0;
-    int newSet = 0;
-    int newLocation = 0;
-    int newComponent = 0;
-    int newIndex = 0;
+    int newBinding = -1;
+    int newSet = -1;
+    int newLocation = -1;
+    int newComponent = -1;
+    int newIndex = -1;
     EShLanguage stage = EShLangVertex;
 
     void clearNewAssignments() {