diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-24 21:01:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 21:01:39 +0200 |
| commit | 1719e634b22b29b4ce43ac090f958ab766d5da10 (patch) | |
| tree | 1970e8ad051bc600546399da8e7404f33bebd02f /Source/Core/VideoCommon/VideoBackendBase.cpp | |
| parent | 285b926e92bb1536c8d0b708a21b08b49b52382d (diff) | |
| parent | 02c32420787eff4c4d52ac9bb161368f85261438 (diff) | |
Merge pull request #9190 from iwubcode/enable_vulkan_windows_solution
VideoCommon: enable vulkan in windows solution, update CMake vulkan option to match opengl
Diffstat (limited to 'Source/Core/VideoCommon/VideoBackendBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoBackendBase.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 690745f9c8..c4c26ed6a3 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -22,11 +22,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -// OpenGL is not available on Windows-on-ARM64 -#if !defined(_WIN32) || !defined(_M_ARM64) -#define HAS_OPENGL 1 -#endif - // TODO: ugly #ifdef _WIN32 #include "VideoBackends/D3D/VideoBackend.h" @@ -37,7 +32,9 @@ #include "VideoBackends/OGL/VideoBackend.h" #include "VideoBackends/Software/VideoBackend.h" #endif +#ifdef HAS_VULKAN #include "VideoBackends/Vulkan/VideoBackend.h" +#endif #include "VideoCommon/AsyncRequests.h" #include "VideoCommon/BPStructs.h" @@ -225,7 +222,7 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail backends.push_back(std::make_unique<DX11::VideoBackend>()); backends.push_back(std::make_unique<DX12::VideoBackend>()); #endif -#ifdef USE_VULKAN +#ifdef HAS_VULKAN backends.push_back(std::make_unique<Vulkan::VideoBackend>()); #endif #ifdef HAS_OPENGL |