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/Software/SWmain.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/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 7b55bb0971..c891542d8a 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -65,19 +65,14 @@ std::string VideoSoftware::GetDisplayName() const return "Software Renderer"; } -std::string VideoSoftware::GetConfigName() const -{ - return "gfx_software"; -} - void VideoSoftware::ShowConfig(void *hParent) { - Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName()); + Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software"); } bool VideoSoftware::Initialize(void *window_handle) { - g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini").c_str()); + g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); SWOGLWindow::Init(window_handle); |