From d744c5a148f5a477b41b63bceac0558a498ef989 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 26 Nov 2019 15:31:45 +1100 Subject: Compile fixes for Windows-on-ARM64 --- Source/Core/VideoCommon/VideoBackendBase.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Source/Core/VideoCommon/VideoBackendBase.cpp') diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index e1ed233fa1..9a6a92a01a 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -17,14 +17,21 @@ #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" #include "VideoBackends/D3D12/VideoBackend.h" #endif #include "VideoBackends/Null/VideoBackend.h" +#ifdef HAS_OPENGL #include "VideoBackends/OGL/VideoBackend.h" #include "VideoBackends/Software/VideoBackend.h" +#endif #include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoCommon/AsyncRequests.h" @@ -182,13 +189,17 @@ u16 VideoBackendBase::Video_GetBoundingBox(int index) void VideoBackendBase::PopulateList() { // OGL > D3D11 > Vulkan > SW > Null +#ifdef HAS_OPENGL g_available_video_backends.push_back(std::make_unique()); +#endif #ifdef _WIN32 g_available_video_backends.push_back(std::make_unique()); g_available_video_backends.push_back(std::make_unique()); #endif g_available_video_backends.push_back(std::make_unique()); +#ifdef HAS_OPENGL g_available_video_backends.push_back(std::make_unique()); +#endif g_available_video_backends.push_back(std::make_unique()); const auto iter = -- cgit v1.2.3