Memory Leaks fixes

Fixes Co-Authored-By: IMS <[email protected]>
Asek3 · Sep 7, 2023 · 86850e3 · 86850e3
1 parent a042617
commit 86850e3
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 3 deletions.
diff --git a/src/main/java/net/coderbot/batchedentityrendering/impl/FullyBufferedMultiBufferSource.java b/src/main/java/net/coderbot/batchedentityrendering/impl/FullyBufferedMultiBufferSource.java
@@ -175,6 +175,13 @@ public int getUsedSize() {
 		return size;
 	}
 
+	@Override
+	public void freeAndDeleteBuffer() {
+		for (SegmentedBufferBuilder builder : builders) {
+			builder.freeAndDeleteBuffer();
+		}
+	}
+
 	@Override
 	public void startGroup() {
 		renderOrderManager.startGroup();

diff --git a/src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingBuffer.java b/src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingBuffer.java
@@ -3,4 +3,5 @@
 public interface MemoryTrackingBuffer {
 	int getAllocatedSize();
 	int getUsedSize();
+	void freeAndDeleteBuffer();
 }
diff --git a/src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingRenderBuffers.java b/src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingRenderBuffers.java
@@ -4,4 +4,5 @@ public interface MemoryTrackingRenderBuffers {
     int getEntityBufferAllocatedSize();
     int getMiscBufferAllocatedSize();
     int getMaxBegins();
+    void freeAndDeleteBuffers();
 }
diff --git a/src/main/java/net/coderbot/batchedentityrendering/impl/SegmentedBufferBuilder.java b/src/main/java/net/coderbot/batchedentityrendering/impl/SegmentedBufferBuilder.java
@@ -98,4 +98,9 @@ public int getAllocatedSize() {
     public int getUsedSize() {
         return ((MemoryTrackingBuffer) buffer).getUsedSize();
     }
+
+    @Override
+    public void freeAndDeleteBuffer() {
+        ((MemoryTrackingBuffer) buffer).freeAndDeleteBuffer();
+    }
 }
diff --git a/src/main/java/net/coderbot/batchedentityrendering/mixin/ChunkBufferBuilderPackAccessor.java b/src/main/java/net/coderbot/batchedentityrendering/mixin/ChunkBufferBuilderPackAccessor.java
@@ -0,0 +1,15 @@
+package net.coderbot.batchedentityrendering.mixin;
+
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import net.minecraft.client.renderer.ChunkBufferBuilderPack;
+import net.minecraft.client.renderer.RenderType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(ChunkBufferBuilderPack.class)
+public interface ChunkBufferBuilderPackAccessor {
+    @Accessor
+    Map<RenderType, BufferBuilder> getBuilders();
+}
diff --git a/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferBuilder.java b/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferBuilder.java
@@ -2,6 +2,7 @@
 
 import java.nio.ByteBuffer;
 
+import org.lwjgl.system.MemoryUtil;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -23,4 +24,10 @@ public int getAllocatedSize() {
 	public int getUsedSize() {
 		return buffer.position();
 	}
+
+	@Override
+	public void freeAndDeleteBuffer() {
+		MemoryUtil.memFree(buffer);
+		buffer = null;
+	}
 }
diff --git a/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferSource.java b/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferSource.java
@@ -43,4 +43,13 @@ public int getUsedSize() {
 
 		return allocatedSize;
 	}
+
+	@Override
+	public void freeAndDeleteBuffer() {
+		((MemoryTrackingBuffer) builder).freeAndDeleteBuffer();
+
+		for (BufferBuilder builder : fixedBuffers.values()) {
+			((MemoryTrackingBuffer) builder).freeAndDeleteBuffer();
+		}
+	}
 }
diff --git a/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinRenderBuffers.java b/src/main/java/net/coderbot/batchedentityrendering/mixin/MixinRenderBuffers.java
@@ -1,5 +1,7 @@
 package net.coderbot.batchedentityrendering.mixin;
 
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import net.minecraft.client.renderer.*;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -13,9 +15,8 @@
 import net.coderbot.batchedentityrendering.impl.MemoryTrackingBuffer;
 import net.coderbot.batchedentityrendering.impl.MemoryTrackingRenderBuffers;
 import net.coderbot.batchedentityrendering.impl.RenderBuffersExt;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.OutlineBufferSource;
-import net.minecraft.client.renderer.RenderBuffers;
+
+import java.util.SortedMap;
 
 @Mixin(RenderBuffers.class)
 public class MixinRenderBuffers implements RenderBuffersExt, MemoryTrackingRenderBuffers, DrawCallTrackingRenderBuffers {
@@ -35,6 +36,14 @@ public class MixinRenderBuffers implements RenderBuffersExt, MemoryTrackingRende
 	@Final
 	private MultiBufferSource.BufferSource bufferSource;
 
+	@Shadow
+	@Final
+	private ChunkBufferBuilderPack fixedBufferPack;
+
+	@Shadow
+	@Final
+	private SortedMap<RenderType, BufferBuilder> fixedBuffers;
+
 	@Inject(method = "bufferSource", at = @At("HEAD"), cancellable = true)
 	private void batchedentityrendering$replaceBufferSource(CallbackInfoReturnable<MultiBufferSource.BufferSource> cir) {
 		if (begins == 0) {
@@ -106,6 +115,14 @@ public int getMaxBegins() {
 		return maxBegins;
 	}
 
+	@Override
+	public void freeAndDeleteBuffers() {
+		buffered.freeAndDeleteBuffer();
+		((ChunkBufferBuilderPackAccessor) this.fixedBufferPack).getBuilders().values().forEach(bufferBuilder -> ((MemoryTrackingBuffer) bufferBuilder).freeAndDeleteBuffer());
+		fixedBuffers.values().forEach(bufferBuilder -> ((MemoryTrackingBuffer) bufferBuilder).freeAndDeleteBuffer());
+		((MemoryTrackingBuffer) ((OutlineBufferSourceAccessor) outlineBufferSource).getOutlineBufferSource()).freeAndDeleteBuffer();
+	}
+
 	@Override
 	public int getDrawCalls() {
 		return buffered.getDrawCalls();

diff --git a/src/main/java/net/coderbot/batchedentityrendering/mixin/OutlineBufferSourceAccessor.java b/src/main/java/net/coderbot/batchedentityrendering/mixin/OutlineBufferSourceAccessor.java
@@ -0,0 +1,12 @@
+package net.coderbot.batchedentityrendering.mixin;
+
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.OutlineBufferSource;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(OutlineBufferSource.class)
+public interface OutlineBufferSourceAccessor {
+    @Accessor
+    MultiBufferSource.BufferSource getOutlineBufferSource();
+}
diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java
@@ -853,6 +853,10 @@ public void destroy() {
 			shadowRenderTargets.destroy();
 		}
 
+		if(shadowRenderer != null) {
+			shadowRenderer.destroy();
+		}
+
 		// Destroy custom textures and the static samplers (normals, specular, and noise)
 		customTextureManager.destroy();
 		whitePixel.releaseId();

diff --git a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import net.coderbot.batchedentityrendering.impl.MemoryTrackingRenderBuffers;
 import org.lwjgl.opengl.ARBTextureSwizzle;
 import org.lwjgl.opengl.GL20C;
 import org.lwjgl.opengl.GL30C;
@@ -649,6 +650,11 @@ private String getBlockEntitiesDebugString() {
 		return shouldRenderBlockEntities ? (renderedShadowBlockEntities + "/" + Minecraft.getInstance().level.blockEntityList.size()) : "disabled by pack";
 	}
 
+	public void destroy() {
+		targets.destroy();
+		((MemoryTrackingRenderBuffers) buffers).freeAndDeleteBuffers();
+	}
+
 	private static class MipmapPass {
 		private final int texture;
 		private final int targetFilteringMode;

diff --git a/src/main/java/net/coderbot/iris/uniforms/ExternallyManagedUniforms.java b/src/main/java/net/coderbot/iris/uniforms/ExternallyManagedUniforms.java
@@ -12,6 +12,9 @@ public static void addExternallyManagedUniforms(UniformHolder uniformHolder) {
 		addMat4(uniformHolder, "iris_ModelViewMatrix");
 		addMat4(uniformHolder, "u_ModelViewProjectionMatrix");
 		addMat4(uniformHolder, "iris_NormalMatrix");
+		// Exclusive to pre-1.19
+		addFloat(uniformHolder, "darknessFactor");
+		addFloat(uniformHolder, "darknessLightFactor");
 	}
 
 	public static void addExternallyManagedUniforms116(UniformHolder uniformHolder) {

diff --git a/src/main/resources/oculus-batched-entity-rendering.mixins.json b/src/main/resources/oculus-batched-entity-rendering.mixins.json
@@ -5,6 +5,8 @@
   "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
+    "ChunkBufferBuilderPackAccessor",
+    "OutlineBufferSourceAccessor",
     "MixinBufferBuilder",
     "MixinBufferBuilder_SegmentRendering",
     "MixinRenderBuffers",