Skip to content

Commit b381462

Browse files
committed
Revert "Memory Leaks fixes"
This reverts commit 86850e3. Caused native errors with JEmalloc
1 parent 0a0db8f commit b381462

12 files changed

+3
-89
lines changed

src/main/java/net/coderbot/batchedentityrendering/impl/FullyBufferedMultiBufferSource.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,6 @@ public int getUsedSize() {
175175
return size;
176176
}
177177

178-
@Override
179-
public void freeAndDeleteBuffer() {
180-
for (SegmentedBufferBuilder builder : builders) {
181-
builder.freeAndDeleteBuffer();
182-
}
183-
}
184-
185178
@Override
186179
public void startGroup() {
187180
renderOrderManager.startGroup();

src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingBuffer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
public interface MemoryTrackingBuffer {
44
int getAllocatedSize();
55
int getUsedSize();
6-
void freeAndDeleteBuffer();
76
}

src/main/java/net/coderbot/batchedentityrendering/impl/MemoryTrackingRenderBuffers.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ public interface MemoryTrackingRenderBuffers {
44
int getEntityBufferAllocatedSize();
55
int getMiscBufferAllocatedSize();
66
int getMaxBegins();
7-
void freeAndDeleteBuffers();
87
}

src/main/java/net/coderbot/batchedentityrendering/impl/SegmentedBufferBuilder.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,4 @@ public int getAllocatedSize() {
9898
public int getUsedSize() {
9999
return ((MemoryTrackingBuffer) buffer).getUsedSize();
100100
}
101-
102-
@Override
103-
public void freeAndDeleteBuffer() {
104-
((MemoryTrackingBuffer) buffer).freeAndDeleteBuffer();
105-
}
106101
}

src/main/java/net/coderbot/batchedentityrendering/mixin/ChunkBufferBuilderPackAccessor.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferBuilder.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.nio.ByteBuffer;
44

5-
import org.lwjgl.system.MemoryUtil;
65
import org.spongepowered.asm.mixin.Mixin;
76
import org.spongepowered.asm.mixin.Shadow;
87

@@ -24,10 +23,4 @@ public int getAllocatedSize() {
2423
public int getUsedSize() {
2524
return buffer.position();
2625
}
27-
28-
@Override
29-
public void freeAndDeleteBuffer() {
30-
MemoryUtil.memFree(buffer);
31-
buffer = null;
32-
}
3326
}

src/main/java/net/coderbot/batchedentityrendering/mixin/MixinBufferSource.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,4 @@ public int getUsedSize() {
4343

4444
return allocatedSize;
4545
}
46-
47-
@Override
48-
public void freeAndDeleteBuffer() {
49-
((MemoryTrackingBuffer) builder).freeAndDeleteBuffer();
50-
51-
for (BufferBuilder builder : fixedBuffers.values()) {
52-
((MemoryTrackingBuffer) builder).freeAndDeleteBuffer();
53-
}
54-
}
5546
}

src/main/java/net/coderbot/batchedentityrendering/mixin/MixinRenderBuffers.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.coderbot.batchedentityrendering.mixin;
22

3-
import com.mojang.blaze3d.vertex.BufferBuilder;
4-
import net.minecraft.client.renderer.*;
53
import org.spongepowered.asm.mixin.Final;
64
import org.spongepowered.asm.mixin.Mixin;
75
import org.spongepowered.asm.mixin.Shadow;
@@ -15,8 +13,9 @@
1513
import net.coderbot.batchedentityrendering.impl.MemoryTrackingBuffer;
1614
import net.coderbot.batchedentityrendering.impl.MemoryTrackingRenderBuffers;
1715
import net.coderbot.batchedentityrendering.impl.RenderBuffersExt;
18-
19-
import java.util.SortedMap;
16+
import net.minecraft.client.renderer.MultiBufferSource;
17+
import net.minecraft.client.renderer.OutlineBufferSource;
18+
import net.minecraft.client.renderer.RenderBuffers;
2019

2120
@Mixin(RenderBuffers.class)
2221
public class MixinRenderBuffers implements RenderBuffersExt, MemoryTrackingRenderBuffers, DrawCallTrackingRenderBuffers {
@@ -36,14 +35,6 @@ public class MixinRenderBuffers implements RenderBuffersExt, MemoryTrackingRende
3635
@Final
3736
private MultiBufferSource.BufferSource bufferSource;
3837

39-
@Shadow
40-
@Final
41-
private ChunkBufferBuilderPack fixedBufferPack;
42-
43-
@Shadow
44-
@Final
45-
private SortedMap<RenderType, BufferBuilder> fixedBuffers;
46-
4738
@Inject(method = "bufferSource", at = @At("HEAD"), cancellable = true)
4839
private void batchedentityrendering$replaceBufferSource(CallbackInfoReturnable<MultiBufferSource.BufferSource> cir) {
4940
if (begins == 0) {
@@ -115,14 +106,6 @@ public int getMaxBegins() {
115106
return maxBegins;
116107
}
117108

118-
@Override
119-
public void freeAndDeleteBuffers() {
120-
buffered.freeAndDeleteBuffer();
121-
((ChunkBufferBuilderPackAccessor) this.fixedBufferPack).getBuilders().values().forEach(bufferBuilder -> ((MemoryTrackingBuffer) bufferBuilder).freeAndDeleteBuffer());
122-
fixedBuffers.values().forEach(bufferBuilder -> ((MemoryTrackingBuffer) bufferBuilder).freeAndDeleteBuffer());
123-
((MemoryTrackingBuffer) ((OutlineBufferSourceAccessor) outlineBufferSource).getOutlineBufferSource()).freeAndDeleteBuffer();
124-
}
125-
126109
@Override
127110
public int getDrawCalls() {
128111
return buffered.getDrawCalls();

src/main/java/net/coderbot/batchedentityrendering/mixin/OutlineBufferSourceAccessor.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -853,10 +853,6 @@ public void destroy() {
853853
shadowRenderTargets.destroy();
854854
}
855855

856-
if(shadowRenderer != null) {
857-
shadowRenderer.destroy();
858-
}
859-
860856
// Destroy custom textures and the static samplers (normals, specular, and noise)
861857
customTextureManager.destroy();
862858
whitePixel.releaseId();

0 commit comments

Comments
 (0)