ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer D3D11 and OpenGL over D3D9 by default.

This commit is contained in:
NeoBrainX 2013-03-21 00:17:43 +01:00
parent ff61dc3840
commit 816020f4eb
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Common/Src/VideoBackendBase.cpp
View File

@ -29,6 +29,7 @@
std::vector<VideoBackend*> g_available_video_backends; std::vector<VideoBackend*> g_available_video_backends;
VideoBackend* g_video_backend = NULL; VideoBackend* g_video_backend = NULL;
static VideoBackend* s_default_backend = NULL;
#ifdef _WIN32 #ifdef _WIN32
// http://msdn.microsoft.com/en-us/library/ms725491.aspx // http://msdn.microsoft.com/en-us/library/ms725491.aspx
@ -49,17 +50,27 @@ static bool IsGteVista()
void VideoBackend::PopulateList() void VideoBackend::PopulateList()
{ {
VideoBackend* backends[4] = { NULL };
// D3D11 > OGL > D3D9 > SW
#ifdef _WIN32 #ifdef _WIN32
g_available_video_backends.push_back(new DX9::VideoBackend); g_available_video_backends.push_back(backends[2] = new DX9::VideoBackend);
if (IsGteVista()) if (IsGteVista())
g_available_video_backends.push_back(new DX11::VideoBackend); g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend);
#endif #endif
#ifndef USE_GLES #ifndef USE_GLES
g_available_video_backends.push_back(new OGL::VideoBackend); g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend);
#endif #endif
g_available_video_backends.push_back(new SW::VideoSoftware); g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
g_video_backend = g_available_video_backends.front(); for (int i = 0; i < 4; ++i)
{
if (backends[i])
{
s_default_backend = g_video_backend = backends[i];
break;
}
}
} }
void VideoBackend::ClearList() void VideoBackend::ClearList()
@ -73,8 +84,8 @@ void VideoBackend::ClearList()
void VideoBackend::ActivateBackend(const std::string& name) void VideoBackend::ActivateBackend(const std::string& name)
{ {
if (name.length() == 0) // If NULL, set it to the first one in the list. Expected behavior if (name.length() == 0) // If NULL, set it to the default backend (expected behavior)
g_video_backend = g_available_video_backends.front(); g_video_backend = s_default_backend;
for (std::vector<VideoBackend*>::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it) for (std::vector<VideoBackend*>::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it)
if (name == (*it)->GetName()) if (name == (*it)->GetName())