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

6 files changed, 6 insertions, 24 deletions

diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index 117b2ef8ef..7ab12f7d9d 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -17,7 +17,6 @@ class VideoBackend : public VideoBackendHardware
 
 	std::string GetName() const override;
 	std::string GetDisplayName() const override;
-	std::string GetConfigName() const override;
 
 	void Video_Prepare() override;
 	void Video_Cleanup() override;
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 22af42c5d9..35e4978c9b 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -65,11 +65,6 @@ std::string VideoBackend::GetDisplayName() const
 	return "Direct3D";
 }
 
-std::string VideoBackend::GetConfigName() const
-{
-	return "gfx_dx11";
-}
-
 void InitBackendInfo()
 {
 	HRESULT hr = DX11::D3D::LoadDXGI();
@@ -148,7 +143,7 @@ void InitBackendInfo()
 void VideoBackend::ShowConfig(void *hParent)
 {
 	InitBackendInfo();
-	Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName());
+	Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11");
 }
 
 bool VideoBackend::Initialize(void *window_handle)
@@ -161,7 +156,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_dx11.ini");
 	g_Config.GameIniLoad();
 	g_Config.UpdateProjectionHack();
 	g_Config.VerifyValidity();
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
index 9226f3dbe9..e42813c3cb 100644
--- a/Source/Core/VideoBackends/OGL/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -17,7 +17,6 @@ class VideoBackend : public VideoBackendHardware
 
 	std::string GetName() const override;
 	std::string GetDisplayName() const override;
-	std::string GetConfigName() const override;
 
 	void Video_Prepare() override;
 	void Video_Cleanup() override;
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();
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);
 
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 6b4c79a5c7..e34ae07f9a 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -19,7 +19,6 @@ class VideoSoftware : public VideoBackend
 
 	std::string GetName() const override;
 	std::string GetDisplayName() const override;
-	std::string GetConfigName() const override;
 
 	void EmuStateChange(EMUSTATE_CHANGE newState) override;