diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-21 00:14:14 +0100 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-23 23:53:19 +0100 |
| commit | bb3ce1f8d33ef28956f6ffe9231fb2f7e7391899 (patch) | |
| tree | fefe92660ba3de83e433f094f89051cc41215983 /Source | |
| parent | 816020f4eb98df0d4857e17c68642a748bb9827c (diff) | |
Mark the Direct3D9 backend deprecated.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Src/VideoBackendBase.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 54c4ff4cc8..c4455b3234 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -97,6 +97,7 @@ public: virtual void RunLoop(bool enable) = 0; virtual std::string GetName() = 0; + virtual std::string GetDisplayName() { return GetName(); } virtual void ShowConfig(void*) {} diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index b2fe32cb65..024b4b87ae 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -212,9 +212,9 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con it = g_available_video_backends.begin(), itend = g_available_video_backends.end(); for (; it != itend; ++it) - choice_backend->AppendString(wxGetTranslation(StrToWxStr((*it)->GetName()))); + choice_backend->AppendString(wxGetTranslation(StrToWxStr((*it)->GetDisplayName()))); - choice_backend->SetStringSelection(wxGetTranslation(StrToWxStr(g_video_backend->GetName()))); + choice_backend->SetStringSelection(wxGetTranslation(StrToWxStr(g_video_backend->GetDisplayName()))); choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h index ef3a9f5a51..5b7c54d326 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h @@ -13,6 +13,7 @@ class VideoBackend : public VideoBackendHardware void Shutdown(); std::string GetName(); + std::string GetDisplayName(); void Video_Prepare(); void Video_Cleanup(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 04ea2077fc..4b4fc6608e 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -87,6 +87,11 @@ std::string VideoBackend::GetName() return "Direct3D9"; } +std::string VideoBackend::GetDisplayName() +{ + return "Direct3D9 (deprecated)"; +} + void InitBackendInfo() { DX9::D3D::Init(); |