diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2016-02-16 22:51:45 -0500 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2016-02-16 22:51:45 -0500 |
| commit | 2c9875568fa9146ef757a72c56f54b8d6bb07a73 (patch) | |
| tree | 9ab00676b2a11cf0b7310239a9ed2ed5f374fe1b /Source/Core | |
| parent | 2e35e7930226b1d5a6bfe8421126883e0390e4a3 (diff) | |
| parent | 6fe3a3004de3d7354e91e0313af2ac5d656018e4 (diff) | |
Merge pull request #3648 from RisingFog/hdcmeta_uses_d3d12_jmc47_is_confused
Rename Direct3D to Direct3D 11
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index a852f76777..e085a94bb2 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -532,7 +532,7 @@ void Host_ConnectWiimote(int wm_idx, bool connect) void Host_ShowVideoConfig(void* parent, const std::string& backend_name, const std::string& config_name) { - if (backend_name == "Direct3D" || backend_name == "Direct3D 12 (experimental)" || backend_name == "OpenGL") + if (backend_name == "Direct3D 11" || backend_name == "Direct3D 12 (experimental)" || backend_name == "OpenGL") { VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name); diag.ShowModal(); diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index babdfc4059..e5766540ee 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -59,7 +59,7 @@ std::string VideoBackend::GetName() const std::string VideoBackend::GetDisplayName() const { - return "Direct3D"; + return "Direct3D 11"; } void InitBackendInfo() |