mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

No one can hear you free

Browse Source 
- Silence empty model warning behind a system property
- Fix gpu memory leak from light/matrix buffers on indirect
This commit is contained in:
Jozufozu 2024-11-11 22:33:41 -08:00
parent 6709682785
commit 868a263c28
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java
View File

@ -28,6 +28,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelBakery;
public abstract class DrawManager<N extends AbstractInstancer<?>> { public abstract class DrawManager<N extends AbstractInstancer<?>> {
private static final boolean WARN_EMPTY_MODELS = Boolean.getBoolean("flywheel.warnEmptyModels");
/** /**
* A map of instancer keys to instancers. * A map of instancer keys to instancers.
* <br> * <br>
@ -100,15 +102,16 @@ public abstract class DrawManager<N extends AbstractInstancer<?>> {
return true; return true;
} }
StringBuilder builder = new StringBuilder(); if (WARN_EMPTY_MODELS) {
builder.append("Creating an instancer for a model with no meshes! Stack trace:"); StringBuilder builder = new StringBuilder();
builder.append("Creating an instancer for a model with no meshes! Stack trace:");
StackWalker.getInstance() StackWalker.getInstance()
// .walk(s -> s.skip(3)) // this causes forEach to crash for some reason .forEach(f -> builder.append("\n\t")
.forEach(f -> builder.append("\n\t") .append(f.toString()));
.append(f.toString()));
FlwBackend.LOGGER.warn(builder.toString()); FlwBackend.LOGGER.warn(builder.toString());
}
return false; return false;
} }

4
common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java
View File

@ -186,6 +186,10 @@ public class IndirectDrawManager extends DrawManager<IndirectInstancer<?>> {
programs.release(); programs.release();
depthPyramid.delete(); depthPyramid.delete();
lightBuffers.delete();
matrixBuffer.delete();
} }
public void renderCrumbling(List<Engine.CrumblingBlock> crumblingBlocks) { public void renderCrumbling(List<Engine.CrumblingBlock> crumblingBlocks) {

5
common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/LightBuffers.java
View File

@ -40,4 +40,9 @@ public class LightBuffers {
GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.LIGHT_LUT, lut.handle(), 0, lut.byteCapacity()); GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.LIGHT_LUT, lut.handle(), 0, lut.byteCapacity());
GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.LIGHT_SECTION, sections.handle(), 0, sections.byteCapacity()); GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.LIGHT_SECTION, sections.handle(), 0, sections.byteCapacity());
} }
public void delete() {
lut.delete();
sections.delete();
}
} }

4
common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/MatrixBuffer.java
View File

@ -30,4 +30,8 @@ public class MatrixBuffer {
GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.MATRICES, matrices.handle(), 0, matrices.byteCapacity()); GL46.glBindBufferRange(GL46.GL_SHADER_STORAGE_BUFFER, BufferBindings.MATRICES, matrices.handle(), 0, matrices.byteCapacity());
} }
public void delete() {
matrices.delete();
}
} }