From f9869cb2163b0e3644dae4c7b592cdc5b516608b Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 24 Oct 2018 14:47:48 +1000 Subject: Vulkan: Support runtime selection of WSI --- Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp | 26 ++++------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp') diff --git a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp index 96f955ce2c..d8d1e99d0c 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp @@ -13,11 +13,9 @@ #include "VideoBackends/Vulkan/VulkanLoader.h" -#if defined(VK_USE_PLATFORM_WIN32_KHR) +#if defined(_WIN32) #include -#elif defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR) || \ - defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(VK_USE_PLATFORM_MACOS_MVK) || \ - defined(USE_HEADLESS) +#else #include #endif @@ -42,7 +40,7 @@ static void ResetVulkanLibraryFunctionPointers() #undef VULKAN_MODULE_ENTRY_POINT } -#if defined(VK_USE_PLATFORM_WIN32_KHR) +#if defined(_WIN32) static HMODULE vulkan_module; static std::atomic_int vulkan_module_ref_count = {0}; @@ -100,9 +98,7 @@ void UnloadVulkanLibrary() vulkan_module = nullptr; } -#elif defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR) || \ - defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(VK_USE_PLATFORM_MACOS_MVK) || \ - defined(USE_HEADLESS) +#else static void* vulkan_module; static std::atomic_int vulkan_module_ref_count = {0}; @@ -181,20 +177,6 @@ void UnloadVulkanLibrary() vulkan_module = nullptr; } -#else - -//#warning Unknown platform, not compiling loader. - -bool LoadVulkanLibrary() -{ - return false; -} - -void UnloadVulkanLibrary() -{ - ResetVulkanLibraryFunctionPointers(); -} - #endif bool LoadVulkanInstanceFunctions(VkInstance instance) -- cgit v1.2.3