From 75bfc336fc61f67b2c07f684116726e22daf0f7d Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 29 Apr 2025 00:38:29 +0300 Subject: [PATCH] vk: Prevent header internals from leaking --- 3rdparty/CMakeLists.txt | 3 --- rpcs3/Emu/RSX/VK/VulkanAPI.h | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index cb0909e978..dfa73f38e7 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -193,9 +193,6 @@ if(USE_VULKAN) if (WAYLAND_FOUND) target_include_directories(3rdparty_vulkan INTERFACE ${WAYLAND_INCLUDE_DIR}) - - target_compile_definitions(3rdparty_vulkan - INTERFACE -DVK_USE_PLATFORM_WAYLAND_KHR) endif() endif() diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h index b675f9f8fe..c91e9cb5a5 100644 --- a/rpcs3/Emu/RSX/VK/VulkanAPI.h +++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h @@ -1,5 +1,6 @@ #pragma once +// Configure vulkan.h #ifdef _WIN32 #define VK_USE_PLATFORM_WIN32_KHR #elif defined(__APPLE__) @@ -26,6 +27,13 @@ #pragma warning(pop) #endif +// Undefine header configuration variables +#undef VK_USE_PLATFORM_WIN32_KHR +#undef VK_USE_PLATFORM_MACOS_MVK +#undef VK_USE_PLATFORM_ANDROID_KHR +#undef VK_USE_PLATFORM_XLIB_KHR +#undef VK_USE_PLATFORM_WAYLAND_KHR + #include #if VK_HEADER_VERSION < 287