improve pipeline and sampler usability

jme3-examples/src/main/java/jme3test/vulkan/VulkanHelperTest.java

@@ -237,10 +237,11 @@ public void simpleInitApp() {
                 "Shaders/VulkanVertTest.glsl", ShaderType.Vertex)));
         fragModule = new ShaderModule(device, assetManager.loadAsset(ShadercLoader.key(
                 "Shaders/VulkanFragTest.glsl", ShaderType.Fragment)));
-        pipeline = new GraphicsPipeline(device, pipelineLayout, renderPass, 0, meshDesc);
+        pipeline = new GraphicsPipeline(device, pipelineLayout, renderPass, 0);
         try (GraphicsPipeline.Builder p = pipeline.build()) {
             p.addShader(vertModule, ShaderStage.Vertex, "main");
             p.addShader(fragModule, ShaderStage.Fragment, "main");
+            p.getVertexInput().setMesh(meshDesc);
             p.getRasterization().setCullMode(CullMode.None);
             p.getViewportState().addViewport();
             p.getViewportState().addScissor();

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

@@ -17,7 +17,7 @@ public BaseDescriptorWriter(Descriptor type, int binding, int arrayElement, int
 
     @Override
     public void populateWrite(MemoryStack stack, VkWriteDescriptorSet write) {
-        write.descriptorType(type.getVkEnum()).dstBinding(binding)
+        write.descriptorType(type.getEnum()).dstBinding(binding)
                 .dstArrayElement(arrayElement)
                 .descriptorCount(descriptorCount);
     }

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

@@ -1,8 +1,10 @@
 package com.jme3.vulkan.descriptors;
 
+import com.jme3.vulkan.util.IntEnum;
+
 import static org.lwjgl.vulkan.VK10.*;
 
-public enum Descriptor {
+public enum Descriptor implements IntEnum<Descriptor> {
 
     UniformBuffer(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER),
     UniformBufferDynamic(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC),
@@ -22,7 +24,8 @@ public enum Descriptor {
         this.vkEnum = vkEnum;
     }
 
-    public int getVkEnum() {
+    @Override
+    public int getEnum() {
         return vkEnum;
     }
 

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

@@ -1,21 +1,20 @@
 package com.jme3.vulkan.descriptors;
 
+import com.jme3.vulkan.util.IntEnum;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkDescriptorPoolSize;
 
-import static org.lwjgl.vulkan.VK10.*;
-
 public class PoolSize {
 
-    private final Descriptor type;
+    private final IntEnum<Descriptor> type;
     private final int size;
 
-    public PoolSize(Descriptor type, int size) {
+    public PoolSize(IntEnum<Descriptor> type, int size) {
         this.type = type;
         this.size = size;
     }
 
-    public Descriptor getType() {
+    public IntEnum<Descriptor> getType() {
         return type;
     }
 
@@ -26,7 +25,7 @@ public int getSize() {
     public static VkDescriptorPoolSize.Buffer aggregate(MemoryStack stack, PoolSize... sizes) {
         VkDescriptorPoolSize.Buffer buffer = VkDescriptorPoolSize.calloc(sizes.length, stack);
         for (PoolSize poolSize : sizes) {
-            buffer.get().set(poolSize.type.getVkEnum(), poolSize.size);
+            buffer.get().set(poolSize.type.getEnum(), poolSize.size);
         }
         buffer.flip();
         return buffer;

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

@@ -2,19 +2,20 @@
 
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.IntEnum;
 import org.lwjgl.vulkan.VkDescriptorSetLayoutBinding;
 
 public class SetLayoutBinding {
 
-    private final Descriptor type;
+    private final IntEnum<Descriptor> type;
     private final int binding, descriptors;
     private final Flag<ShaderStage> stages;
 
-    public SetLayoutBinding(Descriptor type, int binding, int descriptors) {
+    public SetLayoutBinding(IntEnum<Descriptor> type, int binding, int descriptors) {
         this(type, binding, descriptors, ShaderStage.All);
     }
 
-    public SetLayoutBinding(Descriptor type, int binding, int descriptors, Flag<ShaderStage> stages) {
+    public SetLayoutBinding(IntEnum<Descriptor> type, int binding, int descriptors, Flag<ShaderStage> stages) {
         this.type = type;
         this.binding = binding;
         this.descriptors = descriptors;
@@ -23,14 +24,14 @@ public SetLayoutBinding(Descriptor type, int binding, int descriptors, Flag<Shad
 
     @SuppressWarnings("DataFlowIssue")
     public void fillLayoutBinding(VkDescriptorSetLayoutBinding layoutBinding) {
-        layoutBinding.descriptorType(type.getVkEnum())
+        layoutBinding.descriptorType(type.getEnum())
                 .binding(binding)
                 .descriptorCount(descriptors)
                 .stageFlags(stages.bits())
                 .pImmutableSamplers(null);
     }
 
-    public Descriptor getType() {
+    public IntEnum<Descriptor> getType() {
         return type;
     }
 

jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/Sampler.java

@@ -17,7 +17,6 @@
 public class Sampler extends AbstractNative<Long> {
 
     public static final int U = 0, V = 1, W = 2;
-    public static final float LOD_CLAMP_NONE = VK_LOD_CLAMP_NONE;
     public static final float DISABLE_ANISOTROPY = 0f;
 
     private final LogicalDevice<?> device;
@@ -30,7 +29,7 @@ public class Sampler extends AbstractNative<Long> {
     private IntEnum<CompareOp> compare = CompareOp.Always;
     private float mipLodBias = 0f;
     private float minLod = 0f;
-    private float maxLod = LOD_CLAMP_NONE;
+    private float maxLod = VK_LOD_CLAMP_NONE;
     private boolean unnormalizedCoords = false;
 
     public Sampler(LogicalDevice<?> device) {
@@ -66,6 +65,10 @@ public float getAnisotropy() {
         return anisotropy;
     }
 
+    public boolean isAnisotropyEnabled() {
+        return anisotropy > DISABLE_ANISOTROPY;
+    }
+
     public IntEnum<BorderColor> getBorderColor() {
         return borderColor;
     }
@@ -145,8 +148,8 @@ public void setMinMagFilters(IntEnum<Filter> min, IntEnum<Filter> mag) {
 
         public void setEdgeMode(int demension, IntEnum<AddressMode> a) {
             if (demension < 0 || demension >= edgeModes.length) {
-                throw new IndexOutOfBoundsException("Invalid edge mode demension (" + demension + "). " +
-                        "Must be between 0 (inclusive) and " + edgeModes.length + " (exclusive).");
+                throw new IndexOutOfBoundsException("Invalid demension index (" + demension + "). " +
+                        "Must be 0 (U), 1 (V), or 2 (W).");
             }
             edgeModes[demension] = Objects.requireNonNull(a);
         }
@@ -187,11 +190,11 @@ public void disableAnisotropy() {
             setAnisotropy(DISABLE_ANISOTROPY);
         }
 
-        public void setBorderColor(BorderColor c) {
+        public void setBorderColor(IntEnum<BorderColor> c) {
             borderColor = Objects.requireNonNull(c);
         }
 
-        public void setCompare(CompareOp c) {
+        public void setCompare(IntEnum<CompareOp> c) {
             compare = Objects.requireNonNull(c);
         }
 
@@ -208,7 +211,7 @@ public void setMaxLod(float lod) {
         }
 
         public void disableMaxLod() {
-            setMaxLod(LOD_CLAMP_NONE);
+            setMaxLod(VK_LOD_CLAMP_NONE);
         }
 
         public void setUnnormalizedCoords(boolean u) {

jme3-lwjgl3/src/main/java/com/jme3/vulkan/material/uniforms/AbstractUniform.java

@@ -6,16 +6,17 @@
 import com.jme3.vulkan.frames.VersionedResource;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.IntEnum;
 
 public abstract class AbstractUniform <T> implements Uniform<T> {
 
     protected final String name;
-    protected final Descriptor type;
+    protected final IntEnum<Descriptor> type;
     protected final int bindingIndex;
     protected final Flag<ShaderStage> stages;
     protected VersionedResource<? extends T> resource;
 
-    public AbstractUniform(String name, Descriptor type, int bindingIndex, Flag<ShaderStage> stages) {
+    public AbstractUniform(String name, IntEnum<Descriptor> type, int bindingIndex, Flag<ShaderStage> stages) {
         this.name = name;
         this.type = type;
         this.bindingIndex = bindingIndex;
@@ -50,7 +51,7 @@ public VersionedResource<? extends T> getResource() {
         return resource;
     }
 
-    public Descriptor getType() {
+    public IntEnum<Descriptor> getType() {
         return type;
     }
 

jme3-lwjgl3/src/main/java/com/jme3/vulkan/material/uniforms/BufferUniform.java

@@ -5,13 +5,14 @@
 import com.jme3.vulkan.descriptors.SetLayoutBinding;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.IntEnum;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkDescriptorBufferInfo;
 import org.lwjgl.vulkan.VkWriteDescriptorSet;
 
 public class BufferUniform extends AbstractUniform<GpuBuffer> {
 
-    public BufferUniform(String name, Descriptor type, int bindingIndex, Flag<ShaderStage> stages) {
+    public BufferUniform(String name, IntEnum<Descriptor> type, int bindingIndex, Flag<ShaderStage> stages) {
         super(name, type, bindingIndex, stages);
     }
 
@@ -26,12 +27,12 @@ public void populateWrite(MemoryStack stack, VkWriteDescriptorSet write) {
                 .descriptorCount(1)
                 .dstArrayElement(0)
                 .dstBinding(bindingIndex)
-                .descriptorType(type.getVkEnum());
+                .descriptorType(type.getEnum());
     }
 
     @Override
     public boolean isBindingCompatible(SetLayoutBinding binding) {
-        return type == binding.getType()
+        return type.is(binding.getType())
             && bindingIndex == binding.getBinding()
             && binding.getDescriptors() == 1;
     }

jme3-lwjgl3/src/main/java/com/jme3/vulkan/material/uniforms/TextureUniform.java

@@ -6,15 +6,16 @@
 import com.jme3.vulkan.images.VulkanImage;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.IntEnum;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkDescriptorImageInfo;
 import org.lwjgl.vulkan.VkWriteDescriptorSet;
 
 public class TextureUniform extends AbstractUniform<Texture> {
 
-    private final VulkanImage.Layout layout;
+    private final IntEnum<VulkanImage.Layout> layout;
 
-    public TextureUniform(String name, VulkanImage.Layout layout, int bindingIndex, Flag<ShaderStage> stages) {
+    public TextureUniform(String name, IntEnum<VulkanImage.Layout> layout, int bindingIndex, Flag<ShaderStage> stages) {
         super(name, Descriptor.CombinedImageSampler, bindingIndex, stages);
         this.layout = layout;
     }
@@ -27,20 +28,20 @@ public void populateWrite(MemoryStack stack, VkWriteDescriptorSet write) {
                 .sampler(tex.getNativeObject())
                 .imageLayout(layout.getEnum());
         write.pImageInfo(info)
-                .descriptorType(type.getVkEnum())
+                .descriptorType(type.getEnum())
                 .dstBinding(bindingIndex)
                 .dstArrayElement(0)
                 .descriptorCount(1);
     }
 
     @Override
     public boolean isBindingCompatible(SetLayoutBinding binding) {
-        return type == binding.getType()
+        return type.is(binding.getType())
             && bindingIndex == binding.getBinding()
             && binding.getDescriptors() == 1;
     }
 
-    public VulkanImage.Layout getLayout() {
+    public IntEnum<VulkanImage.Layout> getLayout() {
         return layout;
     }
 

jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/GraphicsPipeline.java

@@ -21,13 +21,11 @@ public class GraphicsPipeline extends Pipeline {
 
     private final RenderPass compat;
     private final int subpassIndex;
-    private final MeshDescription mesh;
 
-    public GraphicsPipeline(LogicalDevice<?> device, PipelineLayout layout, RenderPass compat, int subpassIndex, MeshDescription mesh) {
+    public GraphicsPipeline(LogicalDevice<?> device, PipelineLayout layout, RenderPass compat, int subpassIndex) {
         super(device, PipelineBindPoint.Graphics, layout);
         this.compat = compat;
         this.subpassIndex = subpassIndex;
-        this.mesh = mesh;
     }
 
     public RenderPass getCompat() {
@@ -46,7 +44,7 @@ public class Builder extends AbstractNative.Builder<GraphicsPipeline> {
 
         private final Collection<ShaderStageInfo> stages = new ArrayList<>();
         private final DynamicState dynamic = new DynamicState();
-        private final VertexInputState vertexInput = new VertexInputState(mesh);
+        private final VertexInputState vertexInput = new VertexInputState();
         private final InputAssemblyState inputAssembly = new InputAssemblyState();
         private final ViewportState viewport = new ViewportState();
         private final DepthStencilState depthStencil = new DepthStencilState();

jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/states/VertexInputState.java

@@ -11,10 +11,6 @@ public class VertexInputState implements PipelineState<VkPipelineVertexInputStat
 
     private MeshDescription mesh;
 
-    public VertexInputState(MeshDescription mesh) {
-        setMesh(mesh);
-    }
-
     @Override
     public VkPipelineVertexInputStateCreateInfo toStruct(MemoryStack stack) {
         Objects.requireNonNull(mesh, "Mesh description is not defined.");

jme3-lwjgl3/src/main/java/com/jme3/vulkan/surface/Swapchain.java

@@ -32,7 +32,7 @@
 
 public class Swapchain extends AbstractNative<Long> {
 
-    public enum PresentMode {
+    public enum PresentMode implements IntEnum<PresentMode> {
 
         FirstInFirstOut(KHRSurface.VK_PRESENT_MODE_FIFO_KHR),
         FirstInFirstOutRelaxed(KHRSurface.VK_PRESENT_MODE_FIFO_RELAXED_KHR),
@@ -45,7 +45,8 @@ public enum PresentMode {
             this.vkEnum = vkEnum;
         }
 
-        public int getVkEnum() {
+        @Override
+        public int getEnum() {
             return vkEnum;
         }
 
@@ -251,7 +252,7 @@ public class Builder extends AbstractNative.Builder<Swapchain> {
 
         private VkSurfaceFormatKHR selectedFormat;
         private VkExtent2D selectedExtent;
-        private PresentMode selectedMode;
+        private IntEnum<PresentMode> selectedMode;
         private Integer selectedImageCount;
 
         private Swapchain base;
@@ -304,7 +305,7 @@ protected void build() {
                     .imageUsage(imageUsage.bits())
                     .preTransform(caps.currentTransform())
                     .compositeAlpha(KHRSurface.VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
-                    .presentMode(selectedMode.getVkEnum())
+                    .presentMode(selectedMode.getEnum())
                     .clipped(true);
             if (base != null) {
                 create.oldSwapchain(base.getNativeObject());
@@ -357,10 +358,11 @@ public VkSurfaceFormatKHR selectFormat(int... preferredFormats) {
             return (selectedFormat = formats.get(0));
         }
 
-        public PresentMode selectMode(PresentMode... preferredModes) {
-            for (PresentMode m : preferredModes) {
+        @SafeVarargs
+        public final IntEnum<PresentMode> selectMode(IntEnum<PresentMode>... preferredModes) {
+            for (IntEnum<PresentMode> m : preferredModes) {
                 for (int i = 0; i < modes.limit(); i++) {
-                    if (modes.get(i) == m.getVkEnum()) {
+                    if (modes.get(i) == m.getEnum()) {
                         return (selectedMode = m);
                     }
                 }