diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-12-23 00:35:19 +0100 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-12-23 00:35:19 +0100 |
| commit | 8bda12bcfdb20324cd5a764ea814b176b36a4687 (patch) | |
| tree | e10af787c7a7a923ecfe01c963e6fe105d7e7529 /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | a55af16131e74bebb957648001ab9ac78e600325 (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/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index e1bd630356..2e14a3643a 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -103,11 +103,6 @@ std::string VideoBackend::GetDisplayName() const return "OpenGL"; } -std::string VideoBackend::GetConfigName() const -{ - return "gfx_opengl"; -} - static std::vector<std::string> GetShaders(const std::string &sub_dir = "") { std::vector<std::string> paths = DoFileSearch({".glsl"}, { @@ -148,7 +143,7 @@ void VideoBackend::ShowConfig(void *_hParent) { if (!s_BackendInitialized) InitBackendInfo(); - Host_ShowVideoConfig(_hParent, GetDisplayName(), GetConfigName()); + Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl"); } bool VideoBackend::Initialize(void *window_handle) @@ -158,7 +153,7 @@ bool VideoBackend::Initialize(void *window_handle) frameCount = 0; - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini"); + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); |