From 3d98e57178cbf07fcbc7d5549eff81f7898f2290 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 21 Nov 2024 17:26:40 -0500 Subject: [PATCH] Gracefully handle nested display list compilations in GLSM (#744) --- .../com/gtnewhorizons/angelica/glsm/GLStateManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 0480cd562..d37643a5e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -172,6 +172,7 @@ public class GLStateManager { @Setter @Getter private static boolean runningSplash = true; private static int glListMode = 0; + private static int glListNesting = 0; private static int glListId = -1; private static final Map, ISettableState> glListStates = new Object2ObjectArrayMap<>(); private static final Int2ObjectMap, ISettableState>>> glListChanges = new Int2ObjectOpenHashMap<>(); @@ -1187,7 +1188,8 @@ public class GLStateManager { public static void glNewList(int list, int mode) { if(glListMode > 0) { - throw new RuntimeException("glNewList called inside of a display list!"); + glListNesting += 1; + return; } glListId = list; glListMode = mode; @@ -1202,6 +1204,11 @@ public class GLStateManager { } public static void glEndList() { + if (glListNesting > 0) { + glListNesting -= 1; + return; + } + if(glListMode == 0) { throw new RuntimeException("glEndList called outside of a display list!"); }