add missing GL calls in GLStateManager (#767)

Co-authored-by: Darren Eberly <[email protected]>
GTNewHorizons · Dec 2, 2024 · d66b557 · d66b557
1 parent e293f12
commit d66b557
Showing 1 changed file with 36 additions and 17 deletions.
diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java
@@ -69,6 +69,7 @@
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Set;
@@ -960,30 +961,50 @@ public static void setFilter(boolean bilinear, boolean mipmap) {
         glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, j);
     }
 
-    public static void glDrawArrays(int mode, int first, int count) {
-        // Iris -- TODO: This doesn't seem to work and is related to matchPass()
-        if(AngelicaConfig.enableIris) {
+    public static void trySyncProgram() {
+        if (AngelicaConfig.enableIris) {
             Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
         }
-        GL11.glDrawArrays(mode, first, count);
     }
 
-    public static void glDrawBuffer(int mode) {
-        GL11.glDrawBuffer(mode);
+    public static void glBegin(int mode) {
+        trySyncProgram();
+        GL11.glBegin(mode);
+    }
+
+    public static void glDrawElements(int mode, ByteBuffer indices) {
+        trySyncProgram();
+        GL11.glDrawElements(mode, indices);
     }
 
     public static void glDrawElements(int mode, IntBuffer indices) {
-        if(AngelicaConfig.enableIris) {
-            Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
-        }
+        trySyncProgram();
         GL11.glDrawElements(mode, indices);
     }
 
-    public static void glBegin(int mode) {
-        if (AngelicaConfig.enableIris) {
-            Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
-        }
-        GL11.glBegin(mode);
+    public static void glDrawElements(int mode, ShortBuffer indices) {
+        trySyncProgram();
+        GL11.glDrawElements(mode, indices);
+    }
+
+    public static void glDrawElements(int mode, int indices_count, int type, long indices_buffer_offset) {
+        trySyncProgram();
+        GL11.glDrawElements(mode, indices_count, type, indices_buffer_offset);
+    }
+
+    public static void glDrawElements(int mode, int count, int type, ByteBuffer indices) {
+        trySyncProgram();
+        GL11.glDrawElements(mode, count, type, indices);
+    }
+
+    public static void glDrawBuffer(int mode) {
+        trySyncProgram();
+        GL11.glDrawBuffer(mode);
+    }
+
+    public static void glDrawArrays(int mode, int first, int count) {
+        trySyncProgram();
+        GL11.glDrawArrays(mode, first, count);
     }
 
     public static void glLogicOp(int opcode) {
@@ -1240,9 +1261,7 @@ public static void glCallList(int list) {
         if(list < 0) {
             VBOManager.get(list).render();
         } else {
-            if (AngelicaConfig.enableIris) {
-                Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
-            }
+            trySyncProgram();
             GL11.glCallList(list);
             if(glListChanges.containsKey(list)) {
                 for(Map.Entry<IStateStack<?>, ISettableState<?>> entry : glListChanges.get(list)) {