From adb582cd1e5b8d08072bba3e09f28523800921cd Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:20:06 -0500 Subject: [PATCH] Fix chunk updates not unparking main thread upon completion (#127) --- .../mods/sodium/client/render/chunk/compile/ChunkBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder.java index cb2335ff9..e0353a261 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder.java @@ -1,5 +1,6 @@ package me.jellysquid.mods.sodium.client.render.chunk.compile; +import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue; import me.jellysquid.mods.sodium.client.SodiumClientMod; import me.jellysquid.mods.sodium.client.gl.device.RenderDevice; @@ -30,6 +31,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.LockSupport; public class ChunkBuilder { /** @@ -365,6 +367,8 @@ public class ChunkBuilder { if (result != null) { // Notify the future that the result is now available job.future.complete(result); + // Unpark the main thread so it wakes up if it was blocking on the future having completed + LockSupport.unpark(GLStateManager.getMainThread()); } else if (!job.isCancelled()) { // If the job wasn't cancelled and no result was produced, we've hit a bug job.future.completeExceptionally(new RuntimeException("No result was produced by the task"));