ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark the Direct3D9 backend deprecated.

This commit is contained in:
NeoBrainX 2013-03-21 00:14:14 +01:00
parent 816020f4eb
commit bb3ce1f8d3
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/VideoBackendBase.h
View File

@ -97,6 +97,7 @@ public:
virtual void RunLoop(bool enable) = 0; virtual void RunLoop(bool enable) = 0;
virtual std::string GetName() = 0; virtual std::string GetName() = 0;
virtual std::string GetDisplayName() { return GetName(); }
virtual void ShowConfig(void*) {} virtual void ShowConfig(void*) {}

4
Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
View File

@ -212,9 +212,9 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
it = g_available_video_backends.begin(), it = g_available_video_backends.begin(),
itend = g_available_video_backends.end(); itend = g_available_video_backends.end();
for (; it != itend; ++it) 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); choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this);
szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);

1
Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
View File

@ -13,6 +13,7 @@ class VideoBackend : public VideoBackendHardware
void Shutdown(); void Shutdown();
std::string GetName(); std::string GetName();
std::string GetDisplayName();
void Video_Prepare(); void Video_Prepare();
void Video_Cleanup(); void Video_Cleanup();

5
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -87,6 +87,11 @@ std::string VideoBackend::GetName()
return "Direct3D9"; return "Direct3D9";
} }
std::string VideoBackend::GetDisplayName()
{
return "Direct3D9 (deprecated)";
}
void InitBackendInfo() void InitBackendInfo()
{ {
DX9::D3D::Init(); DX9::D3D::Init();