add stage mask to semaphores

codex128 · codex128 · commit a00411b7ba06 · 2025-08-14T22:58:57.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
@@ -297,8 +297,7 @@ private ImageView createDepthAttachment(CommandPool pool) {
         CommandBuffer commands = pool.allocateOneTimeCommandBuffer();
         commands.begin();
         image.transitionLayout(commands, Image.Layout.Undefined, Image.Layout.DepthStencilAttachmentOptimal);
-        commands.end();
-        commands.submit(new SyncGroup());
+        commands.endAndSubmit(new SyncGroup());
         commands.getPool().getQueue().waitIdle();
         return view;
     }
@@ -307,7 +306,7 @@ private class Frame implements Consumer<Float> {
 
         // render manager
         private final CommandBuffer graphicsCommands = graphicsPool.allocateCommandBuffer();
-        private final Semaphore imageAvailable = new Semaphore(device);
+        private final Semaphore imageAvailable = new Semaphore(device, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
         private final Semaphore renderFinished = new Semaphore(device);
         private final Fence inFlight = new Fence(device, true);
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandBuffer.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandBuffer.java
@@ -63,7 +63,7 @@ public void submit(SyncGroup sync) {
             if (sync.containsWaits()) {
                 submit.waitSemaphoreCount(sync.getWaits().length)
                         .pWaitSemaphores(sync.toWaitBuffer(stack))
-                        .pWaitDstStageMask(stack.ints(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT));
+                        .pWaitDstStageMask(sync.toDstStageBuffer(stack));
             }
             if (sync.containsSignals()) {
                 submit.pSignalSemaphores(sync.toSignalBuffer(stack));
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
@@ -27,8 +27,8 @@ public CommandPool(Queue queue, boolean shortLived, boolean reusable, boolean pr
             VkCommandPoolCreateInfo create = VkCommandPoolCreateInfo.calloc(stack)
                     .sType(VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO)
                     .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))
+                        | (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(queue.getDevice().getNativeObject(), create, null, idBuf),
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/OneTimeCommandBuffer.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/OneTimeCommandBuffer.java
@@ -2,6 +2,7 @@
 
 import com.jme3.vulkan.sync.Fence;
 import com.jme3.vulkan.sync.Semaphore;
+import com.jme3.vulkan.sync.SyncGroup;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkCommandBufferBeginInfo;
 import org.lwjgl.vulkan.VkSubmitInfo;
@@ -22,7 +23,7 @@ public void begin() {
             throw new IllegalStateException("Command buffer already recording.");
         }
         if (active) {
-            throw new IllegalStateException("Buffer already freed.");
+            throw new IllegalStateException("One-time command buffer has already been used.");
         }
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkCommandBufferBeginInfo begin = VkCommandBufferBeginInfo.calloc(stack)
@@ -34,22 +35,23 @@ public void begin() {
     }
 
     @Override
-    public void submit(Semaphore wait, Semaphore signal, Fence fence) {
+    public void submit(SyncGroup sync) {
         if (recording) {
             throw new IllegalStateException("Command buffer is still recording.");
         }
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkSubmitInfo.Buffer submit = VkSubmitInfo.calloc(1, stack)
                     .sType(VK_STRUCTURE_TYPE_SUBMIT_INFO)
                     .pCommandBuffers(stack.pointers(buffer));
-            if (wait != null) {
-                submit.waitSemaphoreCount(1).pWaitSemaphores(stack.longs(wait.getNativeObject()))
-                        .pWaitDstStageMask(stack.ints(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT));
+            if (sync.containsWaits()) {
+                submit.waitSemaphoreCount(sync.getWaits().length)
+                        .pWaitSemaphores(sync.toWaitBuffer(stack))
+                        .pWaitDstStageMask(sync.toDstStageBuffer(stack));
             }
-            if (signal != null) {
-                submit.pSignalSemaphores(stack.longs(signal.getNativeObject()));
+            if (sync.containsSignals()) {
+                submit.pSignalSemaphores(sync.toSignalBuffer(stack));
             }
-            pool.getQueue().submit(submit, fence);
+            pool.getQueue().submit(submit, sync.getFence());
             pool.getQueue().waitIdle();
             vkFreeCommandBuffers(pool.getDevice().getNativeObject(), pool.getNativeObject(), buffer);
         }
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/Semaphore.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/Semaphore.java
@@ -17,9 +17,15 @@ public class Semaphore implements Native<Long> {
     private final LogicalDevice<?> device;
     private final NativeReference ref;
     private long id;
+    private int dstStageMask;
 
     public Semaphore(LogicalDevice<?> device) {
+        this(device, 0);
+    }
+
+    public Semaphore(LogicalDevice<?> device, int dstStageMask) {
         this.device = device;
+        this.dstStageMask = dstStageMask;
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkSemaphoreCreateInfo create = VkSemaphoreCreateInfo.calloc(stack)
                     .sType(VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO);
@@ -50,10 +56,28 @@ public NativeReference getNativeReference() {
         return ref;
     }
 
+    public void setDstStageMask(int dstStageMask) {
+        this.dstStageMask = dstStageMask;
+    }
+
+    public void addDstStageBit(int stageBit) {
+        this.dstStageMask |= stageBit;
+    }
+
+    public void removeDstStageBit(int stageBit) {
+        this.dstStageMask &= ~stageBit;
+    }
+
+    public int getDstStageMask() {
+        return dstStageMask;
+    }
+
+    @Deprecated
     public long getId() {
         return id;
     }
 
+    @Deprecated
     public LongBuffer toBuffer(MemoryStack stack) {
         return stack.longs(id);
     }
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/SyncGroup.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/SyncGroup.java
@@ -3,6 +3,7 @@
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VK10;
 
+import java.nio.IntBuffer;
 import java.nio.LongBuffer;
 
 public class SyncGroup {
@@ -88,6 +89,15 @@ public LongBuffer toWaitBuffer(MemoryStack stack) {
         return buf;
     }
 
+    public IntBuffer toDstStageBuffer(MemoryStack stack) {
+        IntBuffer buf = stack.mallocInt(waits.length);
+        for (Semaphore s : signals) {
+            buf.put(s.getDstStageMask());
+        }
+        buf.flip();
+        return buf;
+    }
+
     public LongBuffer toSignalBuffer(MemoryStack stack) {
         LongBuffer buf = stack.mallocLong(signals.length);
         for (Semaphore s : signals) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void submit(SyncGroup sync) {`
`63`	`63`	`if (sync.containsWaits()) {`
`64`	`64`	`submit.waitSemaphoreCount(sync.getWaits().length)`
`65`	`65`	`.pWaitSemaphores(sync.toWaitBuffer(stack))`
`66`		`- .pWaitDstStageMask(stack.ints(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT));`
	`66`	`+ .pWaitDstStageMask(sync.toDstStageBuffer(stack));`
`67`	`67`	`}`
`68`	`68`	`if (sync.containsSignals()) {`
`69`	`69`	`submit.pSignalSemaphores(sync.toSignalBuffer(stack));`