From 2fd0a9d4506a7751482787de51ad346ef90fec6a Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Wed, 20 Sep 2023 19:52:15 -0700 Subject: [PATCH] refactor: move OpenGL to the bottom order of entries should follow what we want users to use --- Source/Core/VideoCommon/VideoBackendBase.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 5c25b4b7ddc7..437b050f482e 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -229,15 +229,12 @@ const std::vector>& VideoBackendBase::GetAvail std::vector> backends; // Mainline prefers OGL > D3D11 > D3D12 > Vulkan > SW > Null - // Slippi will instead prefer D3D11 > D3D12 > OGL > Vulkan > SW > Null + // Slippi will instead prefer D3D11 > D3D12 > Vulkan > OGL > SW > Null // SLIPPITODO: Check what works best in practice for each OS #ifdef _WIN32 backends.push_back(std::make_unique()); backends.push_back(std::make_unique()); #endif -#ifdef HAS_OPENGL - backends.push_back(std::make_unique()); -#endif #ifdef HAS_VULKAN #ifdef __APPLE__ // Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL. @@ -250,6 +247,7 @@ const std::vector>& VideoBackendBase::GetAvail backends.emplace(backends.begin(), std::make_unique()); #endif #ifdef HAS_OPENGL + backends.push_back(std::make_unique()); backends.push_back(std::make_unique()); #endif backends.push_back(std::make_unique());