Destroy unused buffers properly

Noxcrew · Nov 14, 2024 · 320f6de · 320f6de
1 parent b895419
commit 320f6de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java b/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java
@@ -188,6 +188,11 @@ public void onInitializeClient() {
             initialize();
         });
 
+        // Clear out all UI rendering state when we start configuring
+        ClientConfigurationConnectionEvents.START.register((ignored1, ignored2) -> {
+            NoxesiumMod.forEachRenderStateHolder(NoxesiumRenderStateHolder::clear);
+        });
+
         // Call disconnection hooks
         ClientPlayConnectionEvents.DISCONNECT.register((ignored1, ignored2) -> {
             uninitialize();

diff --git a/fabric/src/main/java/com/noxcrew/noxesium/config/NoxesiumConfig.java b/fabric/src/main/java/com/noxcrew/noxesium/config/NoxesiumConfig.java
@@ -36,7 +36,7 @@ public class NoxesiumConfig {
     public double mapUiSize = 0.8;
     public MapLocation mapUiLocation = MapLocation.TOP;
     public int minUiFramerate = 30;
-    public int maxUiFramerate = 120;
+    public int maxUiFramerate = 60;
     public boolean showOptimizationOverlay = false;
 
     /**

diff --git a/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/DynamicElement.java b/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/DynamicElement.java
@@ -213,6 +213,11 @@ public boolean update(long nanoTime, GuiGraphics guiGraphics, Runnable draw) {
         guiGraphics.flush();
         SharedVertexBuffer.blendStateHook = null;
 
+        // Remove any remaining buffers
+        for (var index = (bufferIndex + 1); index < buffers.size(); index++) {
+            buffers.remove(index).close();
+        }
+
         // Nothing was drawn, this layer does not contain anything!
         bufferEmpty = !elementsWereDrawn && allBuffersEmpty;