From 523cb55889cd9d2cf3aa08ae82ef0aa5d14b8ad2 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Mon, 14 Apr 2025 14:46:14 +1000 Subject: [PATCH] barrier --- .../cortex/voxy/client/core/rendering/util/DownloadStream.java | 2 ++ .../me/cortex/voxy/client/core/rendering/util/UploadStream.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java index de10f7a7..4c251b07 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java @@ -105,10 +105,12 @@ public class DownloadStream { public void commit() { + glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT | GL_BUFFER_UPDATE_BARRIER_BIT); //Copies all the data from target buffers into the download stream for (var entry : this.downloadList) { glCopyNamedBufferSubData(entry.target.id, this.downloadBuffer.id, entry.targetOffset, entry.downloadStreamOffset, entry.size); } + glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT | GL_BUFFER_UPDATE_BARRIER_BIT); this.thisFrameDownloadList.addAll(this.downloadList); this.downloadList.clear(); diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java index ecf7dc01..f1efaa9d 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java @@ -17,6 +17,7 @@ import static org.lwjgl.opengl.GL11.glFinish; import static org.lwjgl.opengl.GL42.glMemoryBarrier; import static org.lwjgl.opengl.GL42C.GL_BUFFER_UPDATE_BARRIER_BIT; import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BARRIER_BIT; +import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT; import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT; public class UploadStream { @@ -79,6 +80,7 @@ public class UploadStream { public void commit() { + glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT); //Execute all the copies for (var entry : this.uploadList) { glCopyNamedBufferSubData(this.uploadBuffer.id, entry.target.id, entry.uploadOffset, entry.targetOffset, entry.size);