scheduleRebuildOffThread (#316)

* scheduleRebuildOffThread
GTNewHorizons · Feb 20, 2024 · 37f638a · 37f638a
1 parent f73c698
commit 37f638a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java
@@ -847,7 +847,9 @@ public static void setFilter(boolean bilinear, boolean mipmap) {
 
     public static void glDrawArrays(int mode, int first, int count) {
         // Iris -- TODO: This doesn't seem to work and is related to matchPass()
-        Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
+        if(AngelicaConfig.enableIris) {
+            Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
+        }
         GL11.glDrawArrays(mode, first, count);
     }
 

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
@@ -4,6 +4,7 @@
 import com.gtnewhorizons.angelica.compat.mojang.ChunkPos;
 import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
 import com.gtnewhorizons.angelica.config.AngelicaConfig;
+import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
 import it.unimi.dsi.fastutil.ints.IntIterator;
 import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -45,6 +46,7 @@
 import java.util.Collection;
 import java.util.Deque;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkStatusListener {
     /**
@@ -639,9 +641,7 @@ public int getTotalSections() {
     }
 
     private void scheduleRebuildOffThread(int x, int y, int z, boolean important) {
-        // TODO: Sodium Threads
-        throw new RuntimeException("scheduleRebuildOffThread");
-//        Minecraft.getMinecraft().submit(() -> this.scheduleRebuild(x, y, z, important));
+        AngelicaRenderQueue.executor().execute(() -> this.scheduleRebuild(x, y, z, important));
     }
 
     public void scheduleRebuild(int x, int y, int z, boolean important) {