ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/jni/MainAndroid.cpp
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&)
{
}

3
Source/Core/Core/Host.h
View File

@ -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();

3
Source/Core/DolphinQt2/Host.cpp
View File

@ -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()

7
Source/Core/DolphinWX/Main.cpp
View File

@ -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();
}
}

2
Source/Core/DolphinWX/MainNoGUI.cpp
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&)
{
}

6
Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
View File

@ -31,17 +31,13 @@ IntegerSetting<T>::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");
wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);

2
Source/Core/DolphinWX/SoftwareVideoConfigDialog.h
View File

@ -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)

6
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -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");
Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this);

2
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -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)

1
Source/Core/VideoBackends/D3D/VideoBackend.h
View File

@ -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;

5
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -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();

1
Source/Core/VideoBackends/D3D12/VideoBackend.h
View File

@ -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;

5
Source/Core/VideoBackends/D3D12/main.cpp
View File

@ -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();

1
Source/Core/VideoBackends/Null/VideoBackend.h
View File

@ -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;

1
Source/Core/VideoBackends/OGL/VideoBackend.h
View File

@ -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;

5
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -91,11 +91,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 =

5
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -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;

1
Source/Core/VideoBackends/Software/VideoBackend.h
View File

@ -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;

5
Source/Core/VideoCommon/MainBase.cpp
View File

@ -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.GameIniLoad();
g_Config.UpdateProjectionHack();
g_Config.VerifyValidity();

2
Source/Core/VideoCommon/VideoBackendBase.h
View File

@ -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;

2
Source/UnitTests/TestUtils/StubHost.cpp
View File

@ -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<cInterfaceBase> HostGL_CreateGLInterface()