Software: Remove dedicated texture/frame dumping infrastructure

Texture dumping can already be done using VideoCommon's system (and in fact the same setting already enabled *both* of these). Dumping objects/TEV stages/texture fetches doesn't currently have an equivalent, but could be added to the FIFO player instead.

13 files changed, 2 insertions, 407 deletions

diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp
index 4bbcf99413..e5056678bd 100644
--- a/Source/Core/Core/Config/GraphicsSettings.cpp
+++ b/Source/Core/Core/Config/GraphicsSettings.cpp
@@ -96,8 +96,6 @@ const Info<bool> GFX_SW_DUMP_OBJECTS{{System::GFX, "Settings", "SWDumpObjects"},
 const Info<bool> GFX_SW_DUMP_TEV_STAGES{{System::GFX, "Settings", "SWDumpTevStages"}, false};
 const Info<bool> GFX_SW_DUMP_TEV_TEX_FETCHES{{System::GFX, "Settings", "SWDumpTevTexFetches"},
                                              false};
-const Info<int> GFX_SW_DRAW_START{{System::GFX, "Settings", "SWDrawStart"}, 0};
-const Info<int> GFX_SW_DRAW_END{{System::GFX, "Settings", "SWDrawEnd"}, 100000};
 
 const Info<bool> GFX_PREFER_GLES{{System::GFX, "Settings", "PreferGLES"}, false};
 
diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h
index cdac08a77b..398a3dd5a0 100644
--- a/Source/Core/Core/Config/GraphicsSettings.h
+++ b/Source/Core/Core/Config/GraphicsSettings.h
@@ -77,8 +77,6 @@ extern const Info<bool> GFX_SAVE_TEXTURE_CACHE_TO_STATE;
 extern const Info<bool> GFX_SW_DUMP_OBJECTS;
 extern const Info<bool> GFX_SW_DUMP_TEV_STAGES;
 extern const Info<bool> GFX_SW_DUMP_TEV_TEX_FETCHES;
-extern const Info<int> GFX_SW_DRAW_START;
-extern const Info<int> GFX_SW_DRAW_END;
 
 extern const Info<bool> GFX_PREFER_GLES;
 
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 4c08f0a6d8..17a0e4c5f7 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -575,7 +575,6 @@
     <ClInclude Include="VideoBackends\OGL\VideoBackend.h" />
     <ClInclude Include="VideoBackends\Software\Clipper.h" />
     <ClInclude Include="VideoBackends\Software\CopyRegion.h" />
-    <ClInclude Include="VideoBackends\Software\DebugUtil.h" />
     <ClInclude Include="VideoBackends\Software\EfbCopy.h" />
     <ClInclude Include="VideoBackends\Software\EfbInterface.h" />
     <ClInclude Include="VideoBackends\Software\NativeVertexFormat.h" />
@@ -1183,7 +1182,6 @@
     <ClCompile Include="VideoBackends\OGL\ProgramShaderCache.cpp" />
     <ClCompile Include="VideoBackends\OGL\SamplerCache.cpp" />
     <ClCompile Include="VideoBackends\Software\Clipper.cpp" />
-    <ClCompile Include="VideoBackends\Software\DebugUtil.cpp" />
     <ClCompile Include="VideoBackends\Software\EfbCopy.cpp" />
     <ClCompile Include="VideoBackends\Software\EfbInterface.cpp" />
     <ClCompile Include="VideoBackends\Software\Rasterizer.cpp" />
diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
index 432f09ab3b..6500a90027 100644
--- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
@@ -55,57 +55,7 @@ void SoftwareRendererWidget::CreateWidgets()
   for (const auto& backend : VideoBackendBase::GetAvailableBackends())
     m_backend_combo->addItem(tr(backend->GetDisplayName().c_str()));
 
-  auto* overlay_box = new QGroupBox(tr("Overlay Information"));
-  auto* overlay_layout = new QGridLayout();
-  overlay_box->setLayout(overlay_layout);
-  m_show_statistics = new GraphicsBool(tr("Show Statistics"), Config::GFX_OVERLAY_STATS);
-
-  overlay_layout->addWidget(m_show_statistics);
-
-  auto* utility_box = new QGroupBox(tr("Utility"));
-  auto* utility_layout = new QGridLayout();
-  m_dump_textures = new GraphicsBool(tr("Dump Textures"), Config::GFX_DUMP_TEXTURES);
-  m_dump_objects = new GraphicsBool(tr("Dump Objects"), Config::GFX_SW_DUMP_OBJECTS);
-  utility_box->setLayout(utility_layout);
-
-  utility_layout->addWidget(m_dump_textures, 1, 1);
-  utility_layout->addWidget(m_dump_objects, 1, 2);
-
-  auto* debug_box = new QGroupBox(tr("Debug Only"));
-  auto* debug_layout = new QGridLayout();
-  m_dump_tev_stages = new GraphicsBool(tr("Dump TEV Stages"), Config::GFX_SW_DUMP_TEV_STAGES);
-  m_dump_tev_fetches =
-      new GraphicsBool(tr("Dump Texture Fetches"), Config::GFX_SW_DUMP_TEV_TEX_FETCHES);
-
-  debug_layout->addWidget(m_dump_tev_stages, 1, 1);
-  debug_layout->addWidget(m_dump_tev_fetches, 1, 2);
-
-  debug_box->setLayout(debug_layout);
-
-#ifdef _DEBUG
-  utility_layout->addWidget(debug_box, 2, 1, 1, 2);
-#endif
-
-  auto* object_range_box = new QGroupBox(tr("Drawn Object Range"));
-  auto* object_range_layout = new QGridLayout();
-  m_object_range_min = new QSpinBox();
-  m_object_range_max = new QSpinBox();
-
-  for (auto* spin : {m_object_range_min, m_object_range_max})
-  {
-    spin->setMinimum(0);
-    spin->setMaximum(100000);
-  }
-
-  object_range_box->setLayout(object_range_layout);
-
-  object_range_layout->addWidget(m_object_range_min, 1, 1);
-  object_range_layout->addWidget(m_object_range_max, 1, 2);
-
   main_layout->addWidget(rendering_box);
-  main_layout->addWidget(overlay_box);
-  main_layout->addWidget(utility_box);
-  main_layout->addWidget(object_range_box);
   main_layout->addStretch();
 
   setLayout(main_layout);
@@ -115,10 +65,6 @@ void SoftwareRendererWidget::ConnectWidgets()
 {
   connect(m_backend_combo, qOverload<int>(&QComboBox::currentIndexChanged),
           [this](int) { SaveSettings(); });
-  connect(m_object_range_min, qOverload<int>(&QSpinBox::valueChanged),
-          [this](int) { SaveSettings(); });
-  connect(m_object_range_max, qOverload<int>(&QSpinBox::valueChanged),
-          [this](int) { SaveSettings(); });
 }
 
 void SoftwareRendererWidget::LoadSettings()
@@ -131,9 +77,6 @@ void SoftwareRendererWidget::LoadSettings()
           m_backend_combo->findText(tr(backend->GetDisplayName().c_str())));
     }
   }
-
-  m_object_range_min->setValue(Config::Get(Config::GFX_SW_DRAW_START));
-  m_object_range_max->setValue(Config::Get(Config::GFX_SW_DRAW_END));
 }
 
 void SoftwareRendererWidget::SaveSettings()
@@ -148,9 +91,6 @@ void SoftwareRendererWidget::SaveSettings()
       break;
     }
   }
-
-  Config::SetBaseOrCurrent(Config::GFX_SW_DRAW_START, m_object_range_min->value());
-  Config::SetBaseOrCurrent(Config::GFX_SW_DRAW_END, m_object_range_max->value());
 }
 
 void SoftwareRendererWidget::AddDescriptions()
@@ -162,30 +102,9 @@ void SoftwareRendererWidget::AddDescriptions()
       "backend, so for the best emulation experience it's recommended to try both and "
       "choose the one that's less problematic.<br><br><dolphin_emphasis>If unsure, select "
       "OpenGL.</dolphin_emphasis>");
-  static const char TR_SHOW_STATISTICS_DESCRIPTION[] =
-      QT_TR_NOOP("Show various rendering statistics.<br><br><dolphin_emphasis>If unsure, leave "
-                 "this unchecked.</dolphin_emphasis>");
-  static const char TR_DUMP_TEXTURES_DESCRIPTION[] =
-      QT_TR_NOOP("Dump decoded game textures to "
-                 "User/Dump/Textures/&lt;game_id&gt;/.<br><br><dolphin_emphasis>If unsure, leave "
-                 "this unchecked.</dolphin_emphasis>");
-  static const char TR_DUMP_OBJECTS_DESCRIPTION[] =
-      QT_TR_NOOP("Dump objects to User/Dump/Objects/.<br><br><dolphin_emphasis>If unsure, leave "
-                 "this unchecked.</dolphin_emphasis>");
-  static const char TR_DUMP_TEV_STAGES_DESCRIPTION[] =
-      QT_TR_NOOP("Dump TEV Stages to User/Dump/Objects/.<br><br><dolphin_emphasis>If unsure, leave "
-                 "this unchecked.</dolphin_emphasis>");
-  static const char TR_DUMP_TEV_FETCHES_DESCRIPTION[] = QT_TR_NOOP(
-      "Dump Texture Fetches to User/Dump/Objects/.<br><br><dolphin_emphasis>If unsure, leave "
-      "this unchecked.</dolphin_emphasis>");
 
   m_backend_combo->SetTitle(tr("Backend"));
   m_backend_combo->SetDescription(tr(TR_BACKEND_DESCRIPTION));
-  m_show_statistics->SetDescription(tr(TR_SHOW_STATISTICS_DESCRIPTION));
-  m_dump_textures->SetDescription(tr(TR_DUMP_TEXTURES_DESCRIPTION));
-  m_dump_objects->SetDescription(tr(TR_DUMP_OBJECTS_DESCRIPTION));
-  m_dump_tev_stages->SetDescription(tr(TR_DUMP_TEV_STAGES_DESCRIPTION));
-  m_dump_tev_fetches->SetDescription(tr(TR_DUMP_TEV_FETCHES_DESCRIPTION));
 }
 
 void SoftwareRendererWidget::OnEmulationStateChanged(bool running)
diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
index 082002fa60..492a499287 100644
--- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
@@ -30,12 +30,4 @@ private:
   void OnEmulationStateChanged(bool running);
 
   ToolTipComboBox* m_backend_combo;
-  GraphicsBool* m_show_statistics;
-  GraphicsBool* m_dump_textures;
-  GraphicsBool* m_dump_objects;
-  GraphicsBool* m_dump_tev_stages;
-  GraphicsBool* m_dump_tev_fetches;
-
-  QSpinBox* m_object_range_min;
-  QSpinBox* m_object_range_max;
 };
diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt
index 752fac48cc..f71421cb57 100644
--- a/Source/Core/VideoBackends/Software/CMakeLists.txt
+++ b/Source/Core/VideoBackends/Software/CMakeLists.txt
@@ -2,8 +2,6 @@ add_library(videosoftware
   Clipper.cpp
   Clipper.h
   CopyRegion.h
-  DebugUtil.cpp
-  DebugUtil.h
   EfbCopy.cpp
   EfbCopy.h
   EfbInterface.cpp
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp
deleted file mode 100644
index c580461172..0000000000
--- a/Source/Core/VideoBackends/Software/DebugUtil.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2009 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "VideoBackends/Software/DebugUtil.h"
-
-#include <cstring>
-#include <memory>
-
-#include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
-#include "Common/Image.h"
-#include "Common/StringUtil.h"
-#include "Common/Swap.h"
-
-#include "VideoBackends/Software/EfbInterface.h"
-#include "VideoBackends/Software/TextureSampler.h"
-
-#include "VideoCommon/BPMemory.h"
-#include "VideoCommon/Statistics.h"
-#include "VideoCommon/VideoCommon.h"
-#include "VideoCommon/VideoConfig.h"
-
-namespace DebugUtil
-{
-static const int NUM_OBJECT_BUFFERS = 40;
-
-static u32* ObjectBuffer[NUM_OBJECT_BUFFERS];
-static u32 TempBuffer[NUM_OBJECT_BUFFERS];
-
-static bool DrawnToBuffer[NUM_OBJECT_BUFFERS];
-static const char* ObjectBufferName[NUM_OBJECT_BUFFERS];
-static int BufferBase[NUM_OBJECT_BUFFERS];
-
-void Init()
-{
-  for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
-  {
-    ObjectBuffer[i] = new u32[EFB_WIDTH * EFB_HEIGHT]();
-    DrawnToBuffer[i] = false;
-    ObjectBufferName[i] = nullptr;
-    BufferBase[i] = 0;
-  }
-}
-
-void Shutdown()
-{
-  for (auto& slot : ObjectBuffer)
-  {
-    delete[] slot;
-  }
-}
-
-static void SaveTexture(const std::string& filename, u32 texmap, s32 mip)
-{
-  u32 width = bpmem.tex.GetUnit(texmap).texImage0.width + 1;
-  u32 height = bpmem.tex.GetUnit(texmap).texImage0.height + 1;
-
-  auto data = std::make_unique<u8[]>(width * height * 4);
-
-  GetTextureRGBA(data.get(), texmap, mip, width, height);
-  Common::SavePNG(filename, data.get(), Common::ImageByteFormat::RGBA, width, height, width * 4);
-}
-
-void GetTextureRGBA(u8* dst, u32 texmap, s32 mip, u32 width, u32 height)
-{
-  for (u32 y = 0; y < height; y++)
-  {
-    for (u32 x = 0; x < width; x++)
-    {
-      TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, dst);
-      dst += 4;
-    }
-  }
-}
-
-static s32 GetMaxTextureLod(u32 texmap)
-{
-  u8 maxLod = bpmem.tex.GetUnit(texmap).texMode1.max_lod;
-  u8 mip = maxLod >> 4;
-  u8 fract = maxLod & 0xf;
-
-  if (fract)
-    ++mip;
-
-  return (s32)mip;
-}
-
-void DumpActiveTextures()
-{
-  for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-  {
-    u32 texmap = bpmem.tevindref.getTexMap(stageNum);
-
-    s32 maxLod = GetMaxTextureLod(texmap);
-    for (s32 mip = 0; mip <= maxLod; ++mip)
-    {
-      SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png",
-                                   File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
-                                   g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip),
-                  texmap, mip);
-    }
-  }
-
-  for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-  {
-    int stageNum2 = stageNum >> 1;
-    int stageOdd = stageNum & 1;
-    TwoTevStageOrders& order = bpmem.tevorders[stageNum2];
-
-    int texmap = order.getTexMap(stageOdd);
-
-    s32 maxLod = GetMaxTextureLod(texmap);
-    for (s32 mip = 0; mip <= maxLod; ++mip)
-    {
-      SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png",
-                                   File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
-                                   g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip),
-                  texmap, mip);
-    }
-  }
-}
-
-static void DumpEfb(const std::string& filename)
-{
-  auto data = std::make_unique<u8[]>(EFB_WIDTH * EFB_HEIGHT * 4);
-  u8* writePtr = data.get();
-
-  for (u32 y = 0; y < EFB_HEIGHT; y++)
-  {
-    for (u32 x = 0; x < EFB_WIDTH; x++)
-    {
-      // ABGR to RGBA
-      const u32 sample = Common::swap32(EfbInterface::GetColor(x, y));
-
-      std::memcpy(writePtr, &sample, sizeof(u32));
-      writePtr += sizeof(u32);
-    }
-  }
-
-  Common::SavePNG(filename, data.get(), Common::ImageByteFormat::RGBA, EFB_WIDTH, EFB_HEIGHT,
-                  EFB_WIDTH * 4);
-}
-
-void DrawObjectBuffer(s16 x, s16 y, const u8* color, int bufferBase, int subBuffer,
-                      const char* name)
-{
-  int buffer = bufferBase + subBuffer;
-
-  u32 offset = (x + y * EFB_WIDTH) * 4;
-  u8* dst = (u8*)&ObjectBuffer[buffer][offset];
-  *(dst++) = color[2];
-  *(dst++) = color[1];
-  *(dst++) = color[0];
-  *(dst++) = color[3];
-
-  DrawnToBuffer[buffer] = true;
-  ObjectBufferName[buffer] = name;
-  BufferBase[buffer] = bufferBase;
-}
-
-void DrawTempBuffer(const u8* color, int buffer)
-{
-  u8* dst = (u8*)&TempBuffer[buffer];
-  *(dst++) = color[2];
-  *(dst++) = color[1];
-  *(dst++) = color[0];
-  *(dst++) = color[3];
-}
-
-void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* name)
-{
-  int buffer = bufferBase + subBuffer;
-
-  u32 offset = (x + y * EFB_WIDTH);
-  ObjectBuffer[buffer][offset] = TempBuffer[buffer];
-
-  DrawnToBuffer[buffer] = true;
-  ObjectBufferName[buffer] = name;
-  BufferBase[buffer] = bufferBase;
-}
-
-void OnObjectBegin()
-{
-  if (g_ActiveConfig.bDumpTextures &&
-      g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart &&
-      g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd)
-  {
-    DumpActiveTextures();
-  }
-}
-
-void OnObjectEnd()
-{
-  if (g_ActiveConfig.bDumpObjects &&
-      g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart &&
-      g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd)
-  {
-    DumpEfb(StringFromFormat("%sobject%i.png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(),
-                             g_stats.this_frame.num_drawn_objects));
-  }
-
-  for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
-  {
-    if (DrawnToBuffer[i])
-    {
-      DrawnToBuffer[i] = false;
-      std::string filename = StringFromFormat(
-          "%sobject%i_%s(%i).png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(),
-          g_stats.this_frame.num_drawn_objects, ObjectBufferName[i], i - BufferBase[i]);
-
-      Common::SavePNG(filename, reinterpret_cast<u8*>(ObjectBuffer[i]),
-                      Common::ImageByteFormat::RGBA, EFB_WIDTH, EFB_HEIGHT, EFB_WIDTH * 4);
-      memset(ObjectBuffer[i], 0, EFB_WIDTH * EFB_HEIGHT * sizeof(u32));
-    }
-  }
-
-  g_stats.this_frame.num_drawn_objects++;
-}
-}  // namespace DebugUtil
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h
deleted file mode 100644
index 20209577a9..0000000000
--- a/Source/Core/VideoBackends/Software/DebugUtil.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2008 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "Common/CommonTypes.h"
-
-namespace DebugUtil
-{
-void Init();
-void Shutdown();
-
-void GetTextureRGBA(u8* dst, u32 texmap, s32 mip, u32 width, u32 height);
-
-void DumpActiveTextures();
-
-void OnObjectBegin();
-void OnObjectEnd();
-
-void DrawObjectBuffer(s16 x, s16 y, const u8* color, int bufferBase, int subBuffer,
-                      const char* name);
-
-void DrawTempBuffer(const u8* color, int buffer);
-void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* name);
-}  // namespace DebugUtil
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
index 00357b12d7..a38fd163ec 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -10,7 +10,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 
-#include "VideoBackends/Software/DebugUtil.h"
 #include "VideoBackends/Software/NativeVertexFormat.h"
 #include "VideoBackends/Software/Rasterizer.h"
 #include "VideoBackends/Software/SWRenderer.h"
@@ -42,8 +41,6 @@ DataReader SWVertexLoader::PrepareForAdditionalData(OpcodeDecoder::Primitive pri
 
 void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex)
 {
-  DebugUtil::OnObjectBegin();
-
   using OpcodeDecoder::Primitive;
   Primitive primitive_type = Primitive::GX_DRAW_QUADS;
   switch (m_current_primitive_type)
@@ -90,10 +87,10 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_
     // assemble and rasterize the primitive
     m_setup_unit.SetupVertex();
 
-    INCSTAT(g_stats.this_frame.num_vertices_loaded)
+    INCSTAT(g_stats.this_frame.num_vertices_loaded);
   }
 
-  DebugUtil::OnObjectEnd();
+  INCSTAT(g_stats.this_frame.num_drawn_objects);
 }
 
 void SWVertexLoader::SetFormat()
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 5076106089..b6d2005c26 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -14,7 +14,6 @@
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/Software/Clipper.h"
-#include "VideoBackends/Software/DebugUtil.h"
 #include "VideoBackends/Software/EfbInterface.h"
 #include "VideoBackends/Software/Rasterizer.h"
 #include "VideoBackends/Software/SWOGLWindow.h"
@@ -105,7 +104,6 @@ bool VideoSoftware::Initialize(const WindowSystemInfo& wsi)
 
   Clipper::Init();
   Rasterizer::Init();
-  DebugUtil::Init();
 
   g_renderer = std::make_unique<SWRenderer>(std::move(window));
   g_vertex_manager = std::make_unique<SWVertexLoader>();
@@ -135,7 +133,6 @@ void VideoSoftware::Shutdown()
   if (g_renderer)
     g_renderer->Shutdown();
 
-  DebugUtil::Shutdown();
   g_texture_cache.reset();
   g_perf_query.reset();
   g_framebuffer_manager.reset();
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp
index e788d55d92..f2f903ccfc 100644
--- a/Source/Core/VideoBackends/Software/Tev.cpp
+++ b/Source/Core/VideoBackends/Software/Tev.cpp
@@ -9,7 +9,6 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "VideoBackends/Software/DebugUtil.h"
 #include "VideoBackends/Software/EfbInterface.h"
 #include "VideoBackends/Software/SWBoundingBox.h"
 #include "VideoBackends/Software/TextureSampler.h"
@@ -428,16 +427,6 @@ void Tev::Draw()
     TextureSampler::Sample(Uv[texcoordSel].s >> scaleS, Uv[texcoordSel].t >> scaleT,
                            IndirectLod[stageNum], IndirectLinear[stageNum], texmap,
                            IndirectTex[stageNum]);
-
-#if ALLOW_TEV_DUMPS
-    if (g_ActiveConfig.bDumpTevStages)
-    {
-      u8 stage[4] = {IndirectTex[stageNum][TextureSampler::ALP_SMP],
-                     IndirectTex[stageNum][TextureSampler::BLU_SMP],
-                     IndirectTex[stageNum][TextureSampler::GRN_SMP], 255};
-      DebugUtil::DrawTempBuffer(stage, INDIRECT + stageNum);
-    }
-#endif
   }
 
   for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
@@ -478,11 +467,6 @@ void Tev::Draw()
         std::memset(texel, 0, 4);
       }
 
-#if ALLOW_TEV_DUMPS
-      if (g_ActiveConfig.bDumpTevTextureFetches)
-        DebugUtil::DrawTempBuffer(texel, DIRECT_TFETCH + stageNum);
-#endif
-
       const auto& swap = bpmem.tevksel.GetSwapTable(ac.tswap);
       TexColor.r = texel[u32(swap[ColorChannel::Red])];
       TexColor.g = texel[u32(swap[ColorChannel::Green])];
@@ -547,15 +531,6 @@ void Tev::Draw()
       Reg[ac.dest].a = Clamp255(Reg[ac.dest].a);
     else
       Reg[ac.dest].a = Clamp1024(Reg[ac.dest].a);
-
-#if ALLOW_TEV_DUMPS
-    if (g_ActiveConfig.bDumpTevStages)
-    {
-      u8 stage[4] = {(u8)Reg[cc.dest].r, (u8)Reg[cc.dest].g, (u8)Reg[cc.dest].b,
-                     (u8)Reg[ac.dest].a};
-      DebugUtil::DrawTempBuffer(stage, DIRECT + stageNum);
-    }
-#endif
   }
 
   // convert to 8 bits per component
@@ -711,26 +686,6 @@ void Tev::Draw()
   BBoxManager::Update(static_cast<u16>(Position[0] & ~1), static_cast<u16>(Position[0] | 1),
                       static_cast<u16>(Position[1] & ~1), static_cast<u16>(Position[1] | 1));
 
-#if ALLOW_TEV_DUMPS
-  if (g_ActiveConfig.bDumpTevStages)
-  {
-    for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
-      DebugUtil::CopyTempBuffer(Position[0], Position[1], INDIRECT, i, "Indirect");
-    for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
-      DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT, i, "Stage");
-  }
-
-  if (g_ActiveConfig.bDumpTevTextureFetches)
-  {
-    for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
-    {
-      TwoTevStageOrders& order = bpmem.tevorders[i >> 1];
-      if (order.getEnable(i & 1))
-        DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT_TFETCH, i, "TFetch");
-    }
-  }
-#endif
-
   INCSTAT(g_stats.this_frame.tev_pixels_out);
   EfbInterface::IncPerfCounterQuadCount(PQ_BLEND_INPUT);
 
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
index e13e8d96ac..91e0550715 100644
--- a/Source/Core/VideoCommon/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -104,12 +104,6 @@ void VideoConfig::Refresh()
   iShaderCompilerThreads = Config::Get(Config::GFX_SHADER_COMPILER_THREADS);
   iShaderPrecompilerThreads = Config::Get(Config::GFX_SHADER_PRECOMPILER_THREADS);
 
-  bDumpObjects = Config::Get(Config::GFX_SW_DUMP_OBJECTS);
-  bDumpTevStages = Config::Get(Config::GFX_SW_DUMP_TEV_STAGES);
-  bDumpTevTextureFetches = Config::Get(Config::GFX_SW_DUMP_TEV_TEX_FETCHES);
-  drawStart = Config::Get(Config::GFX_SW_DRAW_START);
-  drawEnd = Config::Get(Config::GFX_SW_DRAW_END);
-
   bForceFiltering = Config::Get(Config::GFX_ENHANCE_FORCE_FILTERING);
   iMaxAnisotropy = Config::Get(Config::GFX_ENHANCE_MAX_ANISOTROPY);
   sPostProcessingShader = Config::Get(Config::GFX_ENHANCE_POST_SHADER);
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
index 105840bafa..ff52e96bde 100644
--- a/Source/Core/VideoCommon/VideoConfig.h
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -148,13 +148,6 @@ struct VideoConfig final
   // D3D only config, mostly to be merged into the above
   int iAdapter = 0;
 
-  // VideoSW Debugging
-  int drawStart = 0;
-  int drawEnd = 0;
-  bool bDumpObjects = false;
-  bool bDumpTevStages = false;
-  bool bDumpTevTextureFetches = false;
-
   // Enable API validation layers, currently only supported with Vulkan.
   bool bEnableValidationLayer = false;