mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-21 04:42:17 +00:00
Prevent sorts from replacing rebuilds for a section
This commit is contained in:
1 parent
71ea27ee3a
commit
8229ed9aa0
2 files changed
+27
-2
No files matched your search
@@ -582,7 +582,7 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> 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)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+26
-1
@@ -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<T extends ChunkGraphicsState> {
|
||||
this.sectionCache.cleanup();
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent sort updates from taking priority over rebuild updates in the upload queue.
|
||||
*/
|
||||
public Iterator<ChunkBuildResult<T>> filterChunkBuilds(Iterator<ChunkBuildResult<T>> uploadIterator) {
|
||||
Reference2ReferenceLinkedOpenHashMap<ChunkRenderContainer<T>, ChunkBuildResult<T>> map = new Reference2ReferenceLinkedOpenHashMap<>();
|
||||
|
||||
while (uploadIterator.hasNext()) {
|
||||
ChunkBuildResult<T> result = uploadIterator.next();
|
||||
ChunkRenderContainer<T> section = result.render;
|
||||
|
||||
ChunkBuildResult<T> 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<T extends ChunkGraphicsState> {
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user