From 06ccfef1c186a36baf48897994e10d8c941ed512 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 1 Jul 2016 04:08:04 -0400 Subject: [PATCH] FifoPlayer: Get rid of unnecessary includes --- Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 4 ++-- Source/Core/Core/FifoPlayer/FifoAnalyzer.h | 1 - Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp | 5 +---- Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h | 1 - Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 5 +++-- Source/Core/Core/FifoPlayer/FifoPlayer.h | 1 + Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp | 7 ++----- Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h | 4 ---- Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 6 ++++-- Source/Core/Core/FifoPlayer/FifoRecorder.h | 1 - 10 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index c5d91cca2c..3cbd0623b1 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -5,11 +5,11 @@ #include #include +#include "Core/FifoPlayer/FifoAnalyzer.h" + #include "Common/Assert.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/FifoPlayer/FifoAnalyzer.h" -#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" #include "Core/FifoPlayer/FifoRecordAnalyzer.h" #include "VideoCommon/OpcodeDecoding.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h index 1184b5ec00..b6dd917792 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h @@ -6,7 +6,6 @@ #include "Common/CommonTypes.h" -#include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" namespace FifoAnalyzer diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp index 8b1e7f990b..6e70078c10 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -3,13 +3,10 @@ // Refer to the license.txt file included. #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" -#include "Common/Assert.h" + #include "Common/CommonTypes.h" #include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoDataFile.h" -#include "VideoCommon/OpcodeDecoding.h" -#include "VideoCommon/TextureDecoder.h" -#include "VideoCommon/VertexLoader.h" using namespace FifoAnalyzer; diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h index b594e6f4f2..9e0e66f8f4 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h @@ -7,7 +7,6 @@ #include #include -#include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoDataFile.h" struct AnalyzedFrameInfo diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 41ad65c7cd..7a049e2735 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -5,14 +5,15 @@ #include #include +#include "Core/FifoPlayer/FifoPlayer.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoDataFile.h" -#include "Core/FifoPlayer/FifoPlayer.h" #include "Core/HW/CPU.h" #include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h index 2b5e4b49ea..29e53a0bca 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h @@ -8,6 +8,7 @@ #include #include +#include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" #include "Core/PowerPC/CPUCoreBase.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index c02e04845d..9b2fd3659d 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -4,14 +4,11 @@ #include -#include "Common/Assert.h" -#include "Core/Core.h" -#include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoRecordAnalyzer.h" + +#include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoRecorder.h" #include "Core/HW/Memmap.h" -#include "VideoCommon/OpcodeDecoding.h" -#include "VideoCommon/TextureDecoder.h" using namespace FifoAnalyzer; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index b5a02e5d21..9084d8d8ab 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -6,10 +6,6 @@ #include "Common/CommonTypes.h" -#include "Core/FifoPlayer/FifoAnalyzer.h" - -#include "VideoCommon/BPMemory.h" - namespace FifoRecordAnalyzer { // Must call this before analyzing Fifo commands with FifoAnalyzer::AnalyzeCommand() diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index bd30d7213e..fd3be97e5a 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -5,10 +5,12 @@ #include #include +#include "Core/FifoPlayer/FifoRecorder.h" + #include "Common/Thread.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/FifoPlayer/FifoRecorder.h" +#include "Core/FifoPlayer/FifoAnalyzer.h" +#include "Core/FifoPlayer/FifoRecordAnalyzer.h" #include "Core/HW/Memmap.h" static FifoRecorder instance; diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h index ca2e335141..aafb701611 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h @@ -7,7 +7,6 @@ #include #include "Core/FifoPlayer/FifoDataFile.h" -#include "Core/FifoPlayer/FifoRecordAnalyzer.h" class FifoRecorder {