From eb120ac1ac0618f13098309391a4199689f80270 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Mon, 24 Nov 2025 00:57:23 -0400 Subject: [PATCH] [vk] Moving Maintenance features to wrapper --- src/video_core/vulkan_common/vulkan.h | 11 +++++++++++ src/video_core/vulkan_common/vulkan_device.cpp | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan.h b/src/video_core/vulkan_common/vulkan.h index 13f679ff54..8d2e8e2a37 100644 --- a/src/video_core/vulkan_common/vulkan.h +++ b/src/video_core/vulkan_common/vulkan.h @@ -22,6 +22,17 @@ #include +// Define maintenance 7-9 extension names (not yet in official Vulkan headers) +#ifndef VK_KHR_MAINTENANCE_7_EXTENSION_NAME +#define VK_KHR_MAINTENANCE_7_EXTENSION_NAME "VK_KHR_maintenance7" +#endif +#ifndef VK_KHR_MAINTENANCE_8_EXTENSION_NAME +#define VK_KHR_MAINTENANCE_8_EXTENSION_NAME "VK_KHR_maintenance8" +#endif +#ifndef VK_KHR_MAINTENANCE_9_EXTENSION_NAME +#define VK_KHR_MAINTENANCE_9_EXTENSION_NAME "VK_KHR_maintenance9" +#endif + // Sanitize macros #undef CreateEvent #undef CreateSemaphore diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 8ac07031f8..05b0c82144 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -22,17 +22,6 @@ #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_wrapper.h" -// Define maintenance 7-9 extension names (not yet in official Vulkan 1.3 headers) -#ifndef VK_KHR_MAINTENANCE_7_EXTENSION_NAME -#define VK_KHR_MAINTENANCE_7_EXTENSION_NAME "VK_KHR_maintenance7" -#endif -#ifndef VK_KHR_MAINTENANCE_8_EXTENSION_NAME -#define VK_KHR_MAINTENANCE_8_EXTENSION_NAME "VK_KHR_maintenance8" -#endif -#ifndef VK_KHR_MAINTENANCE_9_EXTENSION_NAME -#define VK_KHR_MAINTENANCE_9_EXTENSION_NAME "VK_KHR_maintenance9" -#endif - #if defined(ANDROID) && defined(ARCHITECTURE_arm64) #include #endif