From 6e2febd4045c368e9f4c8dd5f751b1d6c6af14ec Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 1 Jun 2022 22:49:56 -0400 Subject: [PATCH] VideoBackendBase: Remove __builtin_available for macOS 10.14 --- Source/Core/VideoCommon/VideoBackendBase.cpp | 19 +++++-------------- 1 file 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>& VideoBackendBase::GetAvail std::vector> 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()); #endif @@ -228,17 +225,11 @@ const std::vector>& 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()); - } - else + // Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL. + backends.emplace(backends.begin(), std::make_unique()); +#else + backends.push_back(std::make_unique()); #endif - { - backends.push_back(std::make_unique()); - } #endif #ifdef HAS_OPENGL backends.push_back(std::make_unique());