Fix upload corruption on altered execution flow

xCollateral · Apr 25, 2024 · a0e6c2d · a0e6c2d
1 parent 1b68d5e
commit a0e6c2d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/net/vulkanmod/vulkan/Renderer.java b/src/main/java/net/vulkanmod/vulkan/Renderer.java
@@ -90,6 +90,7 @@ public static int getCurrentImage() {
 
     private static int currentFrame = 0;
     private static int imageIndex;
+    private static int lastReset = -1;
     private VkCommandBuffer currentCmdBuffer;
     private boolean recordingCmds = false;
 
@@ -362,6 +363,13 @@ public void preInitFrame() {
         p.round();
         p.push("Frame_ops");
 
+        // runTick might be called recursively,
+        // this check forces sync to avoid upload corruption
+        if (lastReset == currentFrame) {
+            Synchronization.INSTANCE.waitFences();
+        }
+        lastReset = currentFrame;
+
         drawer.resetBuffers(currentFrame);
 
         Vulkan.getStagingBuffer().reset();