From a561c436fcd39327f5b47fb701de65db218a3f12 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 14 Jan 2014 21:57:32 +0100 Subject: [PATCH] Change the default GFX backend from D3D11 to OGL. Rationale and discussion: https://ml.dolphin-emu.org/archives/dolphin-dev/2014-January/000003.html --- Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 +- Source/Core/VideoCommon/VideoBackendBase.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 34923a4654..42c384700e 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -67,7 +67,7 @@ void VideoConfigDiag::Event_Close(wxCloseEvent& ev) } #if defined(_WIN32) -wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nThe software renderer is only used for debugging, so you'll want to use either Direct3D or OpenGL. Different games will behave differently on each backend, so for best emulation experience it's recommended to try both and chose the one that fits your requirements best.\nNote that the Direct3D backend is not available on old Windows versions.\n\nIf unsure, use Direct3D."); +wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nThe software renderer is only used for debugging, so you'll want to use either Direct3D or OpenGL. Different games will behave differently on each backend, so for best emulation experience it's recommended to try both and chose the one that fits your requirements best.\nNote that the Direct3D backend is not available on old Windows versions.\n\nIf unsure, use OpenGL."); #else wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nThe software renderer is only used for debugging, so unless you have a reason to use it you'll want to select OpenGL here.\n\nIf unsure, use OpenGL."); #endif diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index cf45c7b929..bddd51f0a8 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -40,13 +40,13 @@ void VideoBackend::PopulateList() { VideoBackend* backends[4] = { NULL }; - // D3D11 > OGL > SW + // OGL > D3D11 > SW +#if !defined(USE_GLES) || USE_GLES3 + g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend); +#endif #ifdef _WIN32 if (IsGteVista()) - g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend); -#endif -#if !defined(USE_GLES) || USE_GLES3 - g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend); + g_available_video_backends.push_back(backends[1] = new DX11::VideoBackend); #endif g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);