Merge branch '1.19.1' into 1.6.2-without-0.4.11

IrisShaders · Jun 6, 2023 · 8b8fe03 · 8b8fe03
2 parents 1d471de + 4a9e483
commit 8b8fe03
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java b/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java
@@ -375,13 +375,20 @@ public static void bindSamplerToUnit(int unit, int sampler) {
 		samplers[unit] = sampler;
 	}
 
+	private static int[] emptyArray = new int[SamplerLimits.get().getMaxTextureUnits()];
+
 	public static void unbindAllSamplers() {
+		boolean usedASampler = false;
 		for (int i = 0; i < samplers.length; i++) {
 			if (samplers[i] != 0) {
-				GL33C.glBindSampler(i, 0);
+				usedASampler = true;
+				if (!hasMultibind) GL33C.glBindSampler(i, 0);
 				samplers[i] = 0;
 			}
 		}
+		if (usedASampler && hasMultibind) {
+			GL45C.glBindSamplers(0, emptyArray);
+		}
 	}