Merge pull request #14587 from SuperSamus/arbitrary-mipmap-gpu-decoding-checkbox-fix

VideoCommon: Fixup #14336

Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp

@@ -162,8 +162,6 @@ void EnhancementsWidget::CreateWidgets()
   m_arbitrary_mipmap_detection =
       new ConfigBool(tr("Arbitrary Mipmap Detection"),
                      Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION, m_game_layer);
-  m_arbitrary_mipmap_detection->setEnabled(
-      !Get(m_game_layer, Config::GFX_ENABLE_GPU_TEXTURE_DECODING));
   m_hdr = new ConfigBool(tr("HDR Post-Processing"), Config::GFX_ENHANCE_HDR_OUTPUT, m_game_layer);
 
   int row = 0;

Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp

@@ -27,10 +27,8 @@ HacksWidget::HacksWidget(GraphicsPane* gfx_pane) : m_game_layer{gfx_pane->GetCon
 
   connect(gfx_pane, &GraphicsPane::BackendChanged, this, &HacksWidget::OnBackendChanged);
   OnBackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND)));
-  connect(gfx_pane, &GraphicsPane::UpdateGPUTextureDecoding, this, [this] {
+  connect(gfx_pane, &GraphicsPane::UpdateGPUTextureDecoding, this,
-    m_gpu_texture_decoding->setEnabled(
+          &HacksWidget::UpdateGPUTextureDecodingEnabled);
-        !Get(m_game_layer, Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION));
-  });
 }
 
 void HacksWidget::CreateWidgets()
@@ -130,7 +128,7 @@ void HacksWidget::OnBackendChanged(const QString& backend_name)
   const bool bbox = g_backend_info.bSupportsBBox;
   const bool gpu_texture_decoding = g_backend_info.bSupportsGPUTextureDecoding;
 
-  m_gpu_texture_decoding->setEnabled(gpu_texture_decoding);
+  UpdateGPUTextureDecodingEnabled();
   m_disable_bounding_box->setEnabled(bbox);
 
   const QString tooltip = tr("%1 doesn't support this feature on your system.")
@@ -263,6 +261,13 @@ void HacksWidget::AddDescriptions()
   m_vi_skip->SetDescription(tr(TR_VI_SKIP_DESCRIPTION));
 }
 
+void HacksWidget::UpdateGPUTextureDecodingEnabled()
+{
+  const bool gpu_texture_decoding = g_backend_info.bSupportsGPUTextureDecoding;
+  m_gpu_texture_decoding->setEnabled(
+      gpu_texture_decoding && !Get(m_game_layer, Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION));
+}
+
 void HacksWidget::UpdateDeferEFBCopiesEnabled()
 {
   // We disable the checkbox for defer EFB copies when both EFB and XFB copies to texture are

Source/Core/DolphinQt/Config/Graphics/HacksWidget.h

@@ -53,6 +53,7 @@ private:
   void ConnectWidgets();
   void AddDescriptions();
 
+  void UpdateGPUTextureDecodingEnabled();
   void UpdateDeferEFBCopiesEnabled();
   void UpdateSkipPresentingDuplicateFramesEnabled();
 };