mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-02 00:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoBackendBase: Store video backends as unique_ptr

Browse source
This commit is contained in:
Lioncash 2016-02-15 21:29:24 -05:00
parent 3b23eb24c4
commit 1d6ee140f0
6 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Source/Core/VideoCommon/VideoBackendBase.cpp
View file

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@ -15,7 +17,7 @@
#include "VideoCommon/VideoBackendBase.h"
std::vector<VideoBackendBase*> g_available_video_backends;
std::vector<std::unique_ptr<VideoBackendBase>> g_available_video_backends;
VideoBackendBase* g_video_backend = nullptr;
static VideoBackendBase* s_default_backend = nullptr;
@ -32,48 +34,49 @@ __declspec(dllexport) DWORD NvOptimusEnablement = 1;
void VideoBackendBase::PopulateList()
{
VideoBackendBase* backends[4] = { nullptr };
// OGL > D3D11 > D3D12 > SW
g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend);
g_available_video_backends.push_back(std::make_unique<OGL::VideoBackend>());
#ifdef _WIN32
g_available_video_backends.push_back(backends[1] = new DX11::VideoBackend);
g_available_video_backends.push_back(std::make_unique<DX11::VideoBackend>());
// More robust way to check for D3D12 support than (unreliable) OS version checks.
HMODULE d3d12_module = LoadLibraryA("d3d12.dll");
if (d3d12_module != NULL)
if (d3d12_module != nullptr)
{
FreeLibrary(d3d12_module);
g_available_video_backends.push_back(backends[2] = new DX12::VideoBackend);
g_available_video_backends.push_back(std::make_unique<DX12::VideoBackend>());
}
#endif
g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
g_available_video_backends.push_back(std::make_unique<SW::VideoSoftware>());
for (VideoBackendBase* backend : backends)
{
if (backend)
{
s_default_backend = g_video_backend = backend;
break;
}
}
const auto iter = std::find_if(g_available_video_backends.begin(), g_available_video_backends.end(), [](const auto& backend) {
return backend != nullptr;
});
if (iter == g_available_video_backends.end())
return;
s_default_backend = iter->get();
g_video_backend = iter->get();
}
void VideoBackendBase::ClearList()
{
while (!g_available_video_backends.empty())
{
delete g_available_video_backends.back();
g_available_video_backends.pop_back();
}
g_available_video_backends.clear();
}
void VideoBackendBase::ActivateBackend(const std::string& name)
{
if (name.length() == 0) // If nullptr, set it to the default backend (expected behavior)
// If empty, set it to the default backend (expected behavior)
if (name.empty())
g_video_backend = s_default_backend;
for (VideoBackendBase* backend : g_available_video_backends)
if (name == backend->GetName())
g_video_backend = backend;
const auto iter = std::find_if(g_available_video_backends.begin(), g_available_video_backends.end(), [&name](const auto& backend) {
return name == backend->GetName();
});
if (iter == g_available_video_backends.end())
return;
g_video_backend = iter->get();
}