use Flag for CommandPool creation instead of booleans

Author: codex128

jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/CommandPool.java

@@ -3,6 +3,7 @@
 import com.jme3.util.natives.Native;
 import com.jme3.util.natives.NativeReference;
 import com.jme3.vulkan.devices.LogicalDevice;
+import com.jme3.vulkan.util.Flag;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkCommandPoolCreateInfo;
 
@@ -13,22 +14,41 @@
 
 public class CommandPool implements Native<Long> {
 
+    public enum Create implements Flag<Create> {
+
+        Transient(VK_COMMAND_POOL_CREATE_TRANSIENT_BIT),
+        ResetCommandBuffer(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT),
+        Protected(VK_COMMAND_POOL_CREATE_PROTECTED_BIT);
+
+        private final int vkEnum;
+
+        Create(int vkEnum) {
+            this.vkEnum = vkEnum;
+        }
+
+        @Override
+        public int bits() {
+            return vkEnum;
+        }
+
+    }
+
     private final Queue queue;
     private final NativeReference ref;
-    private final boolean shortLived, reusable, protect;
+    private final Flag<Create> flags;
     private long id;
 
-    public CommandPool(Queue queue, boolean shortLived, boolean reusable, boolean protect) {
+    public CommandPool(Queue queue) {
+        this(queue, Create.ResetCommandBuffer);
+    }
+
+    public CommandPool(Queue queue, Flag<Create> flags) {
         this.queue = queue;
-        this.shortLived = shortLived;
-        this.reusable = reusable;
-        this.protect = protect;
+        this.flags = flags;
         try (MemoryStack stack = MemoryStack.stackPush()) {
             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))
+                    .flags(this.flags.bits())
                     .queueFamilyIndex(queue.getFamilyIndex());
             LongBuffer idBuf = stack.mallocLong(1);
             check(vkCreateCommandPool(queue.getDevice().getNativeObject(), create, null, idBuf),
@@ -77,16 +97,8 @@ public Queue getQueue() {
         return queue;
     }
 
-    public boolean isShortLived() {
-        return shortLived;
-    }
-
-    public boolean isReusable() {
-        return reusable;
-    }
-
-    public boolean isProtected() {
-        return protect;
+    public Flag<Create> getFlags() {
+        return flags;
     }
 
 }

jme3-lwjgl3/src/main/java/com/jme3/vulkan/descriptors/DescriptorPool.java

@@ -106,8 +106,8 @@ public void reset() {
         vkResetDescriptorPool(device.getNativeObject(), id, 0);
     }
 
-    public boolean isFreeSetsEnabled() {
-        return flags.contains(Create.FreeDescriptorSets);
+    public Flag<Create> getFlags() {
+        return flags;
     }
 
 }

jme3-lwjgl3/src/main/java/com/jme3/vulkan/descriptors/DescriptorSet.java

@@ -26,8 +26,10 @@ public DescriptorSet(LogicalDevice<?> device, DescriptorPool pool, DescriptorSet
     @Override
     public Runnable createNativeDestroyer() {
         return () -> {
-            if (pool.isFreeSetsEnabled()) try (MemoryStack stack = MemoryStack.stackPush()) {
-                vkFreeDescriptorSets(device.getNativeObject(), pool.getNativeObject(), stack.longs(object));
+            if (pool.getFlags().contains(DescriptorPool.Create.FreeDescriptorSets)) {
+                try (MemoryStack stack = MemoryStack.stackPush()) {
+                    vkFreeDescriptorSets(device.getNativeObject(), pool.getNativeObject(), stack.longs(object));
+                }
             }
         };
     }

jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/LogicalDevice.java

@@ -5,6 +5,7 @@
 import com.jme3.vulkan.AbstractNative;
 import com.jme3.vulkan.commands.CommandPool;
 import com.jme3.vulkan.commands.Queue;
+import com.jme3.vulkan.util.Flag;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.*;
@@ -53,30 +54,25 @@ public VkPhysicalDeviceFeatures getEnabledFeatures() {
     }
 
     public CommandPool getShortTermPool(Queue queue) {
-        return getPool(queue, true, false);
+        return getPool(queue, CommandPool.Create.Transient);
     }
 
     public CommandPool getLongTermPool(Queue queue) {
-        return getPool(queue, false, true);
+        return getPool(queue, CommandPool.Create.ResetCommandBuffer);
     }
 
-    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) {
+    public CommandPool getPool(Queue queue, Flag<CommandPool.Create> flags) {
         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) {
+            if (pool.getQueue() == queue && pool.getFlags().contains(flags)) {
                 return pool;
             }
         }
-        CommandPool pool = new CommandPool(queue, shortLived, reusable, protect);
+        CommandPool pool = new CommandPool(queue, flags);
         p.add(pool);
         return pool;
     }