mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-21 04:42:17 +00:00
Remove use of empty build tasks, submit empty data directly to result queue (#821)
This commit is contained in:
1 parent
19635e20ec
commit
95f8afc0f3
3 files changed
+43
-61
No files matched your search
+27
-13
@@ -552,25 +552,39 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
|
||||
continue;
|
||||
}
|
||||
|
||||
// Do not allow distant chunks to block rendering
|
||||
if (this.alwaysDeferChunkUpdates || !this.isChunkPrioritized(render)) {
|
||||
this.builder.deferRebuild(render);
|
||||
} else {
|
||||
futures.add(this.builder.scheduleRebuildTaskAsync(render));
|
||||
}
|
||||
CompletableFuture<ChunkBuildResult<T>> futureTask = this.builder.scheduleRebuildTaskAsync(render);
|
||||
|
||||
this.dirty = true;
|
||||
submitted++;
|
||||
// Limit quantity of updates submitted if we are deferring all important builds
|
||||
if (this.alwaysDeferChunkUpdates && submitted >= budget)
|
||||
break;
|
||||
if (futureTask != null) {
|
||||
this.dirty = true;
|
||||
|
||||
// Do not allow distant chunks to block rendering
|
||||
if (this.alwaysDeferChunkUpdates || !this.isChunkPrioritized(render)) {
|
||||
this.builder.handleCompletion(futureTask);
|
||||
} else {
|
||||
futures.add(futureTask);
|
||||
}
|
||||
|
||||
submitted++;
|
||||
// Limit quantity of updates submitted if we are deferring all important builds
|
||||
if (this.alwaysDeferChunkUpdates && submitted >= budget)
|
||||
break;
|
||||
} else {
|
||||
// Immediately submit empty data to the queue and do not count this against the budget
|
||||
this.builder.enqueueUpload(new ChunkBuildResult<>(render, ChunkRenderData.EMPTY));
|
||||
}
|
||||
}
|
||||
|
||||
while (submitted < budget && !this.rebuildQueue.isEmpty()) {
|
||||
ChunkRenderContainer<T> render = this.rebuildQueue.dequeue();
|
||||
|
||||
this.builder.deferRebuild(render);
|
||||
submitted++;
|
||||
CompletableFuture<ChunkBuildResult<T>> futureTask = this.builder.scheduleRebuildTaskAsync(render);
|
||||
if(futureTask != null) {
|
||||
this.builder.handleCompletion(futureTask);
|
||||
submitted++;
|
||||
} else {
|
||||
// Immediately submit empty data to the queue and do not count this against the budget
|
||||
this.builder.enqueueUpload(new ChunkBuildResult<>(render, ChunkRenderData.EMPTY));
|
||||
}
|
||||
}
|
||||
|
||||
// always do at least one sort
|
||||
|
||||
+16
-15
@@ -10,7 +10,6 @@ import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderBackend;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderContainer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.tasks.ChunkRenderBuildTask;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.tasks.ChunkRenderEmptyBuildTask;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.tasks.ChunkRenderRebuildTask;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.tasks.ChunkRenderTranslucencySortTask;
|
||||
import me.jellysquid.mods.sodium.client.render.pipeline.context.ChunkRenderCacheLocal;
|
||||
@@ -26,6 +25,7 @@ import net.minecraft.util.ReportedException;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.joml.Vector3d;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Deque;
|
||||
@@ -294,7 +294,10 @@ public class ChunkBuilder<T extends ChunkGraphicsState> {
|
||||
return Runtime.getRuntime().availableProcessors();
|
||||
}
|
||||
|
||||
private void handleCompletion(CompletableFuture<ChunkBuildResult<T>> future) {
|
||||
/**
|
||||
* Add a completion handler to the given future task so that the result will be processed on the main thread.
|
||||
*/
|
||||
public void handleCompletion(CompletableFuture<ChunkBuildResult<T>> future) {
|
||||
future.whenComplete((res, ex) -> {
|
||||
if (ex != null) {
|
||||
this.failureQueue.add(ex);
|
||||
@@ -304,16 +307,6 @@ public class ChunkBuilder<T extends ChunkGraphicsState> {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
* main thread.
|
||||
* @param render The render to rebuild
|
||||
*/
|
||||
public void deferRebuild(ChunkRenderContainer<T> render) {
|
||||
handleCompletion(this.scheduleRebuildTaskAsync(render));
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
@@ -330,16 +323,24 @@ public class ChunkBuilder<T extends ChunkGraphicsState> {
|
||||
* synchronization point on the main thread.
|
||||
* @param result The build task's result
|
||||
*/
|
||||
private void enqueueUpload(ChunkBuildResult<T> result) {
|
||||
public void enqueueUpload(ChunkBuildResult<T> result) {
|
||||
this.uploadQueue.add(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Schedules the rebuild task asynchronously on the worker pool, returning a future wrapping the task.
|
||||
* @param render The render to rebuild
|
||||
* @return a future representing the rebuild task, or null if the chunk section is empty
|
||||
*/
|
||||
@Nullable
|
||||
public CompletableFuture<ChunkBuildResult<T>> scheduleRebuildTaskAsync(ChunkRenderContainer<T> render) {
|
||||
return this.schedule(this.createRebuildTask(render));
|
||||
ChunkRenderBuildTask<T> task = this.createRebuildTask(render);
|
||||
|
||||
if(task != null) {
|
||||
return this.schedule(task);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -360,7 +361,7 @@ public class ChunkBuilder<T extends ChunkGraphicsState> {
|
||||
ChunkRenderContext context = WorldSlice.prepare(this.world, render.getChunkPos(), this.sectionCache);
|
||||
|
||||
if (context == null) {
|
||||
return new ChunkRenderEmptyBuildTask<>(render);
|
||||
return null;
|
||||
} else {
|
||||
return new ChunkRenderRebuildTask<>(render, context, render.getRenderOrigin()).withCameraPosition(this.cameraPosition);
|
||||
}
|
||||
|
||||
-33
@@ -1,33 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.tasks;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderContainer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildResult;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.pipeline.context.ChunkRenderCacheLocal;
|
||||
import me.jellysquid.mods.sodium.client.util.task.CancellationSource;
|
||||
|
||||
/**
|
||||
* A build task which does no computation and always return an empty build result. These tasks are created whenever
|
||||
* chunk meshes need to be deleted as the only way to change graphics state is to send a message to the main
|
||||
* actor thread. In cases where new chunk renders are being created and scheduled, the scheduler will prefer to just
|
||||
* synchronously update the render's data to an empty state to speed things along.
|
||||
*/
|
||||
public class ChunkRenderEmptyBuildTask<T extends ChunkGraphicsState> extends ChunkRenderBuildTask<T> {
|
||||
private final ChunkRenderContainer<T> render;
|
||||
|
||||
public ChunkRenderEmptyBuildTask(ChunkRenderContainer<T> render) {
|
||||
this.render = render;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkBuildResult<T> performBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource) {
|
||||
return new ChunkBuildResult<>(this.render, ChunkRenderData.EMPTY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void releaseResources() {
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user