VideoCommon: Drop GetConfigName.

We're past 5.0 now, so there is no need to look for old inis.
This commit is contained in:
degasus 2016-06-26 08:06:23 +02:00
parent 5f2f462067
commit d79aeaa1e9
21 changed files with 16 additions and 57 deletions

View file

@ -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&)
{ {
} }

View file

@ -37,8 +37,7 @@ void Host_SetWiiMoteConnectionState(int _State);
void Host_UpdateDisasmDialog(); void Host_UpdateDisasmDialog();
void Host_UpdateMainFrame(); void Host_UpdateMainFrame();
void Host_UpdateTitle(const std::string& title); void Host_UpdateTitle(const std::string& title);
void Host_ShowVideoConfig(void* parent, const std::string& backend_name, void Host_ShowVideoConfig(void* parent, const std::string& backend_name);
const std::string& config_name);
// TODO (neobrain): Remove this from host! // TODO (neobrain): Remove this from host!
void* Host_GetRenderHandle(); void* Host_GetRenderHandle();

View file

@ -121,8 +121,7 @@ void Host_SetWiiMoteConnectionState(int state)
void Host_ConnectWiimote(int wm_idx, bool connect) void Host_ConnectWiimote(int wm_idx, bool connect)
{ {
} }
void Host_ShowVideoConfig(void* parent, const std::string& backend_name, void Host_ShowVideoConfig(void* parent, const std::string& backend_name)
const std::string& config_name)
{ {
} }
void Host_RefreshDSPDebuggerWindow() void Host_RefreshDSPDebuggerWindow()

View file

@ -555,17 +555,16 @@ void Host_ConnectWiimote(int wm_idx, bool connect)
} }
} }
void Host_ShowVideoConfig(void* parent, const std::string& backend_name, void Host_ShowVideoConfig(void* parent, const std::string& backend_name)
const std::string& config_name)
{ {
if (backend_name == "Software Renderer") if (backend_name == "Software Renderer")
{ {
SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name); SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name);
diag.ShowModal(); diag.ShowModal();
} }
else else
{ {
VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name); VideoConfigDiag diag((wxWindow*)parent, backend_name);
diag.ShowModal(); diag.ShowModal();
} }
} }

View file

@ -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&)
{ {
} }

View file

@ -31,17 +31,13 @@ IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& se
Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this); Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
} }
SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title)
const std::string& ininame)
: wxDialog(parent, wxID_ANY, : wxDialog(parent, wxID_ANY,
wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title))) wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
{ {
VideoConfig& vconfig = g_Config; VideoConfig& vconfig = g_Config;
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
vconfig.Load(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");
wxNotebook* const notebook = new wxNotebook(this, wxID_ANY); wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);

View file

@ -19,7 +19,7 @@
class SoftwareVideoConfigDialog : public wxDialog class SoftwareVideoConfigDialog : public wxDialog
{ {
public: public:
SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& ininame); SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title);
~SoftwareVideoConfigDialog(); ~SoftwareVideoConfigDialog();
void Event_Backend(wxCommandEvent& ev) void Event_Backend(wxCommandEvent& ev)

View file

@ -329,16 +329,12 @@ static wxArrayString GetListOfResolutions()
} }
#endif #endif
VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title, VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title)
const std::string& ininame)
: wxDialog(parent, wxID_ANY, wxString::Format(_("Dolphin %s Graphics Configuration"), : wxDialog(parent, wxID_ANY, wxString::Format(_("Dolphin %s Graphics Configuration"),
wxGetTranslation(StrToWxStr(title)))), wxGetTranslation(StrToWxStr(title)))),
vconfig(g_Config) vconfig(g_Config)
{ {
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
vconfig.Load(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");
Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this); Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this);

View file

@ -83,7 +83,7 @@ private:
class VideoConfigDiag : public wxDialog class VideoConfigDiag : public wxDialog
{ {
public: public:
VideoConfigDiag(wxWindow* parent, const std::string& title, const std::string& ininame); VideoConfigDiag(wxWindow* parent, const std::string& title);
protected: protected:
void Event_Backend(wxCommandEvent& ev) void Event_Backend(wxCommandEvent& ev)

View file

@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase
std::string GetName() const override; std::string GetName() const override;
std::string GetDisplayName() const override; std::string GetDisplayName() const override;
std::string GetConfigName() const override;
void Video_Prepare() override; void Video_Prepare() override;
void Video_Cleanup() override; void Video_Cleanup() override;

View file

@ -61,11 +61,6 @@ std::string VideoBackend::GetDisplayName() const
return "Direct3D 11"; return "Direct3D 11";
} }
std::string VideoBackend::GetConfigName() const
{
return "gfx_dx11";
}
void VideoBackend::InitBackendInfo() void VideoBackend::InitBackendInfo()
{ {
HRESULT hr = DX11::D3D::LoadDXGI(); HRESULT hr = DX11::D3D::LoadDXGI();

View file

@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase
std::string GetName() const override; std::string GetName() const override;
std::string GetDisplayName() const override; std::string GetDisplayName() const override;
std::string GetConfigName() const override;
void Video_Prepare() override; void Video_Prepare() override;
void Video_Cleanup() override; void Video_Cleanup() override;

View file

@ -62,11 +62,6 @@ std::string VideoBackend::GetDisplayName() const
return "Direct3D 12 (experimental)"; return "Direct3D 12 (experimental)";
} }
std::string VideoBackend::GetConfigName() const
{
return "gfx_dx12";
}
void VideoBackend::InitBackendInfo() void VideoBackend::InitBackendInfo()
{ {
HRESULT hr = D3D::LoadDXGI(); HRESULT hr = D3D::LoadDXGI();

View file

@ -15,7 +15,6 @@ class VideoBackend : public VideoBackendBase
std::string GetName() const override { return "Null"; } std::string GetName() const override { return "Null"; }
std::string GetDisplayName() 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_Prepare() override;
void Video_Cleanup() override; void Video_Cleanup() override;

View file

@ -16,7 +16,6 @@ class VideoBackend : public VideoBackendBase
std::string GetName() const override; std::string GetName() const override;
std::string GetDisplayName() const override; std::string GetDisplayName() const override;
std::string GetConfigName() const override;
void Video_Prepare() override; void Video_Prepare() override;
void Video_Cleanup() override; void Video_Cleanup() override;

View file

@ -91,11 +91,6 @@ std::string VideoBackend::GetDisplayName() const
return "OpenGL"; return "OpenGL";
} }
std::string VideoBackend::GetConfigName() const
{
return "gfx_opengl";
}
static std::vector<std::string> GetShaders(const std::string& sub_dir = "") static std::vector<std::string> GetShaders(const std::string& sub_dir = "")
{ {
std::vector<std::string> paths = std::vector<std::string> paths =

View file

@ -134,11 +134,6 @@ std::string VideoSoftware::GetDisplayName() const
return "Software Renderer"; return "Software Renderer";
} }
std::string VideoSoftware::GetConfigName() const
{
return "gfx_software";
}
void VideoSoftware::InitBackendInfo() void VideoSoftware::InitBackendInfo()
{ {
g_Config.backend_info.APIType = API_NONE; g_Config.backend_info.APIType = API_NONE;

View file

@ -21,7 +21,6 @@ class VideoSoftware : public VideoBackendBase
std::string GetName() const override; std::string GetName() const override;
std::string GetDisplayName() const override; std::string GetDisplayName() const override;
std::string GetConfigName() const override;
void Video_Prepare() override; void Video_Prepare() override;
void Video_Cleanup() override; void Video_Cleanup() override;

View file

@ -163,7 +163,7 @@ void VideoBackendBase::ShowConfig(void* parent_handle)
if (!m_initialized) if (!m_initialized)
InitBackendInfo(); InitBackendInfo();
Host_ShowVideoConfig(parent_handle, GetDisplayName(), GetConfigName()); Host_ShowVideoConfig(parent_handle, GetDisplayName());
} }
void VideoBackendBase::InitializeShared() void VideoBackendBase::InitializeShared()
@ -194,10 +194,7 @@ void VideoBackendBase::InitializeShared()
GeometryShaderManager::Init(); GeometryShaderManager::Init();
PixelShaderManager::Init(); PixelShaderManager::Init();
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
g_Config.Load(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.GameIniLoad(); g_Config.GameIniLoad();
g_Config.UpdateProjectionHack(); g_Config.UpdateProjectionHack();
g_Config.VerifyValidity(); g_Config.VerifyValidity();

View file

@ -73,8 +73,6 @@ public:
virtual std::string GetName() const = 0; virtual std::string GetName() const = 0;
virtual std::string GetDisplayName() const { return GetName(); } virtual std::string GetDisplayName() const { return GetName(); }
virtual std::string GetConfigName() const = 0;
void ShowConfig(void*); void ShowConfig(void*);
virtual void InitBackendInfo() = 0; virtual void InitBackendInfo() = 0;

View file

@ -60,7 +60,7 @@ void Host_ConnectWiimote(int, bool)
void Host_SetWiiMoteConnectionState(int) void Host_SetWiiMoteConnectionState(int)
{ {
} }
void Host_ShowVideoConfig(void*, const std::string&, const std::string&) void Host_ShowVideoConfig(void*, const std::string&)
{ {
} }
std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface() std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface()