mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-19 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3381 from Armada651/revert-3076

Browse source 
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
commit aabcd441d9
12 changed files with 10 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

9
Source/Core/VideoBackends/D3D/main.cpp
View file

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