Merge branch 'PerfPatches2' of https://github.com/thr3343/VulkanMod i…

…nto PerfPatches2
xCollateral · Oct 6, 2024 · e00baed · e00baed
2 parents 2903e54 + 261abf8
commit e00baed
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/src/main/java/net/vulkanmod/render/chunk/buffer/UploadManager.java b/src/main/java/net/vulkanmod/render/chunk/buffer/UploadManager.java
@@ -108,7 +108,7 @@ public void copyBuffer(Buffer src, int srcOffset, Buffer dst, int dstOffset, int
     public void syncUploads() {
         submitUploads();
 
-        Synchronization.INSTANCE.waitFences();
+        Synchronization.INSTANCE.waitFences(false);
     }
 
     private void beginCommands() {

diff --git a/src/main/java/net/vulkanmod/vulkan/Renderer.java b/src/main/java/net/vulkanmod/vulkan/Renderer.java
@@ -16,6 +16,7 @@
 import net.vulkanmod.vulkan.memory.MemoryManager;
 import net.vulkanmod.vulkan.pass.DefaultMainPass;
 import net.vulkanmod.vulkan.pass.MainPass;
+import net.vulkanmod.vulkan.queue.Queue;
 import net.vulkanmod.vulkan.shader.GraphicsPipeline;
 import net.vulkanmod.vulkan.shader.Pipeline;
 import net.vulkanmod.vulkan.shader.PipelineState;
@@ -306,7 +307,7 @@ private void submitFrame() {
 
             vkResetFences(device, inFlightFences.get(currentFrame));
 
-            Synchronization.INSTANCE.waitFences();
+            Synchronization.INSTANCE.waitFences(true);
 
             if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
                 vkResetFences(device, inFlightFences.get(currentFrame));
@@ -356,7 +357,7 @@ public void flushCmds() {
 
             vkResetFences(device, inFlightFences.get(currentFrame));
 
-            Synchronization.INSTANCE.waitFences();
+            Synchronization.INSTANCE.waitFences(false);
 
             if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
                 vkResetFences(device, inFlightFences.get(currentFrame));
@@ -413,7 +414,7 @@ public void preInitFrame() {
         // runTick might be called recursively,
         // this check forces sync to avoid upload corruption
         if (lastReset == currentFrame) {
-            Synchronization.INSTANCE.waitFences();
+            Synchronization.INSTANCE.waitFences(false);
         }
         lastReset = currentFrame;
 
@@ -461,11 +462,10 @@ void waitForSwapChain() {
 
     @SuppressWarnings("UnreachableCode")
     private void recreateSwapChain() {
-        Synchronization.INSTANCE.waitFences();
+        Synchronization.INSTANCE.waitFences(true);
         Vulkan.waitIdle();
 
-        commandBuffers.forEach(commandBuffer -> vkResetCommandBuffer(commandBuffer, 0));
-
+        vkResetCommandPool(Vulkan.getVkDevice(), Vulkan.getCommandPool(), 0);
         Vulkan.getSwapChain().recreate();
 
         //Semaphores need to be recreated in order to make them unsignaled

diff --git a/src/main/java/net/vulkanmod/vulkan/Synchronization.java b/src/main/java/net/vulkanmod/vulkan/Synchronization.java
@@ -2,6 +2,7 @@
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.vulkanmod.vulkan.queue.CommandPool;
+import net.vulkanmod.vulkan.queue.Queue;
 import net.vulkanmod.vulkan.util.VUtil;
 import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkDevice;
@@ -31,13 +32,13 @@ public synchronized void addCommandBuffer(CommandPool.CommandBuffer commandBuffe
 
     public synchronized void addFence(long fence) {
         if (idx == ALLOCATION_SIZE)
-            waitFences();
+            waitFences(false);
 
         fences.put(idx, fence);
         idx++;
     }
 
-    public synchronized void waitFences() {
+    public synchronized void waitFences(boolean allowReset) {
         if (idx == 0)
             return;
 
@@ -47,8 +48,13 @@ public synchronized void waitFences() {
 
         vkWaitForFences(device, fences, true, VUtil.UINT64_MAX);
 
-        this.commandBuffers.forEach(CommandPool.CommandBuffer::reset);
-        this.commandBuffers.clear();
+        if (allowReset) {
+            this.commandBuffers.forEach(CommandPool.CommandBuffer::reset);
+            this.commandBuffers.clear();
+
+            Queue.GraphicsQueue.resetPool();
+            Queue.TransferQueue.resetPool();
+        }
 
         fences.limit(ALLOCATION_SIZE);
         idx = 0;

diff --git a/src/main/java/net/vulkanmod/vulkan/queue/CommandPool.java b/src/main/java/net/vulkanmod/vulkan/queue/CommandPool.java
@@ -26,7 +26,7 @@ public class CommandPool {
             VkCommandPoolCreateInfo poolInfo = VkCommandPoolCreateInfo.calloc(stack);
             poolInfo.sType(VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO);
             poolInfo.queueFamilyIndex(queueFamilyIndex);
-            poolInfo.flags(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT);
+            //Not using VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT enables additional driver and/or optimization benefits apparently
 
             LongBuffer pCommandPool = stack.mallocLong(1);
 
@@ -114,6 +114,15 @@ public void cleanUp() {
         vkDestroyCommandPool(Vulkan.getVkDevice(), id, null);
     }
 
+    //Implicitly reset all CommandBuffers from this pool
+    public void resetAll() {
+        vkResetCommandPool(Vulkan.getVkDevice(), id, 0);
+    }
+
+    public void trim() {
+        VK11.vkTrimCommandPool(Vulkan.getVkDevice(), id, 0);
+    }
+
     public class CommandBuffer {
         final VkCommandBuffer handle;
         final long fence;

diff --git a/src/main/java/net/vulkanmod/vulkan/queue/Queue.java b/src/main/java/net/vulkanmod/vulkan/queue/Queue.java
@@ -233,5 +233,10 @@ public void updateBuffer(CommandPool.CommandBuffer commandBuffer, long id, int b
         nvkCmdUpdateBuffer(commandBuffer.getHandle(), id, baseOffset, sizeT, bufferPtr);
 
     }
+
+    public void resetPool() {
+        if (this.commandPool != null)
+            this.commandPool.resetAll();
+    }
 }