diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VertexBufferStructure.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VertexBufferStructure.java index f1e043c..6a3ac0c 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VertexBufferStructure.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VertexBufferStructure.java @@ -5,8 +5,8 @@ import org.lwjgl.vulkan.VkPipelineVertexInputStateCreateInfo; import org.lwjgl.vulkan.VkVertexInputAttributeDescription; import org.lwjgl.vulkan.VkVertexInputBindingDescription; -import static org.lwjgl.vulkan.VK10.VK_FORMAT_R32G32B32_SFLOAT; -import static org.lwjgl.vulkan.VK10.VK_VERTEX_INPUT_RATE_VERTEX; +import static org.lwjgl.vulkan.VK13.VK_FORMAT_R32G32B32_SFLOAT; +import static org.lwjgl.vulkan.VK13.VK_VERTEX_INPUT_RATE_VERTEX; public class VertexBufferStructure { private final int NUMBER_OF_ATTRIBUTES = 1; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VkModel/ModelsCache.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VkModel/ModelsCache.java index e597e97..e8ea385 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VkModel/ModelsCache.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Rendering/VkModel/ModelsCache.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.lwjgl.vulkan.VK10.*; +import static org.lwjgl.vulkan.VK13.*; public class ModelsCache { private final Map ModelsMap; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/Device.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/Device.java index 8b5fda7..4c61ad7 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/Device.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/Device.java @@ -17,7 +17,7 @@ import java.util.Set; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; import static org.lwjgl.vulkan.KHRPortabilitySubset.VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME; -import static org.lwjgl.vulkan.VK10.*; +import static org.lwjgl.vulkan.VK13.*; public class Device { private final VkDevice VulkanDevice; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/GPUSynchronisation/TransferBuffer.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/GPUSynchronisation/TransferBuffer.java index ea67848..a696877 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/GPUSynchronisation/TransferBuffer.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/GPUSynchronisation/TransferBuffer.java @@ -5,7 +5,7 @@ import net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanBuffer; import org.lwjgl.system.MemoryStack; import org.lwjgl.vulkan.VkBufferCopy; -import static org.lwjgl.vulkan.VK10.vkCmdCopyBuffer; +import static org.lwjgl.vulkan.VK13.vkCmdCopyBuffer; public record TransferBuffer(VulkanBuffer SrcBuffer, VulkanBuffer DstBuffer) { public void RecordTransferCommand(CommandBuffer commandBuffer){ diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/PhysicalDevice.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/PhysicalDevice.java index 5de5c92..ecf8350 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/PhysicalDevice.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DeviceLayers/PhysicalDevice.java @@ -13,9 +13,7 @@ import java.util.HashSet; import java.util.Set; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; -import static org.lwjgl.vulkan.VK10.*; -import static org.lwjgl.vulkan.VK11.vkGetPhysicalDeviceProperties2; -import static org.lwjgl.vulkan.VK11.vkGetPhysicalDeviceQueueFamilyProperties2; +import static org.lwjgl.vulkan.VK13.*; public class PhysicalDevice { private final VkExtensionProperties.Buffer vkDeviceExtensions; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Image.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Image.java deleted file mode 100644 index d3408fa..0000000 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Image.java +++ /dev/null @@ -1,4 +0,0 @@ -package net.halbear.Terrain4J.EngineCore.Vulkan.Structure.DisplayToScreen; - -public class Image { -} diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/ImageView.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/ImageView.java index 4ef4dec..b87b206 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/ImageView.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/ImageView.java @@ -8,7 +8,7 @@ import org.tinylog.Logger; import java.nio.LongBuffer; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; -import static org.lwjgl.vulkan.VK10.*; +import static org.lwjgl.vulkan.VK13.*; public class ImageView { diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SceneRender.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SceneRender.java index cd81dea..a575f83 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SceneRender.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SceneRender.java @@ -13,8 +13,6 @@ import java.util.Arrays; import static org.lwjgl.vulkan.KHRSwapchain.VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; import static org.lwjgl.vulkan.KHRSynchronization2.VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR; -import static org.lwjgl.vulkan.KHRSynchronization2.VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR; -import static org.lwjgl.vulkan.VK10.*; import static org.lwjgl.vulkan.VK13.*; public class SceneRender { //dynamic rendering; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Surface.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Surface.java index df643fe..c4eb804 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Surface.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/Surface.java @@ -15,7 +15,7 @@ import java.nio.IntBuffer; import java.nio.LongBuffer; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; -import static org.lwjgl.vulkan.VK10.VK_FORMAT_B8G8R8A8_SRGB; +import static org.lwjgl.vulkan.VK13.VK_FORMAT_B8G8R8A8_SRGB; public class Surface { private final VkSurfaceCapabilitiesKHR SurfaceCapabilities; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SwapChain.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SwapChain.java index 791be2f..59b9b33 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SwapChain.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/DisplayToScreen/SwapChain.java @@ -15,7 +15,7 @@ import java.nio.LongBuffer; import java.util.Arrays; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; -import static org.lwjgl.vulkan.VK10.*; +import static org.lwjgl.vulkan.VK13.*; public class SwapChain { private final ImageView[] ImageViewArray; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/VulkanInstance.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/VulkanInstance.java index 9506102..2a02134 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/VulkanInstance.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Structure/VulkanInstance.java @@ -19,8 +19,7 @@ import java.util.Set; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; import static org.lwjgl.vulkan.EXTDebugUtils.*; -import static org.lwjgl.vulkan.VK10.*; -import static org.lwjgl.vulkan.VK14.VK_API_VERSION_1_4; +import static org.lwjgl.vulkan.VK13.*; public class VulkanInstance { @@ -40,7 +39,7 @@ public class VulkanInstance { Logger.debug("Initialising Vulkan Instance"); try (MemoryStack MemStack = MemoryStack.stackPush()) { ByteBuffer appShortName = MemStack.UTF8("Terrain4J"); - var appInfo = VkApplicationInfo.calloc(MemStack).sType$Default().pApplicationName(appShortName).applicationVersion(1).pEngineName(appShortName).engineVersion(3).apiVersion(VK_API_VERSION_1_4); + var appInfo = VkApplicationInfo.calloc(MemStack).sType$Default().pApplicationName(appShortName).applicationVersion(1).pEngineName(appShortName).engineVersion(3).apiVersion(VK_API_VERSION_1_3); //Vulkan operates in "Layers" and does minimal validation as it expects the developer to be competent, so we add these ourseves for better debugging //refer to https://vulkan-tutorial.com/Drawing_a_triangle/Setup/Validation_layers for an explanation diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanBuffer.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanBuffer.java index 0aea89c..b73267f 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanBuffer.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanBuffer.java @@ -15,7 +15,7 @@ import java.nio.LongBuffer; import static net.halbear.Terrain4J.EngineCore.Vulkan.Util.VulkanUtils.vkCheck; import static org.lwjgl.system.MemoryUtil.NULL; -import static org.lwjgl.vulkan.VK10.*; +import static org.lwjgl.vulkan.VK13.*; public class VulkanBuffer { private final long AllocationSize; diff --git a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanUtils.java b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanUtils.java index b162dd3..3436aee 100644 --- a/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanUtils.java +++ b/src/main/java/net/halbear/Terrain4J/EngineCore/Vulkan/Util/VulkanUtils.java @@ -7,8 +7,7 @@ import org.tinylog.Logger; import java.util.Locale; -import static org.lwjgl.vulkan.VK10.*; -import static org.lwjgl.vulkan.VK13.vkCmdPipelineBarrier2; +import static org.lwjgl.vulkan.VK13.*; public class VulkanUtils { public static final int MAX_IN_FLIGHT = 2;