From 982f1d6b09d0569f7a83a497eb44f08d0a8c5f4c Mon Sep 17 00:00:00 2001 From: speedym Date: Tue, 9 Jun 2020 18:18:13 +0200 Subject: Fix for XLib support for Linux --- .../src/VulkanUtilities/VulkanInstance.cpp | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp index fe489efd..0ba9dfc4 100644 --- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp +++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp @@ -118,17 +118,25 @@ VulkanInstance::VulkanInstance(bool EnableValidation, // Enable surface extensions depending on OS #if defined(VK_USE_PLATFORM_WIN32_KHR) - VK_KHR_WIN32_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_ANDROID_KHR) - VK_KHR_ANDROID_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_WAYLAND_KHR) - VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_XCB_KHR) - VK_KHR_XCB_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_IOS_MVK) - VK_MVK_IOS_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_MACOS_MVK) - VK_MVK_MACOS_SURFACE_EXTENSION_NAME + VK_KHR_WIN32_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_ANDROID_KHR) + VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_WAYLAND_KHR) + VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_XLIB_KHR) + VK_KHR_XLIB_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_XCB_KHR) + VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_IOS_MVK) + VK_MVK_IOS_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_MACOS_MVK) + VK_MVK_MACOS_SURFACE_EXTENSION_NAME, #endif }; -- cgit v1.2.3