GS: Slim down GSState.h includes

pcsx2/GS/GS.cpp

@@ -19,15 +19,16 @@
 #include "Counters.h"
 #include "ImGui/FullscreenUI.h"
 #include "ImGui/ImGuiManager.h"
-#include "GS.h"
-#include "GSCapture.h"
-#include "GSExtra.h"
-#include "GSGL.h"
-#include "GSLzma.h"
-#include "GSUtil.h"
+#include "GS/GS.h"
+#include "GS/GSCapture.h"
+#include "GS/GSExtra.h"
+#include "GS/GSGL.h"
+#include "GS/GSLzma.h"
+#include "GS/GSPerfMon.h"
+#include "GS/GSUtil.h"
+#include "GS/MultiISA.h"
 #include "Host.h"
 #include "Input/InputManager.h"
-#include "MultiISA.h"
 #include "MTGS.h"
 #include "pcsx2/GS.h"
 #include "GS/Renderers/Null/GSRendererNull.h"

pcsx2/GS/GSClut.cpp

@@ -18,6 +18,7 @@
 #include "GS/GSExtra.h"
 #include "GS/GSLocalMemory.h"
 #include "GS/GSGL.h"
+#include "GS/GSUtil.h"
 #include "GS/Renderers/Common/GSDevice.h"
 #include "GS/Renderers/Common/GSRenderer.h"
 #include "common/AlignedMalloc.h"

pcsx2/GS/GSState.cpp

@@ -14,16 +14,18 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "GSState.h"
-#include "GSGL.h"
-#include "GSUtil.h"
+#include "GS/GSState.h"
+#include "GS/GSDump.h"
+#include "GS/GSGL.h"
+#include "GS/GSPerfMon.h"
+#include "GS/GSUtil.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"
 
-#include <algorithm> // clamp
-#include <cfloat> // FLT_MAX
+#include <algorithm>
+#include <cfloat>
 #include <fstream>
-#include <iomanip> // Dump Verticles
+#include <iomanip>
 
 int GSState::s_n = 0;
 int GSState::s_last_transfer_draw_n = 0;

pcsx2/GS/GSState.h

@@ -15,19 +15,18 @@
 
 #pragma once
 
-#include "GS.h"
-#include "GSLocalMemory.h"
-#include "GSDrawingContext.h"
-#include "GSDrawingEnvironment.h"
-#include "Renderers/Common/GSVertex.h"
-#include "Renderers/Common/GSVertexTrace.h"
-#include "GSUtil.h"
-#include "GSPerfMon.h"
-#include "GSVector.h"
-#include "Renderers/Common/GSDevice.h"
+#include "GS/GS.h"
+#include "GS/GSLocalMemory.h"
+#include "GS/GSDrawingContext.h"
+#include "GS/GSDrawingEnvironment.h"
+#include "GS/Renderers/Common/GSVertex.h"
+#include "GS/Renderers/Common/GSVertexTrace.h"
+#include "GS/Renderers/Common/GSDevice.h"
+#include "GS/GSVector.h"
 #include "GSCrc.h"
 #include "GSAlignedClass.h"
-#include "GSDump.h"
+
+class GSDumpBase;
 
 class GSState : public GSAlignedClass<32>
 {

pcsx2/GS/Renderers/Common/GSRenderer.cpp

@@ -19,7 +19,10 @@
 #include "ImGui/ImGuiManager.h"
 #include "GS/Renderers/Common/GSRenderer.h"
 #include "GS/GSCapture.h"
+#include "GS/GSDump.h"
 #include "GS/GSGL.h"
+#include "GS/GSPerfMon.h"
+#include "GS/GSUtil.h"
 #include "GSDumpReplayer.h"
 #include "Host.h"
 #include "PerformanceMetrics.h"

pcsx2/GS/Renderers/HW/GSHwHack.cpp

@@ -17,6 +17,7 @@
 #include "GS/Renderers/HW/GSRendererHW.h"
 #include "GS/Renderers/HW/GSHwHack.h"
 #include "GS/GSGL.h"
+#include "GS/GSUtil.h"
 
 static bool s_nativeres;
 

pcsx2/GS/Renderers/HW/GSRendererHW.cpp

@@ -14,9 +14,11 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "GSRendererHW.h"
-#include "GSTextureReplacements.h"
+#include "GS/Renderers/HW/GSRendererHW.h"
+#include "GS/Renderers/HW/GSTextureReplacements.h"
 #include "GS/GSGL.h"
+#include "GS/GSPerfMon.h"
+#include "GS/GSUtil.h"
 #include "Host.h"
 #include "common/Align.h"
 #include "common/StringUtil.h"

pcsx2/GS/Renderers/HW/GSTextureCache.cpp

@@ -20,6 +20,7 @@
 #include "GS/GSState.h"
 #include "GS/GSGL.h"
 #include "GS/GSIntrin.h"
+#include "GS/GSPerfMon.h"
 #include "GS/GSUtil.h"
 #include "GS/GSXXH.h"
 #include "common/Align.h"

pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp

@@ -20,6 +20,7 @@
 #include "GS/Renderers/OpenGL/GLState.h"
 #include "GS/GSState.h"
 #include "GS/GSGL.h"
+#include "GS/GSPerfMon.h"
 #include "GS/GSUtil.h"
 #include "Host.h"
 

pcsx2/GS/Renderers/SW/GSTextureCacheSW.cpp

@@ -16,6 +16,8 @@
 #include "PrecompiledHeader.h"
 #include "GS/Renderers/SW/GSTextureCacheSW.h"
 #include "GS/GSExtra.h"
+#include "GS/GSPerfMon.h"
+#include "GS/GSUtil.h"
 
 GSTextureCacheSW::GSTextureCacheSW() = default;