From f83c2f0b6bd737c41f5ff5966d0b62047ffd8944 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Sun, 13 Dec 2020 14:54:43 +0300
Subject: [PATCH] rsx: Restructure and simplify some header include chains

---
 rpcs3/Emu/RSX/Common/texture_cache.h       |   1 +
 rpcs3/Emu/RSX/Common/texture_cache_types.h | 120 +++++++++++++++++++++
 rpcs3/Emu/RSX/Common/texture_cache_utils.h | 117 +-------------------
 rpcs3/Emu/RSX/GL/GLDraw.cpp                |   1 +
 rpcs3/Emu/RSX/GL/GLGSRender.cpp            |   1 +
 rpcs3/Emu/RSX/GL/GLRenderTargets.cpp       |   1 +
 rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp   |   1 +
 rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp       |   3 +-
 rpcs3/Emu/RSX/RSXThread.cpp                |   1 +
 rpcs3/Emu/RSX/RSXThread.h                  |   3 +-
 rpcs3/Emu/RSX/VK/VKDraw.cpp                |   3 +-
 rpcs3/Emu/RSX/VK/VKGSRender.cpp            |   1 +
 rpcs3/Emu/RSX/VK/VKHelpers.cpp             |   1 +
 rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp   |   2 +
 rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp       |   2 +-
 rpcs3/Emu/RSX/rsx_methods.h                |   3 -
 rpcs3/Emu/System.cpp                       |   1 +
 17 files changed, 138 insertions(+), 124 deletions(-)
 create mode 100644 rpcs3/Emu/RSX/Common/texture_cache_types.h

diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h
index edbceaf8d5..35cffdc658 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "texture_cache_utils.h"
 #include "texture_cache_predictor.h"
 #include "texture_cache_helpers.h"
 
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_types.h b/rpcs3/Emu/RSX/Common/texture_cache_types.h
new file mode 100644
index 0000000000..17452fa874
--- /dev/null
+++ b/rpcs3/Emu/RSX/Common/texture_cache_types.h
@@ -0,0 +1,120 @@
+#pragma once
+
+#include "Emu/system_config.h"
+
+namespace rsx
+{
+	/**
+	 * Helper enums/structs
+	 */
+	enum invalidation_chain_policy
+	{
+		invalidation_chain_none,         // No chaining: Only sections that overlap the faulting page get invalidated.
+		invalidation_chain_full,         // Full chaining: Sections overlapping the faulting page get invalidated, as well as any sections overlapping invalidated sections.
+		invalidation_chain_nearby        // Invalidations chain if they are near to the fault (<X pages away)
+	};
+
+	enum invalidation_chain_direction
+	{
+		chain_direction_both,
+		chain_direction_forward,  // Only higher-base-address sections chain (unless they overlap the fault)
+		chain_direction_backward, // Only lower-base-address pages chain (unless they overlap the fault)
+	};
+
+	enum texture_create_flags
+	{
+		default_component_order = 0,
+		native_component_order = 1,
+		swapped_native_component_order = 2,
+	};
+
+	enum memory_read_flags
+	{
+		flush_always = 0,
+		flush_once = 1
+	};
+
+	struct invalidation_cause
+	{
+		enum enum_type
+		{
+			invalid = 0,
+			read,
+			deferred_read,
+			write,
+			deferred_write,
+			unmap, // fault range is being unmapped
+			reprotect, // we are going to reprotect the fault range
+			superseded_by_fbo, // used by texture_cache::locked_memory_region
+			committed_as_fbo   // same as superseded_by_fbo but without locking or preserving page flags
+		} cause;
+
+		constexpr bool valid() const
+		{
+			return cause != invalid;
+		}
+
+		constexpr bool is_read() const
+		{
+			AUDIT(valid());
+			return (cause == read || cause == deferred_read);
+		}
+
+		constexpr bool deferred_flush() const
+		{
+			AUDIT(valid());
+			return (cause == deferred_read || cause == deferred_write);
+		}
+
+		constexpr bool destroy_fault_range() const
+		{
+			AUDIT(valid());
+			return (cause == unmap);
+		}
+
+		constexpr bool keep_fault_range_protection() const
+		{
+			AUDIT(valid());
+			return (cause == unmap || cause == reprotect || cause == superseded_by_fbo);
+		}
+
+		constexpr bool skip_fbos() const
+		{
+			AUDIT(valid());
+			return (cause == superseded_by_fbo || cause == committed_as_fbo);
+		}
+
+		constexpr bool skip_flush() const
+		{
+			AUDIT(valid());
+			return (cause == unmap) || (!g_cfg.video.strict_texture_flushing && cause == superseded_by_fbo);
+		}
+
+		constexpr invalidation_cause undefer() const
+		{
+			AUDIT(deferred_flush());
+			if (cause == deferred_read)
+				return read;
+			else if (cause == deferred_write)
+				return write;
+			else
+				fmt::throw_exception("Unreachable");
+		}
+
+		constexpr invalidation_cause defer() const
+		{
+			AUDIT(!deferred_flush());
+			if (cause == read)
+				return deferred_read;
+			else if (cause == write)
+				return deferred_write;
+			else
+				fmt::throw_exception("Unreachable");
+		}
+
+		constexpr invalidation_cause() : cause(invalid) {}
+		constexpr invalidation_cause(enum_type _cause) : cause(_cause) {}
+		operator enum_type&() { return cause; }
+		constexpr operator enum_type() const { return cause; }
+	};
+}
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
index ce77b07fde..3b1fc07b7f 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../rsx_cache.h"
+#include "texture_cache_types.h"
 #include "texture_cache_predictor.h"
 #include "TextureUtils.h"
 
@@ -9,122 +10,6 @@
 
 namespace rsx
 {
-	/**
-	 * Helper enums/structs
-	 */
-	enum invalidation_chain_policy
-	{
-		invalidation_chain_none,         // No chaining: Only sections that overlap the faulting page get invalidated.
-		invalidation_chain_full,         // Full chaining: Sections overlapping the faulting page get invalidated, as well as any sections overlapping invalidated sections.
-		invalidation_chain_nearby        // Invalidations chain if they are near to the fault (<X pages away)
-	};
-
-	enum invalidation_chain_direction
-	{
-		chain_direction_both,
-		chain_direction_forward,  // Only higher-base-address sections chain (unless they overlap the fault)
-		chain_direction_backward, // Only lower-base-address pages chain (unless they overlap the fault)
-	};
-
-	enum texture_create_flags
-	{
-		default_component_order = 0,
-		native_component_order = 1,
-		swapped_native_component_order = 2,
-	};
-
-	enum memory_read_flags
-	{
-		flush_always = 0,
-		flush_once = 1
-	};
-
-	struct invalidation_cause
-	{
-		enum enum_type
-		{
-			invalid = 0,
-			read,
-			deferred_read,
-			write,
-			deferred_write,
-			unmap, // fault range is being unmapped
-			reprotect, // we are going to reprotect the fault range
-			superseded_by_fbo, // used by texture_cache::locked_memory_region
-			committed_as_fbo   // same as superseded_by_fbo but without locking or preserving page flags
-		} cause;
-
-		constexpr bool valid() const
-		{
-			return cause != invalid;
-		}
-
-		constexpr bool is_read() const
-		{
-			AUDIT(valid());
-			return (cause == read || cause == deferred_read);
-		}
-
-		constexpr bool deferred_flush() const
-		{
-			AUDIT(valid());
-			return (cause == deferred_read || cause == deferred_write);
-		}
-
-		constexpr bool destroy_fault_range() const
-		{
-			AUDIT(valid());
-			return (cause == unmap);
-		}
-
-		constexpr bool keep_fault_range_protection() const
-		{
-			AUDIT(valid());
-			return (cause == unmap || cause == reprotect || cause == superseded_by_fbo);
-		}
-
-		constexpr bool skip_fbos() const
-		{
-			AUDIT(valid());
-			return (cause == superseded_by_fbo || cause == committed_as_fbo);
-		}
-
-		constexpr bool skip_flush() const
-		{
-			AUDIT(valid());
-			return (cause == unmap) || (!g_cfg.video.strict_texture_flushing && cause == superseded_by_fbo);
-		}
-
-		constexpr invalidation_cause undefer() const
-		{
-			AUDIT(deferred_flush());
-			if (cause == deferred_read)
-				return read;
-			else if (cause == deferred_write)
-				return write;
-			else
-				fmt::throw_exception("Unreachable");
-		}
-
-		constexpr invalidation_cause defer() const
-		{
-			AUDIT(!deferred_flush());
-			if (cause == read)
-				return deferred_read;
-			else if (cause == write)
-				return deferred_write;
-			else
-				fmt::throw_exception("Unreachable");
-		}
-
-		constexpr invalidation_cause() : cause(invalid) {}
-		constexpr invalidation_cause(enum_type _cause) : cause(_cause) {}
-		operator enum_type&() { return cause; }
-		constexpr operator enum_type() const { return cause; }
-	};
-
-
-
 	/**
 	 * List structure used in Ranged Storage Blocks
 	 * List of Arrays
diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp
index 31b237d5f1..1e74ab32fd 100644
--- a/rpcs3/Emu/RSX/GL/GLDraw.cpp
+++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "GLGSRender.h"
+#include "../rsx_methods.h"
 #include "../Common/BufferUtils.h"
 
 namespace gl
diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
index 43d6209ce5..5ccafe5eef 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
@@ -5,6 +5,7 @@
 #include "GLCompute.h"
 #include "GLVertexProgram.h"
 #include "Emu/Memory/vm_locking.h"
+#include "Emu/RSX/rsx_methods.h"
 
 #define DUMP_VERTEX_DATA 0
 
diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
index 813b348d8d..ddaa438219 100644
--- a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
+++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "GLGSRender.h"
+#include "Emu/RSX/rsx_methods.h"
 
 color_format rsx::internals::surface_color_format_to_gl(rsx::surface_color_format color_format)
 {
diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
index a0faa4e203..689824cc49 100644
--- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
+++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
@@ -3,6 +3,7 @@
 #include "GLGSRender.h"
 #include "GLVertexProgram.h"
 #include "GLFragmentProgram.h"
+#include "../rsx_methods.h"
 #include "../Common/ShaderInterpreter.h"
 #include "../Common/GLSLCommon.h"
 
diff --git a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
index c12f7bc6dc..01f8bf9c68 100644
--- a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
+++ b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
-#include "GLGSRender.h"
 #include "../Common/BufferUtils.h"
+#include "../rsx_methods.h"
+#include "GLGSRender.h"
 #include "GLHelpers.h"
 
 namespace
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 25cd3f9ca9..35b0d0c60f 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -17,6 +17,7 @@
 #include "Utilities/StrUtil.h"
 
 #include <cereal/archives/binary.hpp>
+#include <cereal/types/unordered_map.hpp>
 
 #include "util/asm.hpp"
 
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index 6f91648c7b..5b55e1e55f 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -12,9 +12,8 @@
 #include "RSXOffload.h"
 #include "RSXVertexProgram.h"
 #include "RSXFragmentProgram.h"
-#include "rsx_methods.h"
 #include "rsx_utils.h"
-#include "Common/texture_cache_utils.h"
+#include "Common/texture_cache_types.h"
 
 #include "Utilities/Thread.h"
 #include "Utilities/geometry.h"
diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp
index 20a4313cad..3e1d17e320 100644
--- a/rpcs3/Emu/RSX/VK/VKDraw.cpp
+++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
-#include "VKGSRender.h"
 #include "../Common/BufferUtils.h"
+#include "../rsx_methods.h"
+#include "VKGSRender.h"
 
 namespace vk
 {
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index c3fbb97f6e..f4b7a44a35 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -6,6 +6,7 @@
 #include "VKRenderPass.h"
 #include "VKResourceManager.h"
 #include "VKCommandStream.h"
+#include "Emu/RSX/rsx_methods.h"
 #include "Emu/Memory/vm_locking.h"
 
 namespace vk
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
index e1241620e0..2c28cd3099 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
@@ -10,6 +10,7 @@
 #include "VKCommandStream.h"
 #include "VKRenderPass.h"
 
+#include "Emu/RSX/rsx_methods.h"
 #include "Utilities/mutex.h"
 #include "Utilities/lockless.h"
 
diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
index 28c71fcfac..a3c4ca7074 100644
--- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
+++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
@@ -3,8 +3,10 @@
 #include "VKVertexProgram.h"
 #include "VKFragmentProgram.h"
 #include "VKGSRender.h"
+
 #include "../Common/GLSLCommon.h"
 #include "../Common/ShaderInterpreter.h"
+#include "../rsx_methods.h"
 
 namespace vk
 {
diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
index a9c7b0f228..3b1b6ea6fc 100644
--- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "VKGSRender.h"
-#include "../rsx_methods.h"
 #include "../Common/BufferUtils.h"
+#include "../rsx_methods.h"
 
 namespace vk
 {
diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h
index 593485e5dd..c9a54f1f9f 100644
--- a/rpcs3/Emu/RSX/rsx_methods.h
+++ b/rpcs3/Emu/RSX/rsx_methods.h
@@ -13,9 +13,6 @@
 #include "rsx_utils.h"
 #include "Utilities/geometry.h"
 
-#include <cereal/types/array.hpp>
-#include <cereal/types/unordered_map.hpp>
-
 extern u64 get_system_time();
 extern bool is_primitive_disjointed(rsx::primitive_type);
 
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 2fa324bafe..34ebc331c9 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -36,6 +36,7 @@
 #include "util/logs.hpp"
 
 #include "cereal/archives/binary.hpp"
+#include <cereal/types/unordered_map.hpp>
 
 #include <thread>
 #include <typeinfo>