Remove redundant code for implementation of the sort task defer mode.

There was previously an implementation for controlling sort task deferring as part of the sorting code. A different implementation of essentially the same concept but for rebuild tasks was added later. Now they both use the newer approach, which simplifies the task submit code.

Author: douira

common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/ChunkUpdateTypes.java

@@ -37,15 +37,15 @@ public static boolean isRebuildWithSort(int type) {
         return (isRebuild(type) || isInitialBuild(type)) && isSort(type);
     }
 
-    public static TaskQueueType getQueueType(int type, TaskQueueType importantRebuildQueueType) {
+    public static TaskQueueType getQueueType(int type, TaskQueueType importantRebuildQueueType, TaskQueueType importantSortQueueType) {
         if (isInitialBuild(type)) {
             return TaskQueueType.INITIAL_BUILD;
         }
         if (isImportant(type)) {
             if (isRebuild(type)) {
                 return importantRebuildQueueType;
             } else { // implies important sort task
-                return TaskQueueType.ZERO_FRAME_DEFER;
+                return importantSortQueueType;
             }
         } else {
             return TaskQueueType.ALWAYS_DEFER;

common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/RenderSectionManager.java

@@ -63,7 +63,7 @@
 public class RenderSectionManager {
     private static final float NEARBY_REBUILD_DISTANCE = Mth.square(16.0f);
     private static final float NEARBY_SORT_DISTANCE = Mth.square(25.0f);
-    
+
     private static final float FRAME_DURATION_UPLOAD_FRACTION = 0.1f;
     private static final long MIN_UPLOAD_DURATION_BUDGET = 2_000_000L; // 2ms
 
@@ -117,7 +117,7 @@ public class RenderSectionManager {
 
     public RenderSectionManager(ClientLevel level, int renderDistance, SortBehavior sortBehavior, CommandList commandList) {
         this.meshTaskSizeEstimator = new MeshTaskSizeEstimator(level);
-        
+
         this.chunkRenderer = new DefaultChunkRenderer(RenderDevice.INSTANCE, ChunkMeshFormats.COMPACT);
 
         this.level = level;
@@ -177,14 +177,15 @@ private boolean createTerrainRenderList(Camera camera, Viewport viewport, FogPar
 
         RenderListProvider renderListProvider;
         var importantRebuildQueueType = SodiumClientMod.options().performance.chunkBuildDeferMode.getImportantRebuildQueueType();
+        var importantSortQueueType = this.sortBehavior.getDeferMode().getImportantRebuildQueueType();
         if (this.isOutOfGraph(viewport.getChunkCoord())) {
-            var visitor = new TreeSectionCollector(frame, importantRebuildQueueType, this.sectionByPosition);
+            var visitor = new TreeSectionCollector(frame, importantRebuildQueueType, importantSortQueueType, this.sectionByPosition);
             this.renderableSectionTree.prepareForTraversal();
             this.renderableSectionTree.traverse(visitor, viewport, searchDistance);
 
             renderListProvider = visitor;
         } else {
-            var visitor = new OcclusionSectionCollector(frame, importantRebuildQueueType);
+            var visitor = new OcclusionSectionCollector(frame, importantRebuildQueueType, importantSortQueueType);
             this.occlusionCuller.findVisible(visitor, viewport, searchDistance, useOcclusionCulling, frame);
 
             renderListProvider = visitor;
@@ -511,19 +512,13 @@ public void updateChunks(boolean updateImmediately) {
             // an estimator is used estimate task duration and limit the execution time to the available worker capacity.
             // separately, tasks are limited by their estimated upload size and duration.
             var uploadBudget = new LimitedResourceBudget(
-                    Math.max((long)(this.averageFrameDuration * FRAME_DURATION_UPLOAD_FRACTION), MIN_UPLOAD_DURATION_BUDGET),
+                    Math.max((long) (this.averageFrameDuration * FRAME_DURATION_UPLOAD_FRACTION), MIN_UPLOAD_DURATION_BUDGET),
                     this.regions.getStagingBuffer().getUploadSizeLimit(this.averageFrameDuration));
 
             var nextFrameBlockingCollector = new ChunkJobCollector(this.buildResults::add);
             var deferredCollector = new ChunkJobCollector(remainingDuration, this.buildResults::add);
 
-            // if zero frame delay is allowed, submit important sorts with the current frame blocking collector.
-            // otherwise submit with the collector that the next frame is blocking on.
-            if (this.sortBehavior.getDeferMode() == DeferMode.ZERO_FRAMES) {
-                this.submitSectionTasks(thisFrameBlockingCollector, nextFrameBlockingCollector, deferredCollector, uploadBudget);
-            } else {
-                this.submitSectionTasks(nextFrameBlockingCollector, nextFrameBlockingCollector, deferredCollector, uploadBudget);
-            }
+            this.submitSectionTasks(thisFrameBlockingCollector, nextFrameBlockingCollector, deferredCollector, uploadBudget);
 
             this.thisFrameBlockingTasks = thisFrameBlockingCollector.getSubmittedTaskCount();
             this.nextFrameBlockingTasks = nextFrameBlockingCollector.getSubmittedTaskCount();

common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/lists/OcclusionSectionCollector.java

@@ -7,8 +7,8 @@
  * collect the visible chunks.
  */
 public class OcclusionSectionCollector extends SectionCollector {
-    public OcclusionSectionCollector(int frame, TaskQueueType importantRebuildQueueType) {
-        super(frame, importantRebuildQueueType);
+    public OcclusionSectionCollector(int frame, TaskQueueType importantRebuildQueueType, TaskQueueType importantSortQueueType) {
+        super(frame, importantRebuildQueueType, importantSortQueueType);
     }
 
     @Override

common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/lists/SectionCollector.java

@@ -14,15 +14,17 @@
 public abstract class SectionCollector implements RenderListProvider, RenderSectionVisitor {
     private final int frame;
     private final TaskQueueType importantRebuildQueueType;
+    private final TaskQueueType importantSortQueueType;
     private final ObjectArrayList<ChunkRenderList> renderLists;
     private final EnumMap<TaskQueueType, ArrayDeque<RenderSection>> sortedTaskLists;
     private boolean needsRevisitForPendingUpdates = false;
 
     private static int[] sortItems = new int[RenderRegion.REGION_SIZE];
 
-    public SectionCollector(int frame, TaskQueueType importantRebuildQueueType) {
+    public SectionCollector(int frame, TaskQueueType importantRebuildQueueType, TaskQueueType importantSortQueueType) {
         this.frame = frame;
         this.importantRebuildQueueType = importantRebuildQueueType;
+        this.importantSortQueueType = importantSortQueueType;
 
         this.renderLists = new ObjectArrayList<>();
         this.sortedTaskLists = new EnumMap<>(TaskQueueType.class);
@@ -60,7 +62,7 @@ public void visit(RenderSection section) {
                 return;
             }
 
-            var queueType = ChunkUpdateTypes.getQueueType(pendingUpdate, this.importantRebuildQueueType);
+            var queueType = ChunkUpdateTypes.getQueueType(pendingUpdate, this.importantRebuildQueueType, this.importantSortQueueType);
             Queue<RenderSection> queue = this.sortedTaskLists.get(queueType);
 
             if (queue.size() < queueType.queueSizeLimit()) {

common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/lists/TreeSectionCollector.java

@@ -11,8 +11,8 @@
 public class TreeSectionCollector extends SectionCollector implements CoordinateSectionVisitor {
     private final Long2ReferenceMap<RenderSection> sections;
 
-    public TreeSectionCollector(int frame, TaskQueueType importantRebuildQueueType, Long2ReferenceMap<RenderSection> sections) {
-        super(frame, importantRebuildQueueType);
+    public TreeSectionCollector(int frame, TaskQueueType importantRebuildQueueType, TaskQueueType importantSortQueueType, Long2ReferenceMap<RenderSection> sections) {
+        super(frame, importantRebuildQueueType, importantSortQueueType);
         this.sections = sections;
     }