diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLContextState.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLContextState.java index eb5887cfa..2f9947f66 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLContextState.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLContextState.java @@ -236,6 +236,8 @@ public class GLContextState { public int boundCopyReadBuffer; public int boundCopyWriteBuffer; public final Int2IntMap boundOtherBuffers = new Int2IntOpenHashMap(); + public final int[] uniformBufferBindings = new int[GLStateManager.INDEXED_BUFFER_SLOTS]; + public final int[] storageBufferBindings = new int[GLStateManager.INDEXED_BUFFER_SLOTS]; public PixelStoreState pixelUnpackState = PixelStoreState.DEFAULT; public PixelStoreState pixelPackState = PixelStoreState.DEFAULT; public final int[] clientAttribSavedMask = new int[GLStateManager.CLIENT_ATTRIB_STACK_DEPTH]; diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index c735fee1a..6712bddc9 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -93,7 +93,6 @@ import org.lwjgl.opengl.Display; import org.lwjgl.opengl.Drawable; import org.lwjgl.opengl.EXTTextureFilterAnisotropic; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL42; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL14; @@ -104,6 +103,8 @@ import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL31; import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL33; +import org.lwjgl.opengl.GL42; +import org.lwjgl.opengl.GL43; import org.lwjgl.opengl.GLContext; import org.lwjgl.opengl.KHRDebug; import org.lwjgl.opengl.KHRDebugCallback; @@ -328,6 +329,7 @@ public class GLStateManager { public static final int MAX_PROJECTION_STACK_DEPTH = 4; public static final int MAX_TEXTURE_STACK_DEPTH = 4; public static final int MAX_CLIP_PLANES = 8; + public static final int INDEXED_BUFFER_SLOTS = 64; public static final int MAX_TEXTURE_UNITS = RENDER_BACKEND.getInteger(GL20.GL_MAX_TEXTURE_IMAGE_UNITS); public static final int MAX_LEGACY_TEXTURE_UNITS = Math.min(VertexKey.MAX_UNITS, MAX_TEXTURE_UNITS); public static final int MAX_TEXTURE_COORDS = Math.min(VAOManager.TEX_COORD_UNITS, MAX_TEXTURE_UNITS); @@ -7263,6 +7265,10 @@ public class GLStateManager { e.setValue(0); RENDER_BACKEND.bindBuffer(e.getIntKey(), 0); } + for (int i = 0; i < INDEXED_BUFFER_SLOTS; i++) { + if (glCtx.uniformBufferBindings[i] == buffer) glCtx.uniformBufferBindings[i] = 0; + if (glCtx.storageBufferBindings[i] == buffer) glCtx.storageBufferBindings[i] = 0; + } writeMappedBuffers.remove(buffer); glCtx.vaos.onDeleteBuffer(buffer); @@ -7877,7 +7883,9 @@ public class GLStateManager { public static void glBindBufferBase(int target, int index, int buffer) { final boolean locked = acquireDrawLock(); try { - trackBufferBinding(ctx(), target, buffer); + final GLContextState glCtx = ctx(); + trackBufferBinding(glCtx, target, buffer); + trackIndexedBufferBinding(glCtx, target, index, buffer); RENDER_BACKEND.bindBufferBase(target, index, buffer); } finally { if (locked) releaseDrawLock(); @@ -7887,13 +7895,35 @@ public class GLStateManager { public static void glBindBufferRange(int target, int index, int buffer, long offset, long size) { final boolean locked = acquireDrawLock(); try { - trackBufferBinding(ctx(), target, buffer); + final GLContextState glCtx = ctx(); + trackBufferBinding(glCtx, target, buffer); + trackIndexedBufferBinding(glCtx, target, index, buffer); RENDER_BACKEND.bindBufferRange(target, index, buffer, offset, size); } finally { if (locked) releaseDrawLock(); } } + private static int[] indexedBufferBindings(GLContextState glCtx, int target, int index) { + if (index < 0 || index >= INDEXED_BUFFER_SLOTS) return null; + if (target == GL31.GL_UNIFORM_BUFFER) return glCtx.uniformBufferBindings; + if (target == GL43.GL_SHADER_STORAGE_BUFFER) return glCtx.storageBufferBindings; + return null; + } + + private static void trackIndexedBufferBinding(GLContextState glCtx, int target, int index, int buffer) { + final int[] bindings = indexedBufferBindings(glCtx, target, index); + if (bindings != null) bindings[index] = buffer; + } + + public static int getIndexedBufferBinding(int target, int index) { + if (isCachingEnabled()) { + final int[] bindings = indexedBufferBindings(ctx(), target, index); + if (bindings != null) return bindings[index]; + } + return RENDER_BACKEND.getIndexedBufferBinding(target, index); + } + public static int glGetUniformBlockIndex(int program, CharSequence name) { return RENDER_BACKEND.getUniformBlockIndex(program, name); } public static void glUniformBlockBinding(int program, int blockIndex, int binding) { RENDER_BACKEND.uniformBlockBinding(program, blockIndex, binding); } public static void glBindFragDataLocation(int program, int colorNumber, CharSequence name) { RENDER_BACKEND.bindFragDataLocation(program, colorNumber, name); } @@ -8652,7 +8682,9 @@ public class GLStateManager { return ctx().imageUnits.get(unit); } - private static int imageBindingOrBackend(int pname, int index) { + private static int indexedIntegerOrBackend(int pname, int index) { + if (pname == GL31.GL_UNIFORM_BUFFER_BINDING) return getIndexedBufferBinding(GL31.GL_UNIFORM_BUFFER, index); + if (pname == GL43.GL_SHADER_STORAGE_BUFFER_BINDING) return getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, index); final ImageUnitBinding binding = !isCachingEnabled() ? null : ctx().imageUnits.get(index); if (binding == null) return RENDER_BACKEND.getIntegerIndexed(pname, index); return switch (pname) { @@ -8667,11 +8699,11 @@ public class GLStateManager { } public static int glGetInteger(int pname, int index) { - return imageBindingOrBackend(pname, index); + return indexedIntegerOrBackend(pname, index); } public static int glGetIntegeri(int pname, int index) { - return imageBindingOrBackend(pname, index); + return indexedIntegerOrBackend(pname, index); } public static void glGetIntegeri(int pname, int index, IntBuffer params) { @@ -8679,11 +8711,11 @@ public class GLStateManager { } public static void glGetIntegeri_v(int pname, int index, IntBuffer params) { - params.put(params.position(), imageBindingOrBackend(pname, index)); + params.put(params.position(), indexedIntegerOrBackend(pname, index)); } public static void glGetBooleani_v(int pname, int index, ByteBuffer params) { - params.put(params.position(), (byte) (imageBindingOrBackend(pname, index) != 0 ? GL11.GL_TRUE : GL11.GL_FALSE)); + params.put(params.position(), (byte) (indexedIntegerOrBackend(pname, index) != 0 ? GL11.GL_TRUE : GL11.GL_FALSE)); } public static void glGetBooleani(int pname, int index, ByteBuffer params) { diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java index df139ea84..b6f40bcfa 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java @@ -556,7 +556,7 @@ public class RenderSystem { } public static int getIndexedBufferBinding(int target, int index) { - return RENDER_BACKEND.getIndexedBufferBinding(target, index); + return GLStateManager.getIndexedBufferBinding(target, index); } public static void bindBufferBase(int target, int index, int buffer) { diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_DeletedBufferBinding_GLTest.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_DeletedBufferBinding_GLTest.java index 114c7a13a..1eb527ed1 100644 --- a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_DeletedBufferBinding_GLTest.java +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_DeletedBufferBinding_GLTest.java @@ -6,6 +6,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL21; import org.lwjgl.opengl.GL30; +import org.lwjgl.opengl.GL31; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -61,6 +62,18 @@ public class GLSM_DeletedBufferBinding_GLTest { } } + @Test + void deletedIndexedUniformBufferIsNotRestoredFromCache() { + final int index = 3; + final int ubo = makeBoundBuffer(GL31.GL_UNIFORM_BUFFER); + GLStateManager.glBindBufferBase(GL31.GL_UNIFORM_BUFFER, index, ubo); + assertEquals(ubo, GLStateManager.getIndexedBufferBinding(GL31.GL_UNIFORM_BUFFER, index)); + + GLStateManager.glDeleteBuffers(ubo); + assertEquals(0, GL30.glGetInteger(GL31.GL_UNIFORM_BUFFER_BINDING, index)); + assertEquals(0, GLStateManager.getIndexedBufferBinding(GL31.GL_UNIFORM_BUFFER, index)); + } + @Test void deletedElementArrayBufferDoesNotBlockClientDrawElements() { final int ebo = makeBoundBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuDrivenChunkCuller.java b/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuDrivenChunkCuller.java index 306d7d166..437b7cf41 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuDrivenChunkCuller.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuDrivenChunkCuller.java @@ -41,6 +41,12 @@ public final class GpuDrivenChunkCuller { private int metaCapacityBytes; + private int savedProgram; + private int savedVisibleSsbo; + private int savedMetaSsbo; + private int savedIndirectSsbo; + private int savedFrustumUbo; + public boolean ensureReady() { if (ready) return true; if (disabled) return false; @@ -88,28 +94,31 @@ public final class GpuDrivenChunkCuller { GLStateManager.glBufferSubData(GL31.GL_UNIFORM_BUFFER, 0L, frustumUboBytes); } - public void dispatch(int visibleSsboGlId, int indirectSsboGlId, int visibleCount) { - if (!ready || visibleCount <= 0) return; - final int previousProgram = GLStateManager.getActiveProgram(); - final int prevSsbo0 = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, VISIBLE_SSBO_BINDING); - final int prevSsbo1 = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, META_SSBO_BINDING); - final int prevSsbo2 = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, INDIRECT_SSBO_BINDING); - final int prevUbo = RenderSystem.getIndexedBufferBinding(GL31.GL_UNIFORM_BUFFER, FRUSTUM_UBO_BINDING); + void beginDispatches(int visibleSsboGlId, int indirectSsboGlId) { + savedProgram = GLStateManager.getActiveProgram(); + savedVisibleSsbo = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, VISIBLE_SSBO_BINDING); + savedMetaSsbo = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, META_SSBO_BINDING); + savedIndirectSsbo = RenderSystem.getIndexedBufferBinding(GL43.GL_SHADER_STORAGE_BUFFER, INDIRECT_SSBO_BINDING); + savedFrustumUbo = RenderSystem.getIndexedBufferBinding(GL31.GL_UNIFORM_BUFFER, FRUSTUM_UBO_BINDING); GLStateManager.glUseProgram(program.handle()); RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, VISIBLE_SSBO_BINDING, visibleSsboGlId); RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, META_SSBO_BINDING, metaSsboGlId); RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, INDIRECT_SSBO_BINDING, indirectSsboGlId); RenderSystem.bindBufferBase(GL31.GL_UNIFORM_BUFFER, FRUSTUM_UBO_BINDING, frustumUboGlId); + } + void dispatch(int visibleCount) { final int groups = (visibleCount + LOCAL_SIZE_X - 1) / LOCAL_SIZE_X; GLStateManager.glDispatchCompute(groups, 1, 1); - GLStateManager.glMemoryBarrier(GL43.GL_SHADER_STORAGE_BARRIER_BIT | GL42.GL_COMMAND_BARRIER_BIT); + } - RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, VISIBLE_SSBO_BINDING, prevSsbo0); - RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, META_SSBO_BINDING, prevSsbo1); - RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, INDIRECT_SSBO_BINDING, prevSsbo2); - RenderSystem.bindBufferBase(GL31.GL_UNIFORM_BUFFER, FRUSTUM_UBO_BINDING, prevUbo); - GLStateManager.glUseProgram(previousProgram); + void endDispatches() { + GLStateManager.glMemoryBarrier(GL43.GL_SHADER_STORAGE_BARRIER_BIT | GL42.GL_COMMAND_BARRIER_BIT); + RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, VISIBLE_SSBO_BINDING, savedVisibleSsbo); + RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, META_SSBO_BINDING, savedMetaSsbo); + RenderSystem.bindBufferBase(GL43.GL_SHADER_STORAGE_BUFFER, INDIRECT_SSBO_BINDING, savedIndirectSsbo); + RenderSystem.bindBufferBase(GL31.GL_UNIFORM_BUFFER, FRUSTUM_UBO_BINDING, savedFrustumUbo); + GLStateManager.glUseProgram(savedProgram); } public synchronized void shutdown() { diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuTerrainCuller.java b/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuTerrainCuller.java index 18319c9b2..c0cdf9280 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuTerrainCuller.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/culling/GpuTerrainCuller.java @@ -261,12 +261,14 @@ public final class GpuTerrainCuller { GLStateManager.glBindBuffer(GL43.GL_SHADER_STORAGE_BUFFER, visibleSsboGlId); GLStateManager.glBufferSubData(GL43.GL_SHADER_STORAGE_BUFFER, 0L, visibleStagingView); + culler.beginDispatches(visibleSsboGlId, indirectSsboGlId); BackendManager.RENDER_BACKEND.beginComputeDispatchBatch(); try { dispatchPass(primaryPass); if (secondPrepared) dispatchPass(secondPass); if (translucentReady) dispatchPass(sortedPass); } finally { + culler.endDispatches(); BackendManager.RENDER_BACKEND.endComputeDispatchBatch(); } } @@ -280,7 +282,7 @@ public final class GpuTerrainCuller { FrustumExtractor.patchControl(r.entryCount, r.indexPointerMask, frustumUboBytes); FrustumExtractor.patchBatchEntryBase(r.entryBase, frustumUboBytes); culler.uploadFrustum(frustumUboBytes); - culler.dispatch(visibleSsboGlId, indirectSsboGlId, r.entryCount); + culler.dispatch(r.entryCount); r.dispatched = true; }