diff options
| author | Markus Wick <markus+github@selfnet.de> | 2014-12-20 19:57:27 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2014-12-20 19:57:27 +0100 |
| commit | f8bf938f376fd9f62e9f6880d7ce2810c26effc2 (patch) | |
| tree | 5d355296d2c93c0a560b4a1e6b9176526fbf5197 /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 9122c868fef1830a411ff505c117a06e185673e7 (diff) | |
| parent | a858db1d27b7b7c36dc4bc6722c29ce3e90c591b (diff) | |
Merge pull request #1738 from degasus/master
OGL: Fix OGL3 with stereo enabled
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index d0f02dd327..d4cff3ec42 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -118,6 +118,8 @@ void VideoConfig::Load(const std::string& ini_file) // triplicated for each video backend. if (bEnableShaderDebugging) OSD::AddMessage("Warning: Shader Debugging is enabled, performance will suffer heavily", 15000); + + VerifyValidity(); } void VideoConfig::GameIniLoad() @@ -214,7 +216,12 @@ void VideoConfig::VerifyValidity() // TODO: Check iMaxAnisotropy value if (iAdapter < 0 || iAdapter > ((int)backend_info.Adapters.size() - 1)) iAdapter = 0; if (iMultisampleMode < 0 || iMultisampleMode >= (int)backend_info.AAModes.size()) iMultisampleMode = 0; - if (!backend_info.bSupportsGeometryShaders) iStereoMode = 0; + + if (iStereoMode > 0 && !backend_info.bSupportsGeometryShaders) + { + OSD::AddMessage("Stereoscopic 3D isn't supported by your GPU, support for OpenGL 3.2 is required.", 10000); + iStereoMode = 0; + } } void VideoConfig::Save(const std::string& ini_file) |