diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
| commit | 748be565b8df535ef558e74b38cd0f4d615f8a21 (patch) | |
| tree | b151efee0a87e99125f2401325a9bddecf84fc73 /Source/Core/VideoCommon/VideoBackendBase.cpp | |
| parent | cf17fccdd3093a1b8476b10183b1c4bde36da74d (diff) | |
| parent | ce493b897d6d3735c930a8465cc0c26bbe5feb86 (diff) | |
Merge remote-tracking branch 'dolphin-emu/master' into gameinis
Diffstat (limited to 'Source/Core/VideoCommon/VideoBackendBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoBackendBase.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index c0e466cb5c..69beee3f1d 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -18,21 +18,6 @@ static VideoBackend* s_default_backend = nullptr; #ifdef _WIN32 #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 // variable named NvOptimusEnablement to know if it should run the app in high // performance graphics mode or using the IGP. @@ -48,8 +33,7 @@ void VideoBackend::PopulateList() // OGL > D3D11 > SW g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend); #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 g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware); |