From 1df1ba55bbdc0287a1d43a41fab1d9b6b9833ec0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 31 Jan 2016 14:51:55 -0500 Subject: [PATCH] VideoCommon: Convert some DataReader includes into forward declarations Gets rid of some indirect inclusions in cpp files. Also this will reduce the amount of rebuilt files if changes occur in the DataReader header. --- Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 1 + Source/Core/VideoCommon/OpcodeDecoding.h | 3 ++- Source/Core/VideoCommon/VertexLoader.h | 2 +- Source/Core/VideoCommon/VertexLoaderARM64.h | 3 ++- Source/Core/VideoCommon/VertexLoaderBase.cpp | 1 + Source/Core/VideoCommon/VertexLoaderBase.h | 4 ++-- Source/Core/VideoCommon/VertexLoaderManager.cpp | 1 + Source/Core/VideoCommon/VertexLoaderManager.h | 2 +- Source/Core/VideoCommon/VertexLoader_TextCoord.cpp | 1 + Source/Core/VideoCommon/VertexManagerBase.h | 2 +- Source/Core/VideoCommon/XFMemory.h | 3 ++- 11 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index 506a7b1da3..4c70342faa 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h index f955ecb90a..0cebc13cf9 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.h +++ b/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 diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index af5d2db21a..5cbc4071b0 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -10,9 +10,9 @@ #include #include "Common/CommonTypes.h" -#include "VideoCommon/DataReader.h" #include "VideoCommon/VertexLoaderBase.h" +class DataReader; class VertexLoader; typedef void (*TPipelineFunction)(VertexLoader* loader); diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.h b/Source/Core/VideoCommon/VertexLoaderARM64.h index 3630f2cd8e..9adff8372f 100644 --- a/Source/Core/VideoCommon/VertexLoaderARM64.h +++ b/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: diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index ef7a409eea..e6bc8d1b4d 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h index e7b7357e7b..b0a3cb3794 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.h +++ b/Source/Core/VideoCommon/VertexLoaderBase.h @@ -9,11 +9,11 @@ #include #include "Common/CommonTypes.h" - #include "VideoCommon/CPMemory.h" -#include "VideoCommon/DataReader.h" #include "VideoCommon/NativeVertexFormat.h" +class DataReader; + class VertexLoaderUID { std::array vid; diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 79275bc21a..5de1eb63b7 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index 6341872de9..4bb180cf88 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -7,8 +7,8 @@ #include #include "Common/CommonTypes.h" -#include "VideoCommon/DataReader.h" +class DataReader; class NativeVertexFormat; namespace VertexLoaderManager diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp index 3318a808cc..6b7de6a38c 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index 0dbcc26d2d..593732eab0 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/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; diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h index e9425a734e..006383df89 100644 --- a/Source/Core/VideoCommon/XFMemory.h +++ b/Source/Core/VideoCommon/XFMemory.h @@ -6,7 +6,8 @@ #include "Common/CommonTypes.h" #include "VideoCommon/CPMemory.h" -#include "VideoCommon/DataReader.h" + +class DataReader; // Lighting