organized files

codex128 · codex128 · commit 0c035ab4b2a5 · 2025-08-09T09:53:09.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
@@ -2,7 +2,6 @@
 
 import com.jme3.app.FlyCamAppState;
 import com.jme3.app.SimpleApplication;
-import com.jme3.material.RenderState;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
@@ -14,6 +13,8 @@
 import com.jme3.util.natives.Native;
 import com.jme3.vulkan.*;
 import com.jme3.vulkan.buffers.*;
+import com.jme3.vulkan.commands.CommandBuffer;
+import com.jme3.vulkan.commands.CommandPool;
 import com.jme3.vulkan.descriptors.*;
 import com.jme3.vulkan.devices.*;
 import com.jme3.vulkan.flags.ImageUsageFlags;
@@ -25,11 +26,15 @@
 import com.jme3.vulkan.pipelines.GraphicsPipeline;
 import com.jme3.vulkan.pass.RenderPass;
 import com.jme3.vulkan.pipelines.PipelineBindPoint;
+import com.jme3.vulkan.pipelines.PipelineLayout;
 import com.jme3.vulkan.pipelines.states.ColorBlendAttachment;
 import com.jme3.vulkan.pipelines.states.DynamicState;
+import com.jme3.vulkan.shader.ShaderModule;
 import com.jme3.vulkan.surface.Surface;
 import com.jme3.vulkan.surface.Swapchain;
 import com.jme3.vulkan.surface.SwapchainUpdater;
+import com.jme3.vulkan.sync.Fence;
+import com.jme3.vulkan.sync.Semaphore;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.*;
 
@@ -294,10 +299,13 @@ private ImageView createDepthAttachment(CommandPool pool) {
 
     private class Frame implements Consumer<Float> {
 
+        // render manager
         private final CommandBuffer graphicsCommands = graphicsPool.allocateCommandBuffer();
         private final Semaphore imageAvailable = new Semaphore(device);
         private final Semaphore renderFinished = new Semaphore(device);
         private final Fence inFlight = new Fence(device, true);
+
+        // material
         private final GpuBuffer uniforms;
         private final DescriptorSet descriptorSet;
 
@@ -307,7 +315,7 @@ public Frame() {
                     new MemoryFlags().hostVisible().hostCoherent(), false);
             descriptorSet = descriptorPool.allocateSets(descriptorLayout)[0];
             descriptorSet.write(BufferSetWriter.uniformBuffers(0, 0, new BufferDescriptor(uniforms)),
-                    ImageSetWriter.combinedImageSampler(1, 0, new ImageDescriptor(texture, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)));
+                    ImageSetWriter.combinedImageSampler(1, 0, new ImageDescriptor(texture, Image.Layout.ShaderReadOnlyOptimal)));
         }
 
         @Override
diff --git a/jme3-examples/src/main/java/jme3test/vulkan/VulkanTest.java b/jme3-examples/src/main/java/jme3test/vulkan/VulkanTest.java
@@ -7,8 +7,8 @@
 import com.jme3.util.natives.Native;
 import com.jme3.vulkan.devices.DeviceFilter;
 import com.jme3.system.vulkan.LwjglVulkanContext;
-import com.jme3.vulkan.Fence;
-import com.jme3.vulkan.Semaphore;
+import com.jme3.vulkan.sync.Fence;
+import com.jme3.vulkan.sync.Semaphore;
 import com.jme3.vulkan.VulkanRenderManager;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.PointerBuffer;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/MemoryBarrier.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/MemoryBarrier.java
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/TestCaseMeshDescription.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/TestCaseMeshDescription.java
@@ -2,6 +2,7 @@
 
 import com.jme3.util.natives.Native;
 import com.jme3.util.natives.NativeReference;
+import com.jme3.vulkan.mesh.MeshDescription;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkVertexInputAttributeDescription;
 import org.lwjgl.vulkan.VkVertexInputBindingDescription;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/Vertex.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/Vertex.java
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/buffers/GpuBuffer.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/buffers/GpuBuffer.java
@@ -3,7 +3,7 @@
 import com.jme3.renderer.vulkan.VulkanUtils;
 import com.jme3.util.natives.Native;
 import com.jme3.util.natives.NativeReference;
-import com.jme3.vulkan.CommandBuffer;
+import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.devices.LogicalDevice;
 import com.jme3.vulkan.flags.MemoryFlags;
 import com.jme3.vulkan.flags.BufferUsageFlags;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/buffers/StageableBuffer.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/buffers/StageableBuffer.java
@@ -1,9 +1,12 @@
 package com.jme3.vulkan.buffers;
 
-import com.jme3.vulkan.*;
+import com.jme3.vulkan.commands.CommandBuffer;
+import com.jme3.vulkan.commands.CommandPool;
 import com.jme3.vulkan.devices.LogicalDevice;
 import com.jme3.vulkan.flags.MemoryFlags;
 import com.jme3.vulkan.flags.BufferUsageFlags;
+import com.jme3.vulkan.sync.Fence;
+import com.jme3.vulkan.sync.Semaphore;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
 
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
@@ -1,9 +1,9 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.commands;
 
-import org.lwjgl.BufferUtils;
+import com.jme3.vulkan.sync.Fence;
+import com.jme3.vulkan.sync.Semaphore;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
-import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkCommandBuffer;
 import org.lwjgl.vulkan.VkCommandBufferAllocateInfo;
 import org.lwjgl.vulkan.VkCommandBufferBeginInfo;
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
@@ -1,4 +1,4 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.commands;
 
 import com.jme3.util.natives.Native;
 import com.jme3.util.natives.NativeReference;
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
@@ -1,5 +1,7 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.commands;
 
+import com.jme3.vulkan.sync.Fence;
+import com.jme3.vulkan.sync.Semaphore;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkCommandBufferBeginInfo;
 import org.lwjgl.vulkan.VkSubmitInfo;
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
@@ -1,5 +1,6 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.commands;
 
+import com.jme3.vulkan.sync.Fence;
 import com.jme3.vulkan.devices.LogicalDevice;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/QueueFamilies.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/commands/QueueFamilies.java
@@ -1,4 +1,4 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.commands;
 
 import com.jme3.vulkan.devices.LogicalDevice;
 import com.jme3.vulkan.devices.PhysicalDevice;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/descriptors/ImageDescriptor.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/descriptors/ImageDescriptor.java
@@ -1,5 +1,6 @@
 package com.jme3.vulkan.descriptors;
 
+import com.jme3.vulkan.images.Image;
 import com.jme3.vulkan.images.ImageView;
 import com.jme3.vulkan.images.Sampler;
 import com.jme3.vulkan.images.Texture;
@@ -9,13 +10,13 @@ public class ImageDescriptor {
 
     private final ImageView view;
     private final Sampler sampler;
-    private final int layout;
+    private final Image.Layout layout;
 
-    public ImageDescriptor(Texture texture, int layout) {
+    public ImageDescriptor(Texture texture, Image.Layout layout) {
         this(texture.getImage(), texture, layout);
     }
 
-    public ImageDescriptor(ImageView view, Sampler sampler, int layout) {
+    public ImageDescriptor(ImageView view, Sampler sampler, Image.Layout layout) {
         this.view = view;
         this.sampler = sampler;
         this.layout = layout;
@@ -24,7 +25,7 @@ public ImageDescriptor(ImageView view, Sampler sampler, int layout) {
     public void fillDescriptorInfo(VkDescriptorImageInfo info) {
         info.imageView(view.getNativeObject())
                 .sampler(sampler.getNativeObject())
-                .imageLayout(layout);
+                .imageLayout(layout.getVkEnum());
     }
 
     public ImageView getView() {
@@ -35,7 +36,7 @@ public Sampler getSampler() {
         return sampler;
     }
 
-    public int getLayout() {
+    public Image.Layout getLayout() {
         return layout;
     }
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/DeviceWeights.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/devices/DeviceWeights.java
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
@@ -1,6 +1,6 @@
 package com.jme3.vulkan.devices;
 
-import com.jme3.vulkan.Queue;
+import com.jme3.vulkan.commands.Queue;
 import com.jme3.vulkan.VulkanInstance;
 import com.jme3.vulkan.surface.Surface;
 import org.lwjgl.system.MemoryStack;
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
@@ -71,7 +71,7 @@ protected void build() {
             if (enableAllFeatures) {
                 enabledFeatures.set(supportedFeatures);
             } else for (DeviceFeature f : features) {
-                if (DeviceWeights.isSuccess(f.evaluateFeatureSupport(supportedFeatures))) {
+                if (f.evaluateFeatureSupport(supportedFeatures) != null) {
                     f.enableFeature(enabledFeatures);
                 }
             }
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/GpuImage.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/GpuImage.java
@@ -2,7 +2,7 @@
 
 import com.jme3.util.natives.Native;
 import com.jme3.util.natives.NativeReference;
-import com.jme3.vulkan.CommandBuffer;
+import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.devices.LogicalDevice;
 import com.jme3.vulkan.buffers.MemoryRegion;
 import com.jme3.vulkan.flags.ImageUsageFlags;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/VulkanImageLoader.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/VulkanImageLoader.java
@@ -2,8 +2,8 @@
 
 import com.jme3.asset.*;
 import com.jme3.util.BufferUtils;
-import com.jme3.vulkan.CommandBuffer;
-import com.jme3.vulkan.CommandPool;
+import com.jme3.vulkan.commands.CommandBuffer;
+import com.jme3.vulkan.commands.CommandPool;
 import com.jme3.vulkan.buffers.GpuBuffer;
 import com.jme3.vulkan.flags.BufferUsageFlags;
 import com.jme3.vulkan.flags.ImageUsageFlags;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/mesh/Mesh.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/mesh/Mesh.java
@@ -0,0 +1,41 @@
+package com.jme3.vulkan.mesh;
+
+import com.jme3.vulkan.buffers.GpuBuffer;
+import com.jme3.vulkan.commands.CommandBuffer;
+import org.lwjgl.system.MemoryStack;
+
+import java.nio.LongBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.lwjgl.vulkan.VK10.*;
+
+public class Mesh {
+
+    private GpuBuffer indexBuffer;
+    private final List<GpuBuffer> vertexBuffers = new ArrayList<>();
+
+    public Mesh() {
+
+    }
+
+    public void bindVertexBuffers(CommandBuffer cmd) {
+        try (MemoryStack stack = MemoryStack.stackPush()) {
+            LongBuffer vertBufs = stack.mallocLong(vertexBuffers.size());
+            LongBuffer offsets = stack.mallocLong(vertexBuffers.size());
+            for (GpuBuffer v : vertexBuffers) {
+                vertBufs.put(v.getNativeObject());
+                offsets.put(0);
+            }
+            vertBufs.flip();
+            offsets.flip();
+            vkCmdBindVertexBuffers(cmd.getBuffer(), 0, vertBufs, offsets);
+            vkCmdBindIndexBuffer(cmd.getBuffer(), indexBuffer.getNativeObject(), 0, VK_INDEX_TYPE_UINT32);
+        }
+    }
+
+    public void draw(CommandBuffer cmd) {
+        vkCmdDrawIndexed(cmd.getBuffer(), indexBuffer.size() / Integer.BYTES, 1, 0, 0, 0);
+    }
+
+}
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/mesh/MeshDescription.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/mesh/MeshDescription.java
@@ -1,4 +1,4 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.mesh;
 
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkVertexInputAttributeDescription;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pass/RenderPass.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pass/RenderPass.java
@@ -1,7 +1,7 @@
 package com.jme3.vulkan.pass;
 
 import com.jme3.util.natives.Native;
-import com.jme3.vulkan.CommandBuffer;
+import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.VulkanObject;
 import com.jme3.vulkan.devices.LogicalDevice;
 import com.jme3.vulkan.images.Image;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/ComputePipeline.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/ComputePipeline.java
@@ -1,8 +1,7 @@
 package com.jme3.vulkan.pipelines;
 
 import com.jme3.util.natives.Native;
-import com.jme3.vulkan.PipelineLayout;
-import com.jme3.vulkan.ShaderModule;
+import com.jme3.vulkan.shader.ShaderModule;
 import com.jme3.vulkan.devices.LogicalDevice;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkComputePipelineCreateInfo;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/GraphicsPipeline.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/GraphicsPipeline.java
@@ -3,8 +3,10 @@
 import com.jme3.util.natives.Native;
 import com.jme3.vulkan.*;
 import com.jme3.vulkan.devices.LogicalDevice;
+import com.jme3.vulkan.mesh.MeshDescription;
 import com.jme3.vulkan.pass.RenderPass;
 import com.jme3.vulkan.pipelines.states.*;
+import com.jme3.vulkan.shader.ShaderModule;
 import org.lwjgl.vulkan.*;
 
 import java.nio.LongBuffer;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/Pipeline.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/Pipeline.java
@@ -1,7 +1,6 @@
 package com.jme3.vulkan.pipelines;
 
-import com.jme3.vulkan.CommandBuffer;
-import com.jme3.vulkan.PipelineLayout;
+import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.VulkanObject;
 import com.jme3.vulkan.devices.LogicalDevice;
 
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/PipelineLayout.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/PipelineLayout.java
@@ -1,4 +1,4 @@
-package com.jme3.vulkan;
+package com.jme3.vulkan.pipelines;
 
 import com.jme3.renderer.vulkan.VulkanUtils;
 import com.jme3.util.natives.Native;
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/states/VertexInputState.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/pipelines/states/VertexInputState.java
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/shader/ShaderModule.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/shader/ShaderModule.java
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
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/Fence.java b/jme3-lwjgl3/src/main/java/com/jme3/vulkan/sync/Fence.java
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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.jme3.vulkan;`
	`1`	`+package com.jme3.vulkan.commands;`
`2`	`2`
`3`	`3`	`import com.jme3.util.natives.Native;`
`4`	`4`	`import com.jme3.util.natives.NativeReference;`