summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/VideoConfig.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2015-12-23 00:35:19 +0100
committerJules Blok <jules.blok@gmail.com>2015-12-23 00:35:19 +0100
commit8bda12bcfdb20324cd5a764ea814b176b36a4687 (patch)
treee10af787c7a7a923ecfe01c963e6fe105d7e7529 /Source/Core/VideoCommon/VideoConfig.cpp
parenta55af16131e74bebb957648001ab9ac78e600325 (diff)
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This reverts commit 81414b4fa2edadf0b2a2bb0bd4df61dd59165eec, reversing changes made to b926061f641692ae31bacbeba304f5941db7d3bc. Conflicts: Source/Core/DolphinWX/Frame.cpp Source/Core/VideoCommon/VideoConfig.cpp Source/Core/VideoCommon/VideoConfig.h
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
-rw-r--r--Source/Core/VideoCommon/VideoConfig.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
index 2db0cc7633..f29377f714 100644
--- a/Source/Core/VideoCommon/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -98,16 +98,6 @@ void VideoConfig::Load(const std::string& ini_file)
stereoscopy->Get("StereoConvergencePercentage", &iStereoConvergencePercentage, 100);
stereoscopy->Get("StereoSwapEyes", &bStereoSwapEyes, false);
- //currently these settings are not saved in global config, so we could've initialized them directly
- for (size_t i = 0; i < oStereoPresets.size(); ++i)
- {
- stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage);
- stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth);
- }
- stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0);
- iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence;
- iStereoDepth = oStereoPresets[iStereoActivePreset].depth;
-
IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks");
hacks->Get("EFBAccessEnable", &bEFBAccessEnable, true);
hacks->Get("BBoxEnable", &bBBoxEnable, false);
@@ -208,17 +198,6 @@ 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 settings, hence no warning
- IniFile::Section* stereoscopy = iniFile.GetOrCreateSection("Stereoscopy");
- for (size_t i = 0; i < oStereoPresets.size(); ++i)
- {
- stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage);
- stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth);
- }
- stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0);
- iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence;
- iStereoDepth = oStereoPresets[iStereoActivePreset].depth;
-
CHECK_SETTING("Video_Stereoscopy", "StereoMode", iStereoMode);
CHECK_SETTING("Video_Stereoscopy", "StereoDepth", iStereoDepth);
CHECK_SETTING("Video_Stereoscopy", "StereoConvergence", iStereoConvergence);