From f233ba65e3cd8e8a7b43d514598447d1e4464359 Mon Sep 17 00:00:00 2001 From: kurrycat Date: Sat, 26 Oct 2024 22:00:51 +0200 Subject: [PATCH] add syncProgram call to glDrawElements + glBegin --- .../angelica/glsm/GLStateManager.java | 14 ++++++++++++++ .../angelica/transform/RedirectorTransformer.java | 2 ++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 9e9d82fbb..0480cd562 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -971,6 +971,20 @@ public class GLStateManager { GL11.glDrawBuffer(mode); } + public static void glDrawElements(int mode, IntBuffer indices) { + if(AngelicaConfig.enableIris) { + Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram); + } + 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 glLogicOp(int opcode) { GL11.glLogicOp(opcode); } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index 3ace8e090..87e30b69d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -97,6 +97,7 @@ public class RedirectorTransformer implements IClassTransformer { glCapRedirects.put(org.lwjgl.opengl.GL11.GL_SCISSOR_TEST, "ScissorTest"); methodRedirects.put(GL11, RedirectMap.newMap() .add("glAlphaFunc") + .add("glBegin") .add("glBindTexture") .add("glBlendFunc") .add("glCallList") @@ -119,6 +120,7 @@ public class RedirectorTransformer implements IClassTransformer { .add("glDepthRange") .add("glDrawArrays") .add("glDrawBuffer") + .add("glDrawElements") .add("glEdgeFlag") .add("glEndList") .add("glFog")