diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:18:32 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:18:32 +0100 |
| commit | aabcd441d9a9fa98565a6aaf82cf56b64b53767d (patch) | |
| tree | 443d05c510fa63723a8ca6a8762349d543e1443c /Source/Core/VideoBackends/D3D/main.cpp | |
| parent | 281860eafa65d7f65b02cc449ac94397d0f111f4 (diff) | |
| parent | 8bda12bcfdb20324cd5a764ea814b176b36a4687 (diff) | |
Merge pull request #3381 from Armada651/revert-3076
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
Diffstat (limited to 'Source/Core/VideoBackends/D3D/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 22af42c5d9..35e4978c9b 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -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(); |