Merge pull request #3064 from phire/no_xp

VideoBackendBase: Remove check for XP.
This commit is contained in:
flacs 2015-09-18 21:18:07 +02:00
commit 9b08de9522
1 changed files with 1 additions and 17 deletions

View File

@ -18,21 +18,6 @@ static VideoBackend* s_default_backend = nullptr;
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
// http://msdn.microsoft.com/en-us/library/ms725491.aspx
static bool IsGteVista()
{
OSVERSIONINFOEX osvi;
DWORDLONG dwlConditionMask = 0;
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwMajorVersion = 6;
VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE;
}
// Nvidia drivers >= v302 will check if the application exports a global // Nvidia drivers >= v302 will check if the application exports a global
// variable named NvOptimusEnablement to know if it should run the app in high // variable named NvOptimusEnablement to know if it should run the app in high
// performance graphics mode or using the IGP. // performance graphics mode or using the IGP.
@ -48,7 +33,6 @@ void VideoBackend::PopulateList()
// OGL > D3D11 > SW // OGL > D3D11 > SW
g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend); g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend);
#ifdef _WIN32 #ifdef _WIN32
if (IsGteVista())
g_available_video_backends.push_back(backends[1] = new DX11::VideoBackend); g_available_video_backends.push_back(backends[1] = new DX11::VideoBackend);
#endif #endif
g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware); g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);