piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9179 from leoetlino/available-video-backends

Browse Source 
VideoCommon: Get rid of the global g_available_video_backends
This commit is contained in:
JosJuice
2020-10-23 20:02:21 +02:00
committed by GitHub
parent 4f5c8bb42a d08b80828d
commit 908d6f8fa0
5 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
View File

@ -64,9 +64,11 @@ void GeneralWidget::CreateWidgets()
m_video_box->setLayout(m_video_layout);
for (auto& backend : g_available_video_backends)
for (auto& backend : VideoBackendBase::GetAvailableBackends())
{
m_backend_combo->addItem(tr(backend->GetDisplayName().c_str()),
QVariant(QString::fromStdString(backend->GetName())));
}
m_video_layout->addWidget(new QLabel(tr("Backend:")), 0, 0);
m_video_layout->addWidget(m_backend_combo, 0, 1);
@ -159,8 +161,8 @@ void GeneralWidget::SaveSettings()
const auto current_backend = m_backend_combo->currentData().toString().toStdString();
if (Config::Get(Config::MAIN_GFX_BACKEND) != current_backend)
{
auto warningMessage =
g_available_video_backends[m_backend_combo->currentIndex()]->GetWarningMessage();
auto warningMessage = VideoBackendBase::GetAvailableBackends()[m_backend_combo->currentIndex()]
->GetWarningMessage();
if (warningMessage)
{
ModalMessageBox confirm_sw(this);

6
Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
View File

@ -51,7 +51,7 @@ void SoftwareRendererWidget::CreateWidgets()
rendering_layout->addWidget(new QLabel(tr("Backend:")), 1, 1);
rendering_layout->addWidget(m_backend_combo, 1, 2);
for (const auto& backend : g_available_video_backends)
for (const auto& backend : VideoBackendBase::GetAvailableBackends())
m_backend_combo->addItem(tr(backend->GetDisplayName().c_str()));
auto* overlay_box = new QGroupBox(tr("Overlay Information"));
@ -122,7 +122,7 @@ void SoftwareRendererWidget::ConnectWidgets()
void SoftwareRendererWidget::LoadSettings()
{
for (const auto& backend : g_available_video_backends)
for (const auto& backend : VideoBackendBase::GetAvailableBackends())
{
if (backend->GetName() == Config::Get(Config::MAIN_GFX_BACKEND))
{
@ -137,7 +137,7 @@ void SoftwareRendererWidget::LoadSettings()
void SoftwareRendererWidget::SaveSettings()
{
for (const auto& backend : g_available_video_backends)
for (const auto& backend : VideoBackendBase::GetAvailableBackends())
{
if (tr(backend->GetDisplayName().c_str()) == m_backend_combo->currentText())
{