From a8df13fdd27734871d56d43e2917557f212e86e1 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 6 Aug 2024 21:47:03 -0500 Subject: [PATCH] Fix LodRenderSection holding onto unnecessary memory --- .../seibel/distanthorizons/core/render/LodRenderSection.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java index b06ff485a..ec71b3419 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java @@ -188,6 +188,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable // nothing needs to be rendered this.canRender = false; this.buildAndUploadRenderDataToGpuFuture = null; + this.bufferBuildFuture = null; return; } @@ -242,6 +243,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable this.renderBuffer = buffer; this.canRender = (buffer != null); this.buildAndUploadRenderDataToGpuFuture = null; + this.bufferBuildFuture = null; if (previousBuffer != null) @@ -263,6 +265,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable LOGGER.error("Unexpected error in LodRenderSection loading, Error: "+e.getMessage(), e); this.buildAndUploadRenderDataToGpuFuture = null; + this.bufferBuildFuture = null; } } catch (Exception e) @@ -273,6 +276,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable LOGGER.error("Unexpected error in LodRenderSection loading, Error: "+e.getMessage(), e); this.buildAndUploadRenderDataToGpuFuture = null; + this.bufferBuildFuture = null; } }); }, executor); @@ -371,6 +375,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable { CompletableFuture future = this.buildAndUploadRenderDataToGpuFuture; this.buildAndUploadRenderDataToGpuFuture = null; + this.bufferBuildFuture = null; if (future != null) { // interrupting the future speeds things up, but also causes