From aaaa3896c09369ee0610992f14ab5a845e040315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 21 Oct 2020 21:34:38 +0200 Subject: VideoCommon: Get rid of the global g_available_video_backends Replace it with a function-local static that is initialized on first use. This gets rid of a global variable and removes the need for manual initialization in UICommon. This commit also replaces the weird find_if that looks for a non-null unique_ptr with a simple "is vector empty" check considering that none of the pointers can be null by construction. --- Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index eeefbf7ddb..0ccb43a4f1 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -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); -- cgit v1.2.3