diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 4862e79080..2ccc634874 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -143,7 +143,7 @@ void Host_SetWiiMoteConnectionState(int _State) { } -void Host_ShowVideoConfig(void*, const std::string&, const std::string&) +void Host_ShowVideoConfig(void*, const std::string&) { } diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index b4a4ade373..c739f0dca1 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -37,8 +37,7 @@ void Host_SetWiiMoteConnectionState(int _State); void Host_UpdateDisasmDialog(); void Host_UpdateMainFrame(); void Host_UpdateTitle(const std::string& title); -void Host_ShowVideoConfig(void* parent, const std::string& backend_name, - const std::string& config_name); +void Host_ShowVideoConfig(void* parent, const std::string& backend_name); // TODO (neobrain): Remove this from host! void* Host_GetRenderHandle(); diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp index c13e5a376b..62af45b489 100644 --- a/Source/Core/DolphinQt2/Host.cpp +++ b/Source/Core/DolphinQt2/Host.cpp @@ -121,8 +121,7 @@ void Host_SetWiiMoteConnectionState(int state) void Host_ConnectWiimote(int wm_idx, bool connect) { } -void Host_ShowVideoConfig(void* parent, const std::string& backend_name, - const std::string& config_name) +void Host_ShowVideoConfig(void* parent, const std::string& backend_name) { } void Host_RefreshDSPDebuggerWindow() diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 96fb4fa7f2..a9a7af6854 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -555,17 +555,16 @@ void Host_ConnectWiimote(int wm_idx, bool connect) } } -void Host_ShowVideoConfig(void* parent, const std::string& backend_name, - const std::string& config_name) +void Host_ShowVideoConfig(void* parent, const std::string& backend_name) { if (backend_name == "Software Renderer") { - SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name); + SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name); diag.ShowModal(); } else { - VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name); + VideoConfigDiag diag((wxWindow*)parent, backend_name); diag.ShowModal(); } } diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 445a6c9fac..c262d6244b 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -136,7 +136,7 @@ void Host_SetWiiMoteConnectionState(int _State) { } -void Host_ShowVideoConfig(void*, const std::string&, const std::string&) +void Host_ShowVideoConfig(void*, const std::string&) { } diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp index f3737512e6..87c947bfcd 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp @@ -31,17 +31,13 @@ IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& se Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this); } -SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, - const std::string& ininame) +SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title) : wxDialog(parent, wxID_ANY, wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title))) { VideoConfig& vconfig = g_Config; - if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) - vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); - else - vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini"); + vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); wxNotebook* const notebook = new wxNotebook(this, wxID_ANY); diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h index 96c4cb4735..3fca996b91 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h @@ -19,7 +19,7 @@ class SoftwareVideoConfigDialog : public wxDialog { public: - SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& ininame); + SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title); ~SoftwareVideoConfigDialog(); void Event_Backend(wxCommandEvent& ev) diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 64e4f7114e..9378d6fd7d 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -329,16 +329,12 @@ static wxArrayString GetListOfResolutions() } #endif -VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title, - const std::string& ininame) +VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title) : wxDialog(parent, wxID_ANY, wxString::Format(_("Dolphin %s Graphics Configuration"), wxGetTranslation(StrToWxStr(title)))), vconfig(g_Config) { - if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) - vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); - else - vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini"); + vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index b6d0f2c515..cc07c62ca6 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -83,7 +83,7 @@ private: class VideoConfigDiag : public wxDialog { public: - VideoConfigDiag(wxWindow* parent, const std::string& title, const std::string& ininame); + VideoConfigDiag(wxWindow* parent, const std::string& title); protected: void Event_Backend(wxCommandEvent& ev) diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index a6d3f45edc..81aa79417b 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase 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 c900e2aa37..e630c177f9 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -61,11 +61,6 @@ std::string VideoBackend::GetDisplayName() const return "Direct3D 11"; } -std::string VideoBackend::GetConfigName() const -{ - return "gfx_dx11"; -} - void VideoBackend::InitBackendInfo() { HRESULT hr = DX11::D3D::LoadDXGI(); diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h index 207a768477..d98ff9e5a2 100644 --- a/Source/Core/VideoBackends/D3D12/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h @@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase 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/D3D12/main.cpp b/Source/Core/VideoBackends/D3D12/main.cpp index 8604735706..a593220c56 100644 --- a/Source/Core/VideoBackends/D3D12/main.cpp +++ b/Source/Core/VideoBackends/D3D12/main.cpp @@ -62,11 +62,6 @@ std::string VideoBackend::GetDisplayName() const return "Direct3D 12 (experimental)"; } -std::string VideoBackend::GetConfigName() const -{ - return "gfx_dx12"; -} - void VideoBackend::InitBackendInfo() { HRESULT hr = D3D::LoadDXGI(); diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h index f853350de0..5581d8511a 100644 --- a/Source/Core/VideoBackends/Null/VideoBackend.h +++ b/Source/Core/VideoBackends/Null/VideoBackend.h @@ -15,7 +15,6 @@ class VideoBackend : public VideoBackendBase std::string GetName() const override { return "Null"; } std::string GetDisplayName() const override { return "Null"; } - std::string GetConfigName() const override { return "gfx_null"; } void Video_Prepare() override; void Video_Cleanup() override; diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index 3f3d76b5cf..17b542801d 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase 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 142004cbc3..7fc91f86bf 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -91,11 +91,6 @@ std::string VideoBackend::GetDisplayName() const return "OpenGL"; } -std::string VideoBackend::GetConfigName() const -{ - return "gfx_opengl"; -} - static std::vector GetShaders(const std::string& sub_dir = "") { std::vector paths = diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index d5b9bed4ca..d34395570d 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -134,11 +134,6 @@ std::string VideoSoftware::GetDisplayName() const return "Software Renderer"; } -std::string VideoSoftware::GetConfigName() const -{ - return "gfx_software"; -} - void VideoSoftware::InitBackendInfo() { g_Config.backend_info.APIType = API_NONE; diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index 4cca26462e..99eec53a4e 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -21,7 +21,6 @@ class VideoSoftware : public VideoBackendBase 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/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp index c51515eb89..eeed59e597 100644 --- a/Source/Core/VideoCommon/MainBase.cpp +++ b/Source/Core/VideoCommon/MainBase.cpp @@ -163,7 +163,7 @@ void VideoBackendBase::ShowConfig(void* parent_handle) if (!m_initialized) InitBackendInfo(); - Host_ShowVideoConfig(parent_handle, GetDisplayName(), GetConfigName()); + Host_ShowVideoConfig(parent_handle, GetDisplayName()); } void VideoBackendBase::InitializeShared() @@ -194,10 +194,7 @@ void VideoBackendBase::InitializeShared() GeometryShaderManager::Init(); PixelShaderManager::Init(); - if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); - else - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini"); + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index ab0703b3a8..3db7cd917f 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -73,8 +73,6 @@ public: virtual std::string GetName() const = 0; virtual std::string GetDisplayName() const { return GetName(); } - virtual std::string GetConfigName() const = 0; - void ShowConfig(void*); virtual void InitBackendInfo() = 0; diff --git a/Source/UnitTests/TestUtils/StubHost.cpp b/Source/UnitTests/TestUtils/StubHost.cpp index cf2f4453fc..c6d1cbb12e 100644 --- a/Source/UnitTests/TestUtils/StubHost.cpp +++ b/Source/UnitTests/TestUtils/StubHost.cpp @@ -60,7 +60,7 @@ void Host_ConnectWiimote(int, bool) void Host_SetWiiMoteConnectionState(int) { } -void Host_ShowVideoConfig(void*, const std::string&, const std::string&) +void Host_ShowVideoConfig(void*, const std::string&) { } std::unique_ptr HostGL_CreateGLInterface()