From 5637bae20caee63b9ae56d9fc2ea2a9c244f304e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 14 Dec 2023 21:39:15 +0900 Subject: [PATCH] [vulkan] Move on to vulkan api 1.3 I decided there's little point in hanging onto old API versions when the newer ones have some nice things like vkCmdCopyImage2. --- include/QF/Vulkan/funclist.h | 1 + include/QF/Vulkan/instance.h | 1 + libs/video/renderer/vulkan/instance.c | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h index 6eb8d86bb..8a68ae90c 100644 --- a/include/QF/Vulkan/funclist.h +++ b/include/QF/Vulkan/funclist.h @@ -171,6 +171,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImage) +DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImage2) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBlitImage) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass) DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass) diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h index 9c7226362..c496ceded 100644 --- a/include/QF/Vulkan/instance.h +++ b/include/QF/Vulkan/instance.h @@ -45,6 +45,7 @@ typedef struct qfv_physdev_s { VkPhysicalDeviceProperties2 p; VkPhysicalDeviceVulkan11Properties v11Properties; VkPhysicalDeviceVulkan12Properties v12Properties; + VkPhysicalDeviceVulkan13Properties v13Properties; VkPhysicalDeviceMemoryProperties memory_properties; } qfv_physdev_t; diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c index 3f3a4c759..cbc7f3693 100644 --- a/libs/video/renderer/vulkan/instance.c +++ b/libs/video/renderer/vulkan/instance.c @@ -208,7 +208,7 @@ QFV_CreateInstance (vulkan_ctx_t *ctx, VK_STRUCTURE_TYPE_APPLICATION_INFO, 0, appName, appVersion, PACKAGE_STRING, 0x000702ff, //FIXME version - VK_API_VERSION_1_2, + VK_API_VERSION_1_3, }; VkInstanceCreateInfo createInfo = { VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, 0, 0, @@ -289,6 +289,10 @@ QFV_CreateInstance (vulkan_ctx_t *ctx, }; dev->v12Properties = (VkPhysicalDeviceVulkan12Properties) { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES, + .pNext = &dev->v13Properties, + }; + dev->v13Properties = (VkPhysicalDeviceVulkan13Properties) { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES, }; ifunc->vkGetPhysicalDeviceProperties2 (physDev, &dev->p); ifunc->vkGetPhysicalDeviceMemoryProperties (physDev,