Merge pull request #11100 from Pokechu22/software-settings-merge

Use the same settings for the software renderer as other backends

1 files changed, 5 insertions, 31 deletions

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);
 }