move pool management to logical device

codex128 · codex128 · commit 521c8a72f5c4 · 2025-08-14T16:39:55.000-04:00
diff --git a/jme3-examples/src/main/java/jme3test/vulkan/VulkanHelperTest.java b/jme3-examples/src/main/java/jme3test/vulkan/VulkanHelperTest.java
@@ -165,7 +165,7 @@ public void simpleInitApp() {
                 new PoolSize(Descriptor.StorageBuffer, 4),
                 new PoolSize(Descriptor.CombinedImageSampler, 2));
 
-        CommandPool transferPool = new CommandPool(device, physDevice.getGraphics(), true, false);
+        CommandPool transferPool = device.getShortTermPool(physDevice.getGraphics());
 
         // depth texture
         depthView = createDepthAttachment(transferPool);
@@ -215,7 +215,7 @@ public void simpleInitApp() {
             p.getColorBlend().addAttachment(new ColorBlendAttachment());
             p.getDynamicState().addTypes(DynamicState.Type.ViewPort, DynamicState.Type.Scissor);
         }
-        graphicsPool = new CommandPool(device, physDevice.getGraphics(), false, true);
+        graphicsPool = device.getLongTermPool(physDevice.getGraphics());
 
         // vertex buffers
         try (MemoryStack stack = MemoryStack.stackPush()) {
@@ -266,7 +266,7 @@ public boolean swapchainOutOfDate(Swapchain swapchain, int imageAcquireCode) {
                 s.selectExtentByWindow();
                 s.selectImageCount(2);
             }
-            depthView = createDepthAttachment(new CommandPool(device, device.getPhysicalDevice().getGraphics(), true, false));
+            depthView = createDepthAttachment(device.getShortTermPool(device.getPhysicalDevice().getGraphics()));
             swapchain.createFrameBuffers(renderPass, depthView);
             return true;
         }
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandAllocator.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandAllocator.java
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandPool.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandPool.java
@@ -9,30 +9,34 @@
 import java.nio.LongBuffer;
 
 import static com.jme3.renderer.vulkan.VulkanUtils.*;
-import static org.lwjgl.vulkan.VK10.*;
+import static org.lwjgl.vulkan.VK11.*;
 
 public class CommandPool implements Native<Long> {
 
-    private final LogicalDevice<?> device;
     private final Queue queue;
     private final NativeReference ref;
+    private final boolean shortLived, reusable, protect;
     private long id;
 
-    public CommandPool(LogicalDevice<?> device, Queue queue, boolean isTransient, boolean reset) {
-        this.device = device;
+    public CommandPool(Queue queue, boolean shortLived, boolean reusable, boolean protect) {
         this.queue = queue;
+        this.shortLived = shortLived;
+        this.reusable = reusable;
+        this.protect = protect;
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkCommandPoolCreateInfo create = VkCommandPoolCreateInfo.calloc(stack)
                     .sType(VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO)
-                    .flags((isTransient ? VK_COMMAND_POOL_CREATE_TRANSIENT_BIT : 0)
-                            | (reset ? VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT : 0))
+                    .flags((shortLived ? VK_COMMAND_POOL_CREATE_TRANSIENT_BIT : 0)
+                            | (reusable ? VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT : 0)
+                            | (protect ? VK_COMMAND_POOL_CREATE_PROTECTED_BIT : 0))
                     .queueFamilyIndex(queue.getFamilyIndex());
             LongBuffer idBuf = stack.mallocLong(1);
-            check(vkCreateCommandPool(device.getNativeObject(), create, null, idBuf), "Failed to create command pool.");
+            check(vkCreateCommandPool(queue.getDevice().getNativeObject(), create, null, idBuf),
+                    "Failed to create command pool.");
             id = idBuf.get(0);
         }
         ref = Native.get().register(this);
-        device.getNativeReference().addDependent(ref);
+        queue.getDevice().getNativeReference().addDependent(ref);
     }
 
     @Override
@@ -43,7 +47,7 @@ public Long getNativeObject() {
     @Override
     public Runnable createNativeDestroyer() {
         return () -> {
-            vkDestroyCommandPool(device.getNativeObject(), id, null);
+            vkDestroyCommandPool(queue.getDevice().getNativeObject(), id, null);
         };
     }
 
@@ -66,11 +70,23 @@ public OneTimeCommandBuffer allocateOneTimeCommandBuffer() {
     }
 
     public LogicalDevice<?> getDevice() {
-        return device;
+        return queue.getDevice();
     }
 
     public Queue getQueue() {
         return queue;
     }
 
+    public boolean isShortLived() {
+        return shortLived;
+    }
+
+    public boolean isReusable() {
+        return reusable;
+    }
+
+    public boolean isProtected() {
+        return protect;
+    }
+
 }
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/Queue.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/Queue.java
@@ -40,7 +40,7 @@ public void waitIdle() {
         vkQueueWaitIdle(queue);
     }
 
-    public LogicalDevice getDevice() {
+    public LogicalDevice<?> getDevice() {
         return device;
     }
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/AbstractPhysicalDevice.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/AbstractPhysicalDevice.java
@@ -28,7 +28,7 @@ public VulkanInstance getInstance() {
     }
 
     @Override
-    public VkPhysicalDevice getPhysicalDevice() {
+    public VkPhysicalDevice getDeviceHandle() {
         return physicalDevice;
     }
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/GeneralPhysicalDevice.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/GeneralPhysicalDevice.java
@@ -35,7 +35,7 @@ public boolean populateQueueFamilyIndices() {
                 if (graphicsIndex == null && (flags & VK_QUEUE_GRAPHICS_BIT) > 0) {
                     graphicsIndex = i;
                 } else if (presentIndex == null) {
-                    KHRSurface.vkGetPhysicalDeviceSurfaceSupportKHR(getPhysicalDevice(),
+                    KHRSurface.vkGetPhysicalDeviceSurfaceSupportKHR(getDeviceHandle(),
                             i, surface.getNativeObject(), ibuf);
                     if (ibuf.get(0) == VK_TRUE) {
                         presentIndex = i;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/LogicalDevice.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/LogicalDevice.java
@@ -3,11 +3,14 @@
 import com.jme3.util.natives.Native;
 import com.jme3.vulkan.VulkanInstance;
 import com.jme3.vulkan.VulkanObject;
+import com.jme3.vulkan.commands.CommandPool;
+import com.jme3.vulkan.commands.Queue;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.*;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
 import static com.jme3.renderer.vulkan.VulkanUtils.*;
@@ -18,6 +21,7 @@ public class LogicalDevice <T extends PhysicalDevice> extends VulkanObject<VkDev
     private final VulkanInstance instance;
     private final Set<String> enabledExtensions = new HashSet<>();
     private final VkPhysicalDeviceFeatures enabledFeatures = VkPhysicalDeviceFeatures.calloc();
+    private final Map<Thread, Collection<CommandPool>> pools = new ConcurrentHashMap<>();
     private T physical;
 
     public LogicalDevice(VulkanInstance instance) {
@@ -48,6 +52,35 @@ public VkPhysicalDeviceFeatures getEnabledFeatures() {
         return enabledFeatures;
     }
 
+    public CommandPool getShortTermPool(Queue queue) {
+        return getPool(queue, true, false);
+    }
+
+    public CommandPool getLongTermPool(Queue queue) {
+        return getPool(queue, false, true);
+    }
+
+    public CommandPool getPool(Queue queue, boolean shortLived, boolean reusable) {
+        return getPool(queue, shortLived, reusable, false);
+    }
+
+    public CommandPool getPool(Queue queue, boolean shortLived, boolean reusable, boolean protect) {
+        if (queue.getDevice() != this) {
+            throw new IllegalArgumentException("Queue must belong to this device.");
+        }
+        Collection<CommandPool> p = pools.computeIfAbsent(Thread.currentThread(),
+                t -> new ArrayList<>());
+        for (CommandPool pool : p) {
+            if (pool.getQueue() == queue && pool.isShortLived() == shortLived
+                    && pool.isReusable() == reusable && pool.isProtected() == protect) {
+                return pool;
+            }
+        }
+        CommandPool pool = new CommandPool(queue, shortLived, reusable, protect);
+        p.add(pool);
+        return pool;
+    }
+
     public Builder build(Function<Long, T> deviceFactory) {
         return new Builder(deviceFactory);
     }
@@ -96,9 +129,9 @@ protected void build() {
                 create.ppEnabledLayerNames(lyrs.flip());
             }
             PointerBuffer ptr = stack.mallocPointer(1);
-            check(vkCreateDevice(physical.getPhysicalDevice(), create, null, ptr),
+            check(vkCreateDevice(physical.getDeviceHandle(), create, null, ptr),
                     "Failed to create logical device.");
-            object = new VkDevice(ptr.get(0), physical.getPhysicalDevice(), create);
+            object = new VkDevice(ptr.get(0), physical.getDeviceHandle(), create);
             ref = Native.get().register(LogicalDevice.this);
             physical.getInstance().getNativeReference().addDependent(ref);
             physical.createQueues(LogicalDevice.this);
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/PhysicalDevice.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/PhysicalDevice.java
@@ -6,12 +6,6 @@
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.*;
 
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-import static com.jme3.renderer.vulkan.VulkanUtils.*;
-import static org.lwjgl.vulkan.VK10.*;
-
 public interface PhysicalDevice {
 
     boolean populateQueueFamilyIndices();
@@ -22,7 +16,7 @@ public interface PhysicalDevice {
 
     VulkanInstance getInstance();
 
-    VkPhysicalDevice getPhysicalDevice();
+    VkPhysicalDevice getDeviceHandle();
 
     VkQueueFamilyProperties.Buffer getQueueFamilyProperties(MemoryStack stack);
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/surface/Surface.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/surface/Surface.java
@@ -37,12 +37,12 @@ public Surface(VulkanInstance instance, long window) {
     public Float evaluateDevice(PhysicalDevice device) {
         try (MemoryStack stack = MemoryStack.stackPush()) {
             IntBuffer count = stack.mallocInt(1);
-            KHRSurface.vkGetPhysicalDeviceSurfaceFormatsKHR(device.getPhysicalDevice(), id, count, null);
+            KHRSurface.vkGetPhysicalDeviceSurfaceFormatsKHR(device.getDeviceHandle(), id, count, null);
             if (count.get(0) == 0) {
                 System.out.println("Reject device by surface support (formats)");
                 return null;
             }
-            KHRSurface.vkGetPhysicalDeviceSurfacePresentModesKHR(device.getPhysicalDevice(), id, count, null);
+            KHRSurface.vkGetPhysicalDeviceSurfacePresentModesKHR(device.getDeviceHandle(), id, count, null);
             if (count.get(0) == 0) {
                 System.out.println("Reject device by surface support (present modes)");
                 return null;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/surface/Swapchain.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/surface/Swapchain.java
@@ -221,12 +221,12 @@ public class Builder extends VulkanObject.Builder<Swapchain> {
 
         public Builder() {
             caps = VkSurfaceCapabilitiesKHR.malloc(stack);
-            KHRSurface.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device.getPhysicalDevice().getPhysicalDevice(), surface.getNativeObject(), caps);
+            KHRSurface.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device.getPhysicalDevice().getDeviceHandle(), surface.getNativeObject(), caps);
             formats = enumerateBuffer(stack, n -> VkSurfaceFormatKHR.malloc(n, stack), (count, buffer)
-                    -> KHRSurface.vkGetPhysicalDeviceSurfaceFormatsKHR(device.getPhysicalDevice().getPhysicalDevice(),
+                    -> KHRSurface.vkGetPhysicalDeviceSurfaceFormatsKHR(device.getPhysicalDevice().getDeviceHandle(),
                             surface.getNativeObject(), count, buffer));
             modes = enumerateBuffer(stack, stack::mallocInt, (count, buffer) ->
-                    KHRSurface.vkGetPhysicalDeviceSurfacePresentModesKHR(device.getPhysicalDevice().getPhysicalDevice(),
+                    KHRSurface.vkGetPhysicalDeviceSurfacePresentModesKHR(device.getPhysicalDevice().getDeviceHandle(),
                             surface.getNativeObject(), count, buffer));
             if (formats == null || modes == null) {
                 throw new UnsupportedOperationException("Swapchains are not supported by the device.");
@@ -253,7 +253,7 @@ protected void build() {
             }
             VkSurfaceCapabilitiesKHR caps = VkSurfaceCapabilitiesKHR.calloc(stack);
             KHRSurface.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
-                    device.getPhysicalDevice().getPhysicalDevice(), surface.getNativeObject(), caps);
+                    device.getPhysicalDevice().getDeviceHandle(), surface.getNativeObject(), caps);
             format = Image.Format.vkEnum(selectedFormat.format());
             extent = new Extent2(selectedExtent);
             VkSwapchainCreateInfoKHR create = VkSwapchainCreateInfoKHR.calloc(stack)

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void waitIdle() {`
`40`	`40`	`vkQueueWaitIdle(queue);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public LogicalDevice getDevice() {`
	`43`	`+ public LogicalDevice<?> getDevice() {`
`44`	`44`	`return device;`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public VulkanInstance getInstance() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public VkPhysicalDevice getPhysicalDevice() {`
	`31`	`+ public VkPhysicalDevice getDeviceHandle() {`
`32`	`32`	`return physicalDevice;`
`33`	`33`	`}`
`34`	`34`