successfully abstracted all vulkan components

Author: codex128

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

@@ -13,12 +13,12 @@
 
 public class CommandPool implements Native<Long> {
 
-    private final LogicalDevice device;
+    private final LogicalDevice<?> device;
     private final Queue queue;
     private final NativeReference ref;
     private long id;
 
-    public CommandPool(LogicalDevice device, Queue queue, boolean isTransient, boolean reset) {
+    public CommandPool(LogicalDevice<?> device, Queue queue, boolean isTransient, boolean reset) {
         this.device = device;
         this.queue = queue;
         try (MemoryStack stack = MemoryStack.stackPush()) {
@@ -65,7 +65,7 @@ public OneTimeCommandBuffer allocateOneTimeCommandBuffer() {
         return new OneTimeCommandBuffer(this);
     }
 
-    public LogicalDevice getDevice() {
+    public LogicalDevice<?> getDevice() {
         return device;
     }
 

jme3-lwjgl3/src/main/java/com/jme3/vulkan/Attachment.java

@@ -14,15 +14,15 @@
 
 public class Fence implements Native<Long> {
 
-    private final LogicalDevice device;
+    private final LogicalDevice<?> device;
     private final NativeReference ref;
     private long id;
 
-    public Fence(LogicalDevice device) {
+    public Fence(LogicalDevice<?> device) {
         this(device, false);
     }
 
-    public Fence(LogicalDevice device, boolean signal) {
+    public Fence(LogicalDevice<?> device, boolean signal) {
         this.device = device;
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkFenceCreateInfo create = VkFenceCreateInfo.calloc(stack)

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

@@ -1,68 +1,13 @@
 package com.jme3.vulkan;
 
-import com.jme3.util.natives.Native;
-import com.jme3.util.natives.NativeReference;
+import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkVertexInputAttributeDescription;
 import org.lwjgl.vulkan.VkVertexInputBindingDescription;
 
-import static org.lwjgl.vulkan.VK10.*;
+public interface MeshDescription {
 
-public class MeshDescription implements Native<Object> {
+    VkVertexInputBindingDescription.Buffer getBindings(MemoryStack stack);
 
-    private final VkVertexInputBindingDescription.Buffer bindings;
-    private final VkVertexInputAttributeDescription.Buffer attributes;
-    private final NativeReference ref;
-
-    public MeshDescription() {
-        // for each vertex buffer on the mesh
-        bindings = VkVertexInputBindingDescription.calloc(1)
-                .binding(0)
-                .stride(Float.BYTES * 8) // bytes per vertex
-                .inputRate(VK_VERTEX_INPUT_RATE_VERTEX);
-        // for each attribute in each vertex buffer
-        attributes = VkVertexInputAttributeDescription.calloc(3);
-        attributes.get(0).binding(0)
-                .location(0)
-                .format(VK_FORMAT_R32G32B32_SFLOAT)
-                .offset(0);
-        attributes.get(1).binding(0)
-                .location(1)
-                .format(VK_FORMAT_R32G32B32_SFLOAT)
-                .offset(Float.BYTES * 3);
-        attributes.get(2).binding(0)
-                .location(2)
-                .format(VK_FORMAT_R32G32_SFLOAT)
-                .offset(Float.BYTES * 6);
-        ref = Native.get().register(this);
-    }
-
-    @Override
-    public Object getNativeObject() {
-        return null;
-    }
-
-    @Override
-    public Runnable createNativeDestroyer() {
-        return () -> {
-            bindings.free();
-            attributes.free();
-        };
-    }
-
-    @Override
-    public void prematureNativeDestruction() {}
-
-    @Override
-    public NativeReference getNativeReference() {
-        return ref;
-    }
-
-    public VkVertexInputBindingDescription.Buffer getBindings() {
-        return bindings;
-    }
-
-    public VkVertexInputAttributeDescription.Buffer getAttributes() {
-        return attributes;
-    }
+    VkVertexInputAttributeDescription.Buffer getAttributes(MemoryStack stack);
 
 }

jme3-lwjgl3/src/main/java/com/jme3/vulkan/Fence.java

@@ -15,12 +15,12 @@
 
 public class PipelineLayout implements Native<Long> {
 
-    private final LogicalDevice device;
+    private final LogicalDevice<?> device;
     private final NativeReference ref;
     private final DescriptorSetLayout[] layouts;
     private final long id;
 
-    public PipelineLayout(LogicalDevice device, DescriptorSetLayout... layouts) {
+    public PipelineLayout(LogicalDevice<?> device, DescriptorSetLayout... layouts) {
         this.device = device;
         this.layouts = layouts;
         try (MemoryStack stack = MemoryStack.stackPush()) {

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

@@ -1,7 +1,7 @@
 package com.jme3.vulkan;
 
-import com.jme3.renderer.vulkan.VulkanUtils;
 import com.jme3.vulkan.devices.LogicalDevice;
+import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkQueue;
 import org.lwjgl.vulkan.VkSubmitInfo;
@@ -20,9 +20,9 @@ public Queue(LogicalDevice<?> device, int familyIndex, int queueIndex) {
         this.familyIndex = familyIndex;
         this.queueIndex = queueIndex;
         try (MemoryStack stack = MemoryStack.stackPush()) {
-            queue = new VkQueue(VulkanUtils.getPointer(stack,
-                    ptr -> vkGetDeviceQueue(device.getNativeObject(), familyIndex, queueIndex, ptr)),
-                    device.getNativeObject());
+            PointerBuffer ptr = stack.mallocPointer(1);
+            vkGetDeviceQueue(device.getNativeObject(), familyIndex, queueIndex, ptr);
+            queue = new VkQueue(ptr.get(0), device.getNativeObject());
         }
     }