Merge branch '1.20.x' into vk12Bindless3.1

xCollateral · Jul 27, 2024 · 1d84f65 · 1d84f65
2 parents 8565bad + 11e7a8f
commit 1d84f65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/net/vulkanmod/vulkan/Renderer.java b/src/main/java/net/vulkanmod/vulkan/Renderer.java
@@ -375,7 +375,7 @@ private void submitFrame() {
             Synchronization.INSTANCE.waitFences();
 
             if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
-                vkResetFences(device, stack.longs(inFlightFences.get(currentFrame)));
+                vkResetFences(device, inFlightFences.get(currentFrame));
                 throw new RuntimeException("Failed to submit draw command buffer: %s".formatted(VkResult.decode(vkResult)));
             }
 

diff --git a/src/main/java/net/vulkanmod/vulkan/Synchronization.java b/src/main/java/net/vulkanmod/vulkan/Synchronization.java
@@ -38,16 +38,14 @@ public synchronized void addFence(long fence) {
     }
 
     public synchronized void waitFences() {
-
-        if (idx == 0) return;
+        if (idx == 0)
+            return;
 
         VkDevice device = Vulkan.getVkDevice();
 
         fences.limit(idx);
 
-        for (int i = 0; i < idx; i++) {
-            vkWaitForFences(device, fences.get(i), true, VUtil.UINT64_MAX);
-        }
+        vkWaitForFences(device, fences, true, VUtil.UINT64_MAX);
 
         this.commandBuffers.forEach(CommandPool.CommandBuffer::reset);
         this.commandBuffers.clear();