From 8bda12bcfdb20324cd5a764ea814b176b36a4687 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 23 Dec 2015 00:35:19 +0100 Subject: 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 --- Source/Core/VideoCommon/VideoBackendBase.h | 1 - Source/Core/VideoCommon/VideoConfig.cpp | 21 --------------------- Source/Core/VideoCommon/VideoConfig.h | 10 ---------- 3 files changed, 32 deletions(-) (limited to 'Source/Core/VideoCommon') diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 8a8a48f1bd..f6cd1d12bf 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -72,7 +72,6 @@ public: virtual std::string GetName() const = 0; virtual std::string GetDisplayName() const { return GetName(); } - virtual std::string GetConfigName() const = 0; virtual void ShowConfig(void*) = 0; 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); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 4995e7d0ab..5b88e64c2f 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -51,14 +51,6 @@ enum StereoMode STEREO_3DVISION }; -constexpr int STEREOSCOPY_PRESETS_NUM = 3; - -struct StereoscopyPreset final -{ - int depth; - int convergence; -}; - // NEVER inherit from this class. struct VideoConfig final { @@ -88,8 +80,6 @@ struct VideoConfig final bool bForceFiltering; int iMaxAnisotropy; std::string sPostProcessingShader; - std::array oStereoPresets; - int iStereoActivePreset; // Information bool bShowFPS; -- cgit v1.2.3