Merge remote-tracking branch 'origin/1.18.2' into 1.19.1

IMS212 · IMS212 · commit dfa8aded047a · 2022-12-06T14:56:38.000-08:00
diff --git a/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java b/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java
@@ -375,6 +375,9 @@ public void copyTexSubImage2D(int destTexture, int target, int i, int i1, int i2
 		@Override
 		public void bindTextureToUnit(int unit, int texture) {
 			ARBDirectStateAccess.glBindTextureUnit(unit, texture);
+
+			// Manually fix GLStateManager bindings...
+			GlStateManagerAccessor.getTEXTURES()[unit].binding = texture;
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,9 @@ public void copyTexSubImage2D(int destTexture, int target, int i, int i1, int i2`
`375`	`375`	`@Override`
`376`	`376`	`public void bindTextureToUnit(int unit, int texture) {`
`377`	`377`	`ARBDirectStateAccess.glBindTextureUnit(unit, texture);`
	`378`	`+`
	`379`	`+ // Manually fix GLStateManager bindings...`
	`380`	`+ GlStateManagerAccessor.getTEXTURES()[unit].binding = texture;`
`378`	`381`	`}`
`379`	`382`
`380`	`383`	`@Override`