From 8f5b196019f60393ea21990e311c744c20aa840e Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Sat, 28 Jan 2023 15:13:49 +1300
Subject: [PATCH] Minimise include polution from RenderState

---
 Source/Core/VideoCommon/RenderBase.cpp  |  4 +++-
 Source/Core/VideoCommon/RenderBase.h    |  2 +-
 Source/Core/VideoCommon/RenderState.cpp |  1 +
 Source/Core/VideoCommon/RenderState.h   | 14 ++++++++++++--
 Source/Core/VideoCommon/VideoState.cpp  |  1 +
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index ec5f25267f..159dd6baaf 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -60,7 +60,9 @@
 
 std::unique_ptr<Renderer> g_renderer;
 
-Renderer::Renderer() : m_last_xfb_width{MAX_XFB_WIDTH}, m_last_xfb_height{MAX_XFB_HEIGHT}
+Renderer::Renderer()
+    : m_prev_efb_format{PixelFormat::INVALID_FMT},
+       m_last_xfb_width{MAX_XFB_WIDTH}, m_last_xfb_height{MAX_XFB_HEIGHT}
 {
   UpdateActiveConfig();
   FreeLook::UpdateActiveConfig();
diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h
index 7bd18e16e7..6a9d86387c 100644
--- a/Source/Core/VideoCommon/RenderBase.h
+++ b/Source/Core/VideoCommon/RenderBase.h
@@ -143,7 +143,7 @@ protected:
   int m_frame_count = 0;
 
 private:
-  PixelFormat m_prev_efb_format = PixelFormat::INVALID_FMT;
+  PixelFormat m_prev_efb_format;
   unsigned int m_efb_scale = 1;
 
   u64 m_last_xfb_ticks = 0;
diff --git a/Source/Core/VideoCommon/RenderState.cpp b/Source/Core/VideoCommon/RenderState.cpp
index 85e9adee15..2f9ac39c5e 100644
--- a/Source/Core/VideoCommon/RenderState.cpp
+++ b/Source/Core/VideoCommon/RenderState.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 
+#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/TextureConfig.h"
 
 void RasterizationState::Generate(const BPMemory& bp, PrimitiveType primitive_type)
diff --git a/Source/Core/VideoCommon/RenderState.h b/Source/Core/VideoCommon/RenderState.h
index 49590d55b5..b38e9522bb 100644
--- a/Source/Core/VideoCommon/RenderState.h
+++ b/Source/Core/VideoCommon/RenderState.h
@@ -4,12 +4,22 @@
 #pragma once
 
 #include "Common/BitField.h"
+#include "Common/CommonTypes.h"
 
-#include "VideoCommon/BPMemory.h"
-#include "VideoCommon/BPStructs.h"
+struct BPMemory;
 
 enum class AbstractTextureFormat : u32;
 
+enum class CompareMode : u32;
+enum class CullMode : u32;
+enum class DstBlendFactor : u32;
+enum class FilterMode : u32;
+enum class LODType : u32;
+enum class LogicOp : u32;
+enum class PixelFormat : u32;
+enum class SrcBlendFactor : u32;
+enum class WrapMode : u32;
+
 enum class PrimitiveType : u32
 {
   Points,
diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp
index 34b4d6332d..75e9e4d3bc 100644
--- a/Source/Core/VideoCommon/VideoState.cpp
+++ b/Source/Core/VideoCommon/VideoState.cpp
@@ -8,6 +8,7 @@
 #include "Common/ChunkFile.h"
 #include "Core/System.h"
 #include "VideoCommon/BPMemory.h"
+#include "VideoCommon/BPStructs.h"
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/CommandProcessor.h"
 #include "VideoCommon/Fifo.h"