diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-02-16 14:15:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 14:15:00 +1000 |
| commit | b5c3881fe703287c4f883ca42a3b931bb6594854 (patch) | |
| tree | 29daf45582fa2860c76127271457675184341900 /Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp | |
| parent | c41f32bcf8fe0c04d54d3541df210a604b2399d1 (diff) | |
| parent | eabde77892faf4408481f685f2fbf1b348232d5f (diff) | |
Merge pull request #7512 from stenzek/runtime-headless
DolphinNoGUI: Runtime selection of platform
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
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 <Windows.h> -#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 <dlfcn.h> #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) |