Merge pull request #3585 from lioncash/inc

VideoCommon: Convert some DataReader includes into forward declarations

Source/Core/VideoBackends/Software/SWVertexLoader.cpp

@@ -16,6 +16,7 @@
 #include "VideoBackends/Software/Tev.h"
 #include "VideoBackends/Software/TransformUnit.h"
 
+#include "VideoCommon/DataReader.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/PixelShaderManager.h"

Source/Core/VideoCommon/OpcodeDecoding.h

@@ -5,7 +5,8 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/DataReader.h"
+
+class DataReader;
 
 #define GX_NOP                      0x00
 #define GX_UNKNOWN_RESET            0x01

Source/Core/VideoCommon/VertexLoader.h

@@ -10,9 +10,9 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/DataReader.h"
 #include "VideoCommon/VertexLoaderBase.h"
 
+class DataReader;
 class VertexLoader;
 typedef void (*TPipelineFunction)(VertexLoader* loader);
 

Source/Core/VideoCommon/VertexLoaderARM64.h

@@ -6,9 +6,10 @@
 
 #include "Common/Arm64Emitter.h"
 #include "Common/CommonTypes.h"
-#include "VideoCommon/DataReader.h"
 #include "VideoCommon/VertexLoaderBase.h"
 
+class DataReader;
+
 class VertexLoaderARM64 : public VertexLoaderBase, public Arm64Gen::ARM64CodeBlock
 {
 public:

Source/Core/VideoCommon/VertexLoaderBase.cpp

@@ -13,6 +13,7 @@
 #include "Common/StringUtil.h"
 #include "Common/Logging/Log.h"
 
+#include "VideoCommon/DataReader.h"
 #include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexLoaderBase.h"
 

Source/Core/VideoCommon/VertexLoaderBase.h

@@ -9,11 +9,11 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-
 #include "VideoCommon/CPMemory.h"
-#include "VideoCommon/DataReader.h"
 #include "VideoCommon/NativeVertexFormat.h"
 
+class DataReader;
+
 class VertexLoaderUID
 {
 	std::array<u32, 5> vid;

Source/Core/VideoCommon/VertexLoaderManager.cpp

@@ -16,6 +16,7 @@
 #include "Core/HW/Memmap.h"
 
 #include "VideoCommon/BPMemory.h"
+#include "VideoCommon/DataReader.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/Statistics.h"

Source/Core/VideoCommon/VertexLoaderManager.h

@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/DataReader.h"
 
+class DataReader;
 class NativeVertexFormat;
 
 namespace VertexLoaderManager

Source/Core/VideoCommon/VertexLoader_TextCoord.cpp

@@ -6,6 +6,7 @@
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
+#include "VideoCommon/DataReader.h"
 #include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexLoader_TextCoord.h"
 #include "VideoCommon/VertexLoaderManager.h"

Source/Core/VideoCommon/VertexManagerBase.h

@@ -9,8 +9,8 @@
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "VideoCommon/DataReader.h"
 
+class DataReader;
 class NativeVertexFormat;
 class PointerWrap;
 struct PortableVertexDeclaration;

Source/Core/VideoCommon/XFMemory.h

@@ -6,7 +6,8 @@
 
 #include "Common/CommonTypes.h"
 #include "VideoCommon/CPMemory.h"
-#include "VideoCommon/DataReader.h"
+
+class DataReader;
 
 // Lighting