mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-29 15:26:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

VideoBackendBase: Remove __builtin_available for macOS 10.14

Browse source
This commit is contained in:
OatmealDome 2022-06-01 22:49:56 -04:00
parent 77d0170285
commit 6e2febd404
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/VideoCommon/VideoBackendBase.cpp
View file

@ -215,10 +215,7 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail
std::vector<std::unique_ptr<VideoBackendBase>> backends; std::vector<std::unique_ptr<VideoBackendBase>> backends;
// OGL > D3D11 > D3D12 > Vulkan > SW > Null // OGL > D3D11 > D3D12 > Vulkan > SW > Null
// // On macOS, we prefer Vulkan over OpenGL due to OpenGL support being deprecated by Apple.
// 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.
#ifdef HAS_OPENGL #ifdef HAS_OPENGL
backends.push_back(std::make_unique<OGL::VideoBackend>()); backends.push_back(std::make_unique<OGL::VideoBackend>());
#endif #endif
@ -228,17 +225,11 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail
#endif #endif
#ifdef HAS_VULKAN #ifdef HAS_VULKAN
#ifdef __APPLE__ #ifdef __APPLE__
// If we can run the Vulkan backend, emplace it at the beginning of the vector so // Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL.
// it takes precedence over OpenGL. backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>());
if (__builtin_available(macOS 10.14, *)) #else
{ backends.push_back(std::make_unique<Vulkan::VideoBackend>());
backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>());
}
else
#endif #endif
{
backends.push_back(std::make_unique<Vulkan::VideoBackend>());
}
#endif #endif
#ifdef HAS_OPENGL #ifdef HAS_OPENGL
backends.push_back(std::make_unique<SW::VideoSoftware>()); backends.push_back(std::make_unique<SW::VideoSoftware>());