diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java index 92ef1b3e8..6891c64ce 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java @@ -580,6 +580,9 @@ public class ChunkRenderManager implements ChunkSt // Try to complete some other work on the main thread while we wait for rebuilds to complete this.dirty |= this.builder.performPendingUploads(); + // See if there are failed builds + this.builder.handleFailures(); + if (!futures.isEmpty()) { this.dirty = true; this.backend.upload(RenderDevice.INSTANCE.createCommandList(), this.builder.filterChunkBuilds(new FutureDequeDrain<>(futures))); 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 79caf8300..56ccd356d 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 @@ -22,6 +22,7 @@ import me.jellysquid.mods.sodium.common.util.collections.DequeDrain; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.util.MathHelper; +import net.minecraft.util.ReportedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.joml.Vector3d; @@ -45,6 +46,7 @@ public class ChunkBuilder { private final Deque> buildQueue = new ConcurrentLinkedDeque<>(); private final Deque> uploadQueue = new ConcurrentLinkedDeque<>(); + private final Deque failureQueue = new ConcurrentLinkedDeque<>(); private final Object jobNotifier = new Object(); @@ -150,6 +152,7 @@ public class ChunkBuilder { // Drop any pending work queues and cancel futures this.uploadQueue.clear(); + this.failureQueue.clear(); for (WrappedTask job : this.buildQueue) { job.future.cancel(true); @@ -202,6 +205,22 @@ public class ChunkBuilder { return true; } + public void handleFailures() { + Iterator errorIterator = new DequeDrain<>(this.failureQueue); + + if (errorIterator.hasNext()) { + // If there is any exception from the build failure queue, throw it + Throwable ex = errorIterator.next(); + + if (ex instanceof ReportedException) { + // Propagate ReportedExceptions directly to provide extra information + throw (ReportedException)ex; + } else { + throw new RuntimeException("Chunk build failed", ex); + } + } + } + public CompletableFuture> schedule(ChunkRenderBuildTask task) { if (!this.running.get()) { throw new IllegalStateException("Executor is stopped"); @@ -275,6 +294,16 @@ public class ChunkBuilder { return Runtime.getRuntime().availableProcessors(); } + private void handleCompletion(CompletableFuture> future) { + future.whenComplete((res, ex) -> { + if (ex != null) { + this.failureQueue.add(ex); + } else if (res != null) { + this.enqueueUpload(res); + } + }); + } + /** * Creates a rebuild task and defers it to the work queue. When the task is completed, it will be moved onto the * completed uploads queued which will then be drained during the next available synchronization point with the @@ -282,8 +311,7 @@ public class ChunkBuilder { * @param render The render to rebuild */ public void deferRebuild(ChunkRenderContainer render) { - this.scheduleRebuildTaskAsync(render) - .thenAccept(this::enqueueUpload); + handleCompletion(this.scheduleRebuildTaskAsync(render)); } /** @@ -293,8 +321,7 @@ public class ChunkBuilder { * @param render The render to rebuild */ public void deferSort(ChunkRenderContainer render) { - this.scheduleSortTaskAsync(render) - .thenAccept(this::enqueueUpload); + handleCompletion(this.scheduleSortTaskAsync(render)); }