From a2d6bab0d275a55ef02994e273fdb208343490ae Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Thu, 15 Mar 2018 20:31:13 +0100
Subject: [PATCH] Properties/GameConfig: Remove "Skip DCBZ"

---
 .../DolphinQt2/Config/GameConfigWidget.cpp    | 23 ++++++++-----------
 .../Core/DolphinQt2/Config/GameConfigWidget.h |  1 -
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp b/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
index ca0a64f068..6a1155dda7 100644
--- a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
@@ -61,7 +61,6 @@ void GameConfigWidget::CreateWidgets()
 
   m_enable_dual_core = new QCheckBox(tr("Enable Dual Core"));
   m_enable_mmu = new QCheckBox(tr("Enable MMU"));
-  m_skip_dcbz = new QCheckBox(tr("Skip DCBZ clearing"));
   m_enable_fprf = new QCheckBox(tr("Enable FPRF"));
   m_sync_gpu = new QCheckBox(tr("Synchronize GPU thread"));
   m_enable_fast_disc = new QCheckBox(tr("Speed up Disc Transfer Rate"));
@@ -73,8 +72,7 @@ void GameConfigWidget::CreateWidgets()
 
   m_enable_mmu->setToolTip(tr(
       "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
-  m_skip_dcbz->setToolTip(tr("Bypass the clearing of the data cache by the DCBZ instruction. "
-                             "Usually leave this option disabled."));
+
   m_enable_fprf->setToolTip(tr("Enables Floating Point Result Flag calculation, needed for a few "
                                "games. (ON = Compatible, OFF = Fast)"));
   m_sync_gpu->setToolTip(tr("Synchronizes the GPU and CPU threads to help prevent random freezes "
@@ -84,13 +82,12 @@ void GameConfigWidget::CreateWidgets()
 
   core_layout->addWidget(m_enable_dual_core, 0, 0);
   core_layout->addWidget(m_enable_mmu, 1, 0);
-  core_layout->addWidget(m_skip_dcbz, 2, 0);
-  core_layout->addWidget(m_enable_fprf, 3, 0);
-  core_layout->addWidget(m_sync_gpu, 4, 0);
-  core_layout->addWidget(m_enable_fast_disc, 5, 0);
-  core_layout->addWidget(m_use_dsp_hle, 6, 0);
-  core_layout->addWidget(new QLabel(tr("Deterministic dual core:")), 7, 0);
-  core_layout->addWidget(m_deterministic_dual_core, 7, 1);
+  core_layout->addWidget(m_enable_fprf, 2, 0);
+  core_layout->addWidget(m_sync_gpu, 3, 0);
+  core_layout->addWidget(m_enable_fast_disc, 4, 0);
+  core_layout->addWidget(m_use_dsp_hle, 5, 0);
+  core_layout->addWidget(new QLabel(tr("Deterministic dual core:")), 6, 0);
+  core_layout->addWidget(m_deterministic_dual_core, 6, 1);
 
   // Stereoscopy
   auto* stereoscopy_box = new QGroupBox(tr("Stereoscopy"));
@@ -156,7 +153,7 @@ void GameConfigWidget::CreateWidgets()
   button_layout->addWidget(m_edit_user_config);
   button_layout->addWidget(m_view_default_config);
 
-  for (QCheckBox* item : {m_enable_dual_core, m_enable_mmu, m_skip_dcbz, m_enable_fprf, m_sync_gpu,
+  for (QCheckBox* item : {m_enable_dual_core, m_enable_mmu, m_enable_fprf, m_sync_gpu,
                           m_enable_fast_disc, m_use_dsp_hle, m_use_monoscopic_shadows})
     item->setTristate(true);
 
@@ -178,7 +175,7 @@ void GameConfigWidget::ConnectWidgets()
           this, &GameConfigWidget::SaveSettings);
   connect(m_state_comment_edit, &QLineEdit::editingFinished, this, &GameConfigWidget::SaveSettings);
 
-  for (QCheckBox* box : {m_enable_dual_core, m_enable_mmu, m_skip_dcbz, m_enable_fprf, m_sync_gpu,
+  for (QCheckBox* box : {m_enable_dual_core, m_enable_mmu, m_enable_fprf, m_sync_gpu,
                          m_enable_fast_disc, m_use_dsp_hle, m_use_monoscopic_shadows})
     connect(box, &QCheckBox::toggled, this, &GameConfigWidget::SaveSettings);
 
@@ -249,7 +246,6 @@ void GameConfigWidget::LoadSettings()
   // Core
   LoadCheckBox(m_enable_dual_core, "Core", "CPUThread");
   LoadCheckBox(m_enable_mmu, "Core", "MMU");
-  LoadCheckBox(m_skip_dcbz, "Core", "DCBZ");
   LoadCheckBox(m_enable_fprf, "Core", "FPRF");
   LoadCheckBox(m_sync_gpu, "Core", "SyncGPU");
   LoadCheckBox(m_enable_fast_disc, "Core", "FastDiscSpeed");
@@ -312,7 +308,6 @@ void GameConfigWidget::SaveSettings()
   // Core
   SaveCheckBox(m_enable_dual_core, "Core", "CPUThread");
   SaveCheckBox(m_enable_mmu, "Core", "MMU");
-  SaveCheckBox(m_skip_dcbz, "Core", "DCBZ");
   SaveCheckBox(m_enable_fprf, "Core", "FPRF");
   SaveCheckBox(m_sync_gpu, "Core", "SyncGPU");
   SaveCheckBox(m_enable_fast_disc, "Core", "FastDiscSpeed");
diff --git a/Source/Core/DolphinQt2/Config/GameConfigWidget.h b/Source/Core/DolphinQt2/Config/GameConfigWidget.h
index d33c15122e..deb5118d36 100644
--- a/Source/Core/DolphinQt2/Config/GameConfigWidget.h
+++ b/Source/Core/DolphinQt2/Config/GameConfigWidget.h
@@ -52,7 +52,6 @@ private:
   // Core
   QCheckBox* m_enable_dual_core;
   QCheckBox* m_enable_mmu;
-  QCheckBox* m_skip_dcbz;
   QCheckBox* m_enable_fprf;
   QCheckBox* m_sync_gpu;
   QCheckBox* m_enable_fast_disc;