From 38bedac427cbdedf1fbca87c8651191af65a3699 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Fri, 16 Jan 2026 23:19:25 +0100 Subject: [PATCH] Don't use X11 code when using SDL Vulkan. --- plume_render_interface_types.h | 2 +- plume_vulkan.cpp | 2 ++ plume_vulkan.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plume_render_interface_types.h b/plume_render_interface_types.h index ba04a21..9dcfedf 100644 --- a/plume_render_interface_types.h +++ b/plume_render_interface_types.h @@ -19,7 +19,7 @@ #include #elif defined(__ANDROID__) #include "android/native_window.h" -#elif defined(__linux__) +#elif defined(__linux__) && !defined(PLUME_SDL_VULKAN_ENABLED) #include "X11/Xlib.h" #undef None #undef Status diff --git a/plume_vulkan.cpp b/plume_vulkan.cpp index cad3ba2..ee9aa2c 100644 --- a/plume_vulkan.cpp +++ b/plume_vulkan.cpp @@ -53,7 +53,9 @@ namespace plume { # elif defined(__ANDROID__) VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, # elif defined(__linux__) +# if !defined(PLUME_SDL_VULKAN_ENABLED) VK_KHR_XLIB_SURFACE_EXTENSION_NAME, +# endif # elif defined(__APPLE__) VK_EXT_METAL_SURFACE_EXTENSION_NAME, # endif diff --git a/plume_vulkan.h b/plume_vulkan.h index 0dfd23c..0a1edbe 100644 --- a/plume_vulkan.h +++ b/plume_vulkan.h @@ -18,7 +18,7 @@ #define VK_USE_PLATFORM_WIN32_KHR #elif defined(__ANDROID__) #define VK_USE_PLATFORM_ANDROID_KHR -#elif defined(__linux__) +#elif defined(__linux__) && !defined(PLUME_SDL_VULKAN_ENABLED) #define VK_USE_PLATFORM_XLIB_KHR #elif defined(__APPLE__) #define VK_USE_PLATFORM_METAL_EXT