diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index cd7e9def60..2455b6a03e 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -92,8 +92,6 @@ add_executable(dolphin-emu Config/Graphics/HacksWidget.h Config/Graphics/PostProcessingConfigWindow.cpp Config/Graphics/PostProcessingConfigWindow.h - Config/Graphics/SoftwareRendererWidget.cpp - Config/Graphics/SoftwareRendererWidget.h Config/GraphicsModListWidget.cpp Config/GraphicsModListWidget.h Config/GraphicsModWarningWidget.cpp diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp index ab649f2a5f..e4e1978c8a 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp @@ -18,7 +18,6 @@ #include "DolphinQt/Config/Graphics/EnhancementsWidget.h" #include "DolphinQt/Config/Graphics/GeneralWidget.h" #include "DolphinQt/Config/Graphics/HacksWidget.h" -#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h" #include "DolphinQt/MainWindow.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h" @@ -51,30 +50,19 @@ void GraphicsWindow::CreateMainLayout() m_enhancements_widget = new EnhancementsWidget(this); m_hacks_widget = new HacksWidget(this); m_advanced_widget = new AdvancedWidget(this); - m_software_renderer = new SoftwareRendererWidget(this); connect(m_general_widget, &GeneralWidget::BackendChanged, this, &GraphicsWindow::OnBackendChanged); - connect(m_software_renderer, &SoftwareRendererWidget::BackendChanged, this, - &GraphicsWindow::OnBackendChanged); m_wrapped_general = GetWrappedWidget(m_general_widget, this, 50, 100); m_wrapped_enhancements = GetWrappedWidget(m_enhancements_widget, this, 50, 100); m_wrapped_hacks = GetWrappedWidget(m_hacks_widget, this, 50, 100); m_wrapped_advanced = GetWrappedWidget(m_advanced_widget, this, 50, 100); - m_wrapped_software = GetWrappedWidget(m_software_renderer, this, 50, 100); - if (Config::Get(Config::MAIN_GFX_BACKEND) != "Software Renderer") - { - m_tab_widget->addTab(m_wrapped_general, tr("General")); - m_tab_widget->addTab(m_wrapped_enhancements, tr("Enhancements")); - m_tab_widget->addTab(m_wrapped_hacks, tr("Hacks")); - m_tab_widget->addTab(m_wrapped_advanced, tr("Advanced")); - } - else - { - m_tab_widget->addTab(m_wrapped_software, tr("Software Renderer")); - } + m_tab_widget->addTab(m_wrapped_general, tr("General")); + m_tab_widget->addTab(m_wrapped_enhancements, tr("Enhancements")); + m_tab_widget->addTab(m_wrapped_hacks, tr("Hacks")); + m_tab_widget->addTab(m_wrapped_advanced, tr("Advanced")); setLayout(main_layout); } @@ -86,20 +74,6 @@ void GraphicsWindow::OnBackendChanged(const QString& backend_name) setWindowTitle( tr("%1 Graphics Configuration").arg(tr(g_video_backend->GetDisplayName().c_str()))); - if (backend_name == QStringLiteral("Software Renderer") && m_tab_widget->count() > 1) - { - m_tab_widget->clear(); - m_tab_widget->addTab(m_wrapped_software, tr("Software Renderer")); - } - - if (backend_name != QStringLiteral("Software Renderer") && m_tab_widget->count() == 1) - { - m_tab_widget->clear(); - m_tab_widget->addTab(m_wrapped_general, tr("General")); - m_tab_widget->addTab(m_wrapped_enhancements, tr("Enhancements")); - m_tab_widget->addTab(m_wrapped_hacks, tr("Hacks")); - m_tab_widget->addTab(m_wrapped_advanced, tr("Advanced")); - } emit BackendChanged(backend_name); } diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp deleted file mode 100644 index 6500a90027..0000000000 --- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h" - -#include -#include -#include -#include -#include -#include - -#include "Core/Config/GraphicsSettings.h" -#include "Core/Config/MainSettings.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" - -#include "DolphinQt/Config/Graphics/GraphicsBool.h" -#include "DolphinQt/Config/Graphics/GraphicsWindow.h" -#include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h" -#include "DolphinQt/Settings.h" - -#include "UICommon/VideoUtils.h" - -#include "VideoCommon/VideoBackendBase.h" -#include "VideoCommon/VideoConfig.h" - -SoftwareRendererWidget::SoftwareRendererWidget(GraphicsWindow* parent) -{ - CreateWidgets(); - LoadSettings(); - ConnectWidgets(); - AddDescriptions(); - emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); - - connect(parent, &GraphicsWindow::BackendChanged, [this] { LoadSettings(); }); - connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) { - OnEmulationStateChanged(state != Core::State::Uninitialized); - }); - OnEmulationStateChanged(Core::GetState() != Core::State::Uninitialized); -} - -void SoftwareRendererWidget::CreateWidgets() -{ - auto* main_layout = new QVBoxLayout; - - auto* rendering_box = new QGroupBox(tr("Rendering")); - auto* rendering_layout = new QGridLayout(); - m_backend_combo = new ToolTipComboBox(); - - rendering_box->setLayout(rendering_layout); - rendering_layout->addWidget(new QLabel(tr("Backend:")), 1, 1); - rendering_layout->addWidget(m_backend_combo, 1, 2); - - for (const auto& backend : VideoBackendBase::GetAvailableBackends()) - m_backend_combo->addItem(tr(backend->GetDisplayName().c_str())); - - main_layout->addWidget(rendering_box); - main_layout->addStretch(); - - setLayout(main_layout); -} - -void SoftwareRendererWidget::ConnectWidgets() -{ - connect(m_backend_combo, qOverload(&QComboBox::currentIndexChanged), - [this](int) { SaveSettings(); }); -} - -void SoftwareRendererWidget::LoadSettings() -{ - for (const auto& backend : VideoBackendBase::GetAvailableBackends()) - { - if (backend->GetName() == Config::Get(Config::MAIN_GFX_BACKEND)) - { - m_backend_combo->setCurrentIndex( - m_backend_combo->findText(tr(backend->GetDisplayName().c_str()))); - } - } -} - -void SoftwareRendererWidget::SaveSettings() -{ - for (const auto& backend : VideoBackendBase::GetAvailableBackends()) - { - if (tr(backend->GetDisplayName().c_str()) == m_backend_combo->currentText()) - { - const auto backend_name = backend->GetName(); - if (backend_name != Config::Get(Config::MAIN_GFX_BACKEND)) - emit BackendChanged(QString::fromStdString(backend_name)); - break; - } - } -} - -void SoftwareRendererWidget::AddDescriptions() -{ - static const char TR_BACKEND_DESCRIPTION[] = QT_TR_NOOP( - "Selects what graphics API to use internally.
The software renderer is extremely " - "slow and only useful for debugging, so you'll want to use either Direct3D or " - "OpenGL. Different games and different GPUs will behave differently on each " - "backend, so for the best emulation experience it's recommended to try both and " - "choose the one that's less problematic.

If unsure, select " - "OpenGL."); - - m_backend_combo->SetTitle(tr("Backend")); - m_backend_combo->SetDescription(tr(TR_BACKEND_DESCRIPTION)); -} - -void SoftwareRendererWidget::OnEmulationStateChanged(bool running) -{ - m_backend_combo->setEnabled(!running); -} diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h deleted file mode 100644 index 492a499287..0000000000 --- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "DolphinQt/Config/Graphics/GraphicsWidget.h" - -class GraphicsBool; -class GraphicsWindow; -class QSpinBox; -class ToolTipComboBox; - -class SoftwareRendererWidget final : public GraphicsWidget -{ - Q_OBJECT -public: - explicit SoftwareRendererWidget(GraphicsWindow* parent); - -signals: - void BackendChanged(const QString& backend); - -private: - void LoadSettings() override; - void SaveSettings() override; - - void CreateWidgets(); - void ConnectWidgets(); - void AddDescriptions(); - - void OnEmulationStateChanged(bool running); - - ToolTipComboBox* m_backend_combo; -}; diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index fce9c11813..3c37f4ca1e 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -79,7 +79,6 @@ - @@ -276,7 +275,6 @@ -