summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/VideoBackendBase.cpp
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2022-06-02 20:20:52 -0400
committerGitHub <noreply@github.com>2022-06-02 20:20:52 -0400
commit84944625dfeb161c014106e718ef05189755a0f0 (patch)
tree6d8ee501b0aa010855ac1b24a90f9f6a9fd906f2 /Source/Core/VideoCommon/VideoBackendBase.cpp
parent5808a0bc9a5c44dd8142cbbece51b17e63f2499a (diff)
parentcb7e82760156da33f2f54fd3dbd9ae76c1fc55e3 (diff)
Merge pull request #10714 from OatmealDome/macos-mojave-bump
BuildMacOSUniversalBinary: Bump minimum macOS to 10.14
Diffstat (limited to 'Source/Core/VideoCommon/VideoBackendBase.cpp')
-rw-r--r--Source/Core/VideoCommon/VideoBackendBase.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp
index 7136545c25..3a2eafd025 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.cpp
+++ b/Source/Core/VideoCommon/VideoBackendBase.cpp
@@ -215,10 +215,7 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail
std::vector<std::unique_ptr<VideoBackendBase>> backends;
// OGL > D3D11 > D3D12 > Vulkan > SW > Null
- //
- // On macOS Mojave and newer, we prefer Vulkan over OGL due to outdated drivers.
- // However, on macOS High Sierra and older, we still prefer OGL due to its older Metal version
- // missing several features required by the Vulkan backend.
+ // On macOS, we prefer Vulkan over OpenGL due to OpenGL support being deprecated by Apple.
#ifdef HAS_OPENGL
backends.push_back(std::make_unique<OGL::VideoBackend>());
#endif
@@ -228,17 +225,11 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail
#endif
#ifdef HAS_VULKAN
#ifdef __APPLE__
- // If we can run the Vulkan backend, emplace it at the beginning of the vector so
- // it takes precedence over OpenGL.
- if (__builtin_available(macOS 10.14, *))
- {
- backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>());
- }
- else
+ // Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL.
+ backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>());
+#else
+ backends.push_back(std::make_unique<Vulkan::VideoBackend>());
#endif
- {
- backends.push_back(std::make_unique<Vulkan::VideoBackend>());
- }
#endif
#ifdef HAS_OPENGL
backends.push_back(std::make_unique<SW::VideoSoftware>());