Fix uniform upload bug when loading new dimension

Author: xCollateral

src/main/java/net/vulkanmod/vulkan/Renderer.java

@@ -220,6 +220,7 @@ public void preInitFrame() {
         // runTick might be called recursively,
         // this check forces sync to avoid upload corruption
         if (lastReset == currentFrame) {
+            submitUploads();
             waitFences();
         }
         lastReset = currentFrame;
@@ -345,7 +346,7 @@ private void submitFrame() {
 
             vkResetFences(device, inFlightFences.get(currentFrame));
 
-            if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
+            if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().vkQueue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
                 vkResetFences(device, inFlightFences.get(currentFrame));
                 throw new RuntimeException("Failed to submit draw command buffer: %s".formatted(VkResult.decode(vkResult)));
             }
@@ -360,7 +361,7 @@ private void submitFrame() {
 
             presentInfo.pImageIndices(stack.ints(imageIndex));
 
-            vkResult = vkQueuePresentKHR(DeviceManager.getPresentQueue().queue(), presentInfo);
+            vkResult = vkQueuePresentKHR(DeviceManager.getPresentQueue().vkQueue(), presentInfo);
 
             if (vkResult == VK_ERROR_OUT_OF_DATE_KHR || vkResult == VK_SUBOPTIMAL_KHR || swapChainUpdate) {
                 swapChainUpdate = true;
@@ -396,7 +397,7 @@ public void flushCmds() {
             submitUploads();
             waitFences();
 
-            if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
+            if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().vkQueue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
                 vkResetFences(device, inFlightFences.get(currentFrame));
                 throw new RuntimeException("Failed to submit draw command buffer: %s".formatted(VkResult.decode(vkResult)));
             }
@@ -411,19 +412,17 @@ public void submitUploads() {
         var transferCb = transferCbs.get(currentFrame);
 
         if (transferCb.isRecording()) {
-
+            final var transferQueue = DeviceManager.getTransferQueue();
             try (MemoryStack stack = MemoryStack.stackPush()) {
-                transferCb.submitCommands(stack,
-                                          DeviceManager.getTransferQueue().queue(),
-                                          false);
+                transferCb.submitCommands(stack, transferQueue.vkQueue(), false);
             }
 
             Synchronization.INSTANCE.addCommandBuffer(transferCb);
 
-            transferCbs.set(currentFrame, DeviceManager.getTransferQueue()
-                                                       .getCommandPool()
-                                                       .getCommandBuffer());
+            transferCbs.set(currentFrame, transferQueue.getCommandPool().getCommandBuffer());
         }
+
+        ImageUploadHelper.INSTANCE.submitCommands();
     }
 
     public void endRenderPass() {
@@ -468,7 +467,6 @@ public void removeUsedPipeline(Pipeline pipeline) {
 
     private void waitFences() {
         // Make sure there are no uploads/transitions scheduled
-        ImageUploadHelper.INSTANCE.submitCommands();
         Synchronization.INSTANCE.waitFences();
         Vulkan.getStagingBuffer().reset();
     }
@@ -494,7 +492,7 @@ void waitForSwapChain() {
                                             .pWaitSemaphores(stack.longs(imageAvailableSemaphores.get(currentFrame)))
                                             .pWaitDstStageMask(stack.ints(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT));
 
-            vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), info, inFlightFences.get(currentFrame));
+            vkQueueSubmit(DeviceManager.getGraphicsQueue().vkQueue(), info, inFlightFences.get(currentFrame));
             vkWaitForFences(device, inFlightFences.get(currentFrame), true, -1);
         }
     }

src/main/java/net/vulkanmod/vulkan/queue/Queue.java

@@ -21,7 +21,7 @@ public abstract class Queue {
     private static VkDevice device;
     private static QueueFamilyIndices queueFamilyIndices;
 
-    private final VkQueue queue;
+    private final VkQueue vkQueue;
 
     protected CommandPool commandPool;
 
@@ -41,20 +41,20 @@ public synchronized CommandPool.CommandBuffer beginCommands() {
     Queue(MemoryStack stack, int familyIndex, boolean initCommandPool) {
         PointerBuffer pQueue = stack.mallocPointer(1);
         vkGetDeviceQueue(DeviceManager.vkDevice, familyIndex, 0, pQueue);
-        this.queue = new VkQueue(pQueue.get(0), DeviceManager.vkDevice);
+        this.vkQueue = new VkQueue(pQueue.get(0), DeviceManager.vkDevice);
 
         if (initCommandPool)
             this.commandPool = new CommandPool(familyIndex);
     }
 
     public synchronized long submitCommands(CommandPool.CommandBuffer commandBuffer) {
         try (MemoryStack stack = stackPush()) {
-            return commandBuffer.submitCommands(stack, queue, false);
+            return commandBuffer.submitCommands(stack, vkQueue, false);
         }
     }
 
-    public VkQueue queue() {
-        return this.queue;
+    public VkQueue vkQueue() {
+        return this.vkQueue;
     }
 
     public void cleanUp() {
@@ -63,7 +63,7 @@ public void cleanUp() {
     }
 
     public void waitIdle() {
-        vkQueueWaitIdle(queue);
+        vkQueueWaitIdle(vkQueue);
     }
 
     public CommandPool getCommandPool() {