Merge pull request #3381 from Armada651/revert-3076

Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This commit is contained in:
Markus Wick
2015-12-28 10:18:32 +01:00
12 changed files with 10 additions and 114 deletions

View File

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

View File

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