From 8229ed9aa03f371a2e90396dc0f487ff42d70b9d Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 22 Dec 2023 20:07:20 -0500 Subject: [PATCH] Prevent sorts from replacing rebuilds for a section --- .../render/chunk/ChunkRenderManager.java | 2 +- .../render/chunk/compile/ChunkBuilder.java | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) 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 e88babb11..92ef1b3e8 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 @@ -582,7 +582,7 @@ public class ChunkRenderManager implements ChunkSt if (!futures.isEmpty()) { this.dirty = true; - this.backend.upload(RenderDevice.INSTANCE.createCommandList(), new FutureDequeDrain<>(futures)); + 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 e0353a261..79caf8300 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 @@ -2,6 +2,7 @@ package me.jellysquid.mods.sodium.client.render.chunk.compile; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue; +import it.unimi.dsi.fastutil.objects.Reference2ReferenceLinkedOpenHashMap; import me.jellysquid.mods.sodium.client.SodiumClientMod; import me.jellysquid.mods.sodium.client.gl.device.RenderDevice; import me.jellysquid.mods.sodium.client.model.vertex.type.ChunkVertexType; @@ -27,6 +28,7 @@ import org.joml.Vector3d; import java.util.ArrayList; import java.util.Deque; +import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentLinkedDeque; @@ -163,6 +165,29 @@ public class ChunkBuilder { this.sectionCache.cleanup(); } + /** + * Prevent sort updates from taking priority over rebuild updates in the upload queue. + */ + public Iterator> filterChunkBuilds(Iterator> uploadIterator) { + Reference2ReferenceLinkedOpenHashMap, ChunkBuildResult> map = new Reference2ReferenceLinkedOpenHashMap<>(); + + while (uploadIterator.hasNext()) { + ChunkBuildResult result = uploadIterator.next(); + ChunkRenderContainer section = result.render; + + ChunkBuildResult oldResult = map.get(section); + + // Allow a result to replace the previous result in the map if one of the following conditions hold: + // * There is no previous upload in the queue + // * The new upload replaces more render types than the old one (in practice, is a rebuild while the other is a sort) + if(oldResult == null || result.passesToUpload.length >= oldResult.passesToUpload.length) { + map.put(section, result); + } + } + + return map.values().iterator(); + } + /** * Processes all pending build task uploads using the chunk render backend. */ @@ -172,7 +197,7 @@ public class ChunkBuilder { return false; } - this.backend.upload(RenderDevice.INSTANCE.createCommandList(), new DequeDrain<>(this.uploadQueue)); + this.backend.upload(RenderDevice.INSTANCE.createCommandList(), filterChunkBuilds(new DequeDrain<>(this.uploadQueue))); return true; }