diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:35:14 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:35:14 +0100 |
| commit | 22555312de778f88b2514ebdd944fb87d60299c1 (patch) | |
| tree | 979a572107d12a44cfbed938f8e19faaa8b7fc8a /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 4553f723ffe2b3db8bd22787e1b640232ea910dd (diff) | |
| parent | 1e111421e9e5c024d79d2566e43525b791953d7c (diff) | |
Merge pull request #3464 from Armada651/stereo-warnings
VideoConfig: Don't give warnings for per-game stereoscopy parameters.
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 50486d716a..257cc61fc6 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -41,11 +41,6 @@ VideoConfig::VideoConfig() // disable all features by default backend_info.APIType = API_NONE; backend_info.bSupportsExclusiveFullscreen = false; - - // Game-specific stereoscopy settings - bStereoEFBMonoDepth = false; - iStereoDepthPercentage = 100; - iStereoConvergence = 20; } void VideoConfig::Load(const std::string& ini_file) @@ -207,12 +202,14 @@ void VideoConfig::GameIniLoad() CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy); // NOTE - this is x in (1 << x) CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader); + // These are not overrides, they are per-game stereoscopy parameters, hence no warning + iniFile.GetIfExists("Video_Stereoscopy", "StereoConvergence", &iStereoConvergence, 20); + iniFile.GetIfExists("Video_Stereoscopy", "StereoEFBMonoDepth", &bStereoEFBMonoDepth, false); + iniFile.GetIfExists("Video_Stereoscopy", "StereoDepthPercentage", &iStereoDepthPercentage, 100); + CHECK_SETTING("Video_Stereoscopy", "StereoMode", iStereoMode); CHECK_SETTING("Video_Stereoscopy", "StereoDepth", iStereoDepth); - CHECK_SETTING("Video_Stereoscopy", "StereoConvergence", iStereoConvergence); CHECK_SETTING("Video_Stereoscopy", "StereoSwapEyes", bStereoSwapEyes); - CHECK_SETTING("Video_Stereoscopy", "StereoEFBMonoDepth", bStereoEFBMonoDepth); - CHECK_SETTING("Video_Stereoscopy", "StereoDepthPercentage", iStereoDepthPercentage); CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable); CHECK_SETTING("Video_Hacks", "BBoxEnable", bBBoxEnable); |