From bfb51ac48e8ca5f9570d8074c1e085013825f40c Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Tue, 30 Jul 2024 14:58:38 +0200
Subject: [PATCH] use vulkan 1.3

For some reason, I need to use vkGetPhysicalDeviceMemoryProperties2
instead of vkGetPhysicalDeviceMemoryProperties2KHR here. See this
issue for details:

https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/issues/410
---
 data/shaders/meson.build | 3 ++-
 src/vkinstance.cpp       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/shaders/meson.build b/data/shaders/meson.build
index ec3d773..6b2b98f 100644
--- a/data/shaders/meson.build
+++ b/data/shaders/meson.build
@@ -13,7 +13,8 @@ foreach s : sources
 	infile = files(join_paths('..', '..', 'src', 'shaders', s))
 	outfile = s + '.spv'
 	custom_target(outfile, input : infile, output : outfile,
-		command : [glslang, '-V', '@INPUT@', '-o', '@OUTPUT@'],
+		command : [glslang, '-V', '--target-env', 'vulkan1.3', '@INPUT@',
+		           '-o', '@OUTPUT@'],
 		build_by_default : true,
 		install : true,
 		install_dir : 'data/shaders/')
diff --git a/src/vkinstance.cpp b/src/vkinstance.cpp
index 9fedc7a..b8a475f 100644
--- a/src/vkinstance.cpp
+++ b/src/vkinstance.cpp
@@ -75,7 +75,7 @@ void vkInstance::instanceInit(const char *appName, const vector<const char *> &e
 	appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
 	appInfo.pApplicationName = appName;
 	appInfo.pEngineName = "very lastest engine ever";
-	appInfo.apiVersion = VK_API_VERSION_1_0;
+	appInfo.apiVersion = VK_API_VERSION_1_3;
 
 	VkInstanceCreateInfo instanceCreateInfo = {};
 	instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
@@ -186,7 +186,7 @@ void vkInstance::deviceInit(VkPhysicalDevice physicalDevice, function<bool(VkIns
 	P(vkGetImageMemoryRequirements2KHR)
 	P(vkBindBufferMemory2KHR)
 	P(vkBindImageMemory2KHR)
-	P(vkGetPhysicalDeviceMemoryProperties2KHR)
+	.vkGetPhysicalDeviceMemoryProperties2KHR = vkGetPhysicalDeviceMemoryProperties2,
 	P(vkGetDeviceBufferMemoryRequirements)
 	P(vkGetDeviceImageMemoryRequirements)
 #undef P
@@ -194,7 +194,7 @@ void vkInstance::deviceInit(VkPhysicalDevice physicalDevice, function<bool(VkIns
 
 	VmaAllocatorCreateInfo allocatorCreateInfo = {};
 	allocatorCreateInfo.flags = 0;
-	allocatorCreateInfo.vulkanApiVersion = VK_API_VERSION_1_0;
+	allocatorCreateInfo.vulkanApiVersion = deviceProperties.apiVersion;
 	allocatorCreateInfo.physicalDevice = physicalDevice;
 	allocatorCreateInfo.device = device;
 	allocatorCreateInfo.instance = instance;