spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added waiting for gpu memory collection

Browse Source
This commit is contained in:
mcrcortex
2025-08-27 18:56:06 +10:00
parent 63a969e5df
commit 544c1df366
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/me/cortex/voxy/client/core/rendering/section/geometry/BasicSectionGeometryData.java
View File

@@ -1,8 +1,11 @@
package me.cortex.voxy.client.core.rendering.section.geometry; package me.cortex.voxy.client.core.rendering.section.geometry;
import me.cortex.voxy.client.core.gl.Capabilities;
import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlBuffer;
import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.Logger;
import static org.lwjgl.opengl.GL11C.glFinish;
public class BasicSectionGeometryData implements IGeometryData { public class BasicSectionGeometryData implements IGeometryData {
public static final int SECTION_METADATA_SIZE = 32; public static final int SECTION_METADATA_SIZE = 32;
private final GlBuffer sectionMetadataBuffer; private final GlBuffer sectionMetadataBuffer;
@@ -20,6 +23,9 @@ public class BasicSectionGeometryData implements IGeometryData {
} }
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Logger.info("Creating and zeroing " + (geometryCapacity/(1024*1024)) + "MB geometry buffer"); Logger.info("Creating and zeroing " + (geometryCapacity/(1024*1024)) + "MB geometry buffer");
if (Capabilities.INSTANCE.canQueryGpuMemory) {
Logger.info("driver states " + (Capabilities.INSTANCE.getFreeDedicatedGpuMemory()/(1024*1024)) + "MB of free memory");
}
Logger.info("if your game crashes/exits here without any other log message, try manually decreasing the geometry capacity"); Logger.info("if your game crashes/exits here without any other log message, try manually decreasing the geometry capacity");
this.geometryBuffer = new GlBuffer(geometryCapacity); this.geometryBuffer = new GlBuffer(geometryCapacity);
long delta = System.currentTimeMillis() - start; long delta = System.currentTimeMillis() - start;
@@ -53,6 +59,31 @@ public class BasicSectionGeometryData implements IGeometryData {
@Override @Override
public void free() { public void free() {
this.sectionMetadataBuffer.free(); this.sectionMetadataBuffer.free();
long gpuMemory = 0;
if (Capabilities.INSTANCE.canQueryGpuMemory) {
glFinish();
gpuMemory = Capabilities.INSTANCE.getFreeDedicatedGpuMemory();
}
glFinish();
this.geometryBuffer.free(); this.geometryBuffer.free();
glFinish();
if (Capabilities.INSTANCE.canQueryGpuMemory) {
long releaseSize = (long) (this.geometryBuffer.size()*0.75);//if gpu memory usage drops by 75% of the expected value assume we freed it
if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory()-gpuMemory<=releaseSize) {
Logger.info("Attempting to wait for gpu memory to release");
long start = System.currentTimeMillis();
long TIMEOUT = 2500;
while (System.currentTimeMillis() - start > TIMEOUT) {//Wait up to 2.5 seconds for memory to release
glFinish();
if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - gpuMemory > releaseSize) break;
}
if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - gpuMemory <= releaseSize) {
Logger.warn("Failed to wait for gpu memory to be freed, this could indicate an issue with the driver");
}
}
}
} }
} }