From 2a6457b6ab1be3ce0e2cb802298f8fb214a5da55 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 3 Feb 2013 20:31:46 -0800 Subject: [PATCH] Cut down on h files including PointerWrap. This makes changes to it a bit faster to build. --- Common/FixedSizeQueue.h | 1 + Core/CoreTiming.h | 3 ++- Core/Dialog/PSPDialog.cpp | 1 + Core/Dialog/PSPDialog.h | 5 +++-- Core/Dialog/PSPMsgDialog.cpp | 1 + Core/Dialog/PSPOskDialog.cpp | 1 + Core/FileSystems/FileSystem.h | 2 +- Core/HLE/__sceAudio.cpp | 1 + Core/HLE/sceAtrac.cpp | 1 + Core/HLE/sceAtrac.h | 2 +- Core/HLE/sceAudio.cpp | 15 ++++++++++++++- Core/HLE/sceAudio.h | 14 +++----------- Core/HLE/sceCtrl.cpp | 1 + Core/HLE/sceCtrl.h | 2 +- Core/HLE/sceFont.cpp | 3 +-- Core/HLE/sceFont.h | 2 +- Core/HLE/sceImpose.cpp | 1 + Core/HLE/sceImpose.h | 2 +- Core/HLE/sceKernel.h | 4 +++- Core/HLE/sceKernelEventFlag.cpp | 3 ++- Core/HLE/sceKernelMbx.cpp | 3 ++- Core/HLE/sceKernelMsgPipe.cpp | 1 + Core/HLE/sceKernelMutex.cpp | 3 ++- Core/HLE/sceKernelSemaphore.cpp | 3 ++- Core/HLE/sceKernelTime.cpp | 1 + Core/HLE/sceKernelVTimer.cpp | 1 + Core/HLE/sceMpeg.h | 3 ++- Core/HLE/scePower.cpp | 1 + Core/HLE/scePower.h | 2 +- Core/HLE/scePsmf.cpp | 1 + Core/HLE/sceSsl.cpp | 1 + Core/HLE/sceSsl.h | 2 +- Core/HLE/sceUmd.cpp | 3 ++- Core/HLE/sceUsb.cpp | 3 ++- Core/HLE/sceUtility.h | 2 +- Core/HW/MediaEngine.h | 1 + Core/HW/MemoryStick.cpp | 1 + Core/HW/MemoryStick.h | 3 ++- Core/HW/SasAudio.h | 2 +- Core/MIPS/MIPS.cpp | 7 +++++++ Core/MIPS/MIPS.h | 7 +------ Core/SaveState.h | 3 ++- Core/Util/BlockAllocator.cpp | 1 + Core/Util/BlockAllocator.h | 2 +- Core/Util/PPGeDraw.h | 3 ++- GPU/GPUCommon.cpp | 2 +- GPU/GPUInterface.h | 3 ++- 47 files changed, 84 insertions(+), 46 deletions(-) diff --git a/Common/FixedSizeQueue.h b/Common/FixedSizeQueue.h index b7c9b4d458..50b9548d56 100644 --- a/Common/FixedSizeQueue.h +++ b/Common/FixedSizeQueue.h @@ -19,6 +19,7 @@ #define _FIXED_SIZE_QUEUE_H_ #include +#include "ChunkFile.h" // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the // real STL classes. diff --git a/Core/CoreTiming.h b/Core/CoreTiming.h index 0858982683..0a05d722c3 100644 --- a/Core/CoreTiming.h +++ b/Core/CoreTiming.h @@ -32,10 +32,11 @@ // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") #include "../Globals.h" -#include "../Common/ChunkFile.h" #include +class PointerWrap; + //const int CPU_HZ = 222000000; extern int CPU_HZ; diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp index 25000a9fa1..efa83a454f 100644 --- a/Core/Dialog/PSPDialog.cpp +++ b/Core/Dialog/PSPDialog.cpp @@ -17,6 +17,7 @@ #include "../Util/PPGeDraw.h" #include "PSPDialog.h" +#include "ChunkFile.h" #define FADE_TIME 0.5 diff --git a/Core/Dialog/PSPDialog.h b/Core/Dialog/PSPDialog.h index 13014dffbb..ea170ada26 100644 --- a/Core/Dialog/PSPDialog.h +++ b/Core/Dialog/PSPDialog.h @@ -17,9 +17,10 @@ #pragma once - +#include "../Globals.h" #include "../Config.h" -#include "../../Common/ChunkFile.h" + +class PointerWrap; #define SCE_UTILITY_DIALOG_RESULT_SUCCESS 0 #define SCE_UTILITY_DIALOG_RESULT_CANCEL 1 diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 0886608a97..13182e8e8c 100644 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -19,6 +19,7 @@ #include "../Util/PPGeDraw.h" #include "../HLE/sceCtrl.h" #include "../Core/MemMap.h" +#include "ChunkFile.h" PSPMsgDialog::PSPMsgDialog() : PSPDialog() diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 5655a7737b..5192911304 100644 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -18,6 +18,7 @@ #include "PSPOskDialog.h" #include "../Util/PPGeDraw.h" #include "../HLE/sceCtrl.h" +#include "ChunkFile.h" #define NUMKEYROWS 4 #define KEYSPERROW 12 diff --git a/Core/FileSystems/FileSystem.h b/Core/FileSystems/FileSystem.h index f57ecdff40..f055811ebc 100644 --- a/Core/FileSystems/FileSystem.h +++ b/Core/FileSystems/FileSystem.h @@ -18,7 +18,7 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" +#include "ChunkFile.h" #include enum FileAccess diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp index 428482e36f..3b7c885812 100644 --- a/Core/HLE/__sceAudio.cpp +++ b/Core/HLE/__sceAudio.cpp @@ -25,6 +25,7 @@ #include "../MemMap.h" #include "../Host.h" #include "../Config.h" +#include "ChunkFile.h" #include "FixedSizeQueue.h" #include "Common/Thread.h" diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 173f643374..fea4840f98 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -22,6 +22,7 @@ #include "HLE.h" #include "../MIPS/MIPS.h" #include "../CoreTiming.h" +#include "ChunkFile.h" #include "sceKernel.h" #include "sceUtility.h" diff --git a/Core/HLE/sceAtrac.h b/Core/HLE/sceAtrac.h index 04cba8bd89..f967991188 100644 --- a/Core/HLE/sceAtrac.h +++ b/Core/HLE/sceAtrac.h @@ -17,7 +17,7 @@ #pragma once -#include "../Common/ChunkFile.h" +class PointerWrap; void Register_sceAtrac3plus(); void __AtracInit(); diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp index 00fa063cc3..0d7e1eedc8 100644 --- a/Core/HLE/sceAudio.cpp +++ b/Core/HLE/sceAudio.cpp @@ -17,12 +17,25 @@ #include "../MIPS/MIPS.h" #include "../Host.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceAudio.h" #include "__sceAudio.h" #include "HLE.h" +void AudioChannel::DoState(PointerWrap &p) +{ + p.Do(reserved); + p.Do(sampleAddress); + p.Do(sampleCount); + p.Do(leftVolume); + p.Do(rightVolume); + p.Do(format); + p.Do(waitingThread); + sampleQueue.DoState(p); + p.DoMarker("AudioChannel"); +} // There's a second Audio api called Audio2 that only has one channel, I guess the 8 channel api was overkill. // We simply map it to the first of the 8 channels. diff --git a/Core/HLE/sceAudio.h b/Core/HLE/sceAudio.h index 7bea235cdc..7f8e9014d6 100644 --- a/Core/HLE/sceAudio.h +++ b/Core/HLE/sceAudio.h @@ -23,6 +23,8 @@ #include "sceKernel.h" #include "FixedSizeQueue.h" +class PointerWrap; + enum PspAudioFormats { PSP_AUDIO_FORMAT_STEREO = 0, PSP_AUDIO_FORMAT_MONO = 0x10 }; enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48000 }; @@ -63,17 +65,7 @@ struct AudioChannel // Might try something more efficient later. FixedSizeQueue sampleQueue; - void DoState(PointerWrap &p) { - p.Do(reserved); - p.Do(sampleAddress); - p.Do(sampleCount); - p.Do(leftVolume); - p.Do(rightVolume); - p.Do(format); - p.Do(waitingThread); - sampleQueue.DoState(p); - p.DoMarker("AudioChannel"); - } + void DoState(PointerWrap &p); void clear() { reserved = false; diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp index 4f3987cd65..819b884819 100644 --- a/Core/HLE/sceCtrl.cpp +++ b/Core/HLE/sceCtrl.cpp @@ -18,6 +18,7 @@ #include "HLE.h" #include "../MIPS/MIPS.h" #include "../CoreTiming.h" +#include "ChunkFile.h" #include "StdMutex.h" #include "sceCtrl.h" #include "sceDisplay.h" diff --git a/Core/HLE/sceCtrl.h b/Core/HLE/sceCtrl.h index 5f9b4e3e05..fa61316030 100644 --- a/Core/HLE/sceCtrl.h +++ b/Core/HLE/sceCtrl.h @@ -17,7 +17,7 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; void Register_sceCtrl(); diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 98163f7ed2..07820703b8 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -4,8 +4,7 @@ #include "HLE.h" #include "../MIPS/MIPS.h" - -#include "sceFont.h" +#include "ChunkFile.h" typedef u32 FontLibraryHandle; diff --git a/Core/HLE/sceFont.h b/Core/HLE/sceFont.h index 9ca1bcd6d6..81d095c5bb 100644 --- a/Core/HLE/sceFont.h +++ b/Core/HLE/sceFont.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; void Register_sceFont(); diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp index 007f683855..746c24aaa6 100644 --- a/Core/HLE/sceImpose.cpp +++ b/Core/HLE/sceImpose.cpp @@ -18,6 +18,7 @@ #include "HLE.h" #include "FunctionWrappers.h" #include "../MIPS/MIPS.h" +#include "ChunkFile.h" const int PSP_LANGUAGE_JAPANESE = 0; diff --git a/Core/HLE/sceImpose.h b/Core/HLE/sceImpose.h index f340cd5722..e77ad16145 100644 --- a/Core/HLE/sceImpose.h +++ b/Core/HLE/sceImpose.h @@ -17,7 +17,7 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; void Register_sceImpose(); void __ImposeInit(); diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h index 6d3d859227..0185fd1e2c 100644 --- a/Core/HLE/sceKernel.h +++ b/Core/HLE/sceKernel.h @@ -18,8 +18,10 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" #include +#include + +class PointerWrap; enum { diff --git a/Core/HLE/sceKernelEventFlag.cpp b/Core/HLE/sceKernelEventFlag.cpp index 0acf655dd5..fa7bd94f13 100644 --- a/Core/HLE/sceKernelEventFlag.cpp +++ b/Core/HLE/sceKernelEventFlag.cpp @@ -19,7 +19,8 @@ #include "HLE.h" #include "../MIPS/MIPS.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceKernel.h" #include "sceKernelThread.h" diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp index 29756f1829..2a6e0d1887 100644 --- a/Core/HLE/sceKernelMbx.cpp +++ b/Core/HLE/sceKernelMbx.cpp @@ -19,7 +19,8 @@ #include "sceKernelThread.h" #include "sceKernelMbx.h" #include "HLE.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #define SCE_KERNEL_MBA_THPRI 0x100 #define SCE_KERNEL_MBA_MSPRI 0x400 diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp index bef7980ef8..06baacb126 100644 --- a/Core/HLE/sceKernelMsgPipe.cpp +++ b/Core/HLE/sceKernelMsgPipe.cpp @@ -19,6 +19,7 @@ #include "sceKernel.h" #include "sceKernelMsgPipe.h" #include "sceKernelThread.h" +#include "ChunkFile.h" #define SCE_KERNEL_MPA_THFIFO_S 0x0000 #define SCE_KERNEL_MPA_THPRI_S 0x0100 diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp index b6c18b2f4b..a1828cb2e3 100644 --- a/Core/HLE/sceKernelMutex.cpp +++ b/Core/HLE/sceKernelMutex.cpp @@ -19,7 +19,8 @@ #include #include "HLE.h" #include "../MIPS/MIPS.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceKernel.h" #include "sceKernelMutex.h" #include "sceKernelThread.h" diff --git a/Core/HLE/sceKernelSemaphore.cpp b/Core/HLE/sceKernelSemaphore.cpp index 0e11397461..3adad46b16 100644 --- a/Core/HLE/sceKernelSemaphore.cpp +++ b/Core/HLE/sceKernelSemaphore.cpp @@ -18,7 +18,8 @@ #include #include "HLE.h" #include "../MIPS/MIPS.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceKernel.h" #include "sceKernelThread.h" #include "sceKernelSemaphore.h" diff --git a/Core/HLE/sceKernelTime.cpp b/Core/HLE/sceKernelTime.cpp index 3ebf607f76..3bdbca77c1 100644 --- a/Core/HLE/sceKernelTime.cpp +++ b/Core/HLE/sceKernelTime.cpp @@ -29,6 +29,7 @@ #include "sceKernelTime.h" #include "../CoreTiming.h" +#include "ChunkFile.h" ////////////////////////////////////////////////////////////////////////// // State diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp index 22a4dd8884..45ea5ecb3c 100644 --- a/Core/HLE/sceKernelVTimer.cpp +++ b/Core/HLE/sceKernelVTimer.cpp @@ -19,6 +19,7 @@ #include "sceKernelThread.h" #include "sceKernelVTimer.h" #include "HLE.h" +#include "ChunkFile.h" // Using ERROR_LOG liberally when this is in development. When done, // should be changed to DEBUG_LOG wherever applicable. diff --git a/Core/HLE/sceMpeg.h b/Core/HLE/sceMpeg.h index b98a53ddec..f30ad6adb9 100644 --- a/Core/HLE/sceMpeg.h +++ b/Core/HLE/sceMpeg.h @@ -18,9 +18,10 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" #include "../MIPS/MIPS.h" +class PointerWrap; + enum { ERROR_MPEG_BAD_VERSION = 0x80610002, ERROR_MPEG_NO_MEMORY = 0x80610022, diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp index 920e8a8dc5..625aab9720 100644 --- a/Core/HLE/scePower.cpp +++ b/Core/HLE/scePower.cpp @@ -18,6 +18,7 @@ #include "HLE.h" #include "../MIPS/MIPS.h" #include "../CoreTiming.h" +#include "ChunkFile.h" #include "scePower.h" #include "sceKernelThread.h" diff --git a/Core/HLE/scePower.h b/Core/HLE/scePower.h index 49a1b8b444..78ac4a1c80 100644 --- a/Core/HLE/scePower.h +++ b/Core/HLE/scePower.h @@ -17,7 +17,7 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; void __PowerInit(); void __PowerDoState(PointerWrap &p); diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index e85a41f525..c8970e01bd 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "HLE.h" +#include "ChunkFile.h" #include "scePsmf.h" #include "sceMpeg.h" diff --git a/Core/HLE/sceSsl.cpp b/Core/HLE/sceSsl.cpp index b588135b88..f40f316a81 100644 --- a/Core/HLE/sceSsl.cpp +++ b/Core/HLE/sceSsl.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "HLE.h" +#include "ChunkFile.h" #include "sceSsl.h" diff --git a/Core/HLE/sceSsl.h b/Core/HLE/sceSsl.h index 6a1239f892..d12700755c 100644 --- a/Core/HLE/sceSsl.h +++ b/Core/HLE/sceSsl.h @@ -17,7 +17,7 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; void Register_sceSsl(); diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index 54d32c99f0..77996f6793 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -17,7 +17,8 @@ #include "HLE.h" #include "../MIPS/MIPS.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceUmd.h" #include "sceKernelThread.h" diff --git a/Core/HLE/sceUsb.cpp b/Core/HLE/sceUsb.cpp index a76751cf2e..b53b00a9c3 100644 --- a/Core/HLE/sceUsb.cpp +++ b/Core/HLE/sceUsb.cpp @@ -17,7 +17,8 @@ #include "HLE.h" #include "../MIPS/MIPS.h" -#include "../../Core/CoreTiming.h" +#include "Core/CoreTiming.h" +#include "ChunkFile.h" #include "sceUsb.h" bool usbActivated = false; diff --git a/Core/HLE/sceUtility.h b/Core/HLE/sceUtility.h index afb74db2ca..d87948e250 100644 --- a/Core/HLE/sceUtility.h +++ b/Core/HLE/sceUtility.h @@ -17,7 +17,7 @@ #pragma once -#include "../../Common/ChunkFile.h" +class PointerWrap; /** * Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h index 9d6443d225..a56c5a2408 100644 --- a/Core/HW/MediaEngine.h +++ b/Core/HW/MediaEngine.h @@ -27,6 +27,7 @@ #include "../../Globals.h" #include "../HLE/sceMpeg.h" +#include "ChunkFile.h" class MediaEngine { diff --git a/Core/HW/MemoryStick.cpp b/Core/HW/MemoryStick.cpp index b2a746b0af..22a4569922 100644 --- a/Core/HW/MemoryStick.cpp +++ b/Core/HW/MemoryStick.cpp @@ -1,4 +1,5 @@ #include "MemoryStick.h" +#include "ChunkFile.h" // MS and FatMS states. static MemStickState memStickState = PSP_MEMORYSTICK_STATE_DRIVER_READY; diff --git a/Core/HW/MemoryStick.h b/Core/HW/MemoryStick.h index fbd42b827b..f2bc36b038 100644 --- a/Core/HW/MemoryStick.h +++ b/Core/HW/MemoryStick.h @@ -1,5 +1,6 @@ #include "../../Globals.h" -#include "../../Common/ChunkFile.h" + +class PointerWrap; // mscmhc0 states enum MemStickState { diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h index cc79d0bc10..4bea794c8a 100644 --- a/Core/HW/SasAudio.h +++ b/Core/HW/SasAudio.h @@ -23,7 +23,7 @@ #pragma once #include "../Globals.h" -#include "../../Common/ChunkFile.h" +#include "ChunkFile.h" enum { PSP_SAS_VOICES_MAX = 32, diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index b7c3a39323..b751f5ba4a 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -98,6 +98,13 @@ void MIPSState::Reset() rng.Init(0x1337); } +void GMRng::DoState(PointerWrap &p) +{ + p.Do(m_w); + p.Do(m_z); + p.DoMarker("GMRng"); +} + void MIPSState::DoState(PointerWrap &p) { // Reset the jit if we're loading. diff --git a/Core/MIPS/MIPS.h b/Core/MIPS/MIPS.h index 01e4a85b24..a2849d28a4 100644 --- a/Core/MIPS/MIPS.h +++ b/Core/MIPS/MIPS.h @@ -18,7 +18,6 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" #include "../CPU.h" enum @@ -93,11 +92,7 @@ public: return (m_z << 16) + m_w; } - void DoState(PointerWrap &p) { - p.Do(m_w); - p.Do(m_z); - p.DoMarker("GMRng"); - } + void DoState(PointerWrap &p); private: u32 m_w; diff --git a/Core/SaveState.h b/Core/SaveState.h index 2edecfe930..7ca6d143b0 100644 --- a/Core/SaveState.h +++ b/Core/SaveState.h @@ -15,9 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "../Common/ChunkFile.h" #include +class PointerWrap; + namespace SaveState { typedef void (*Callback)(bool status, void *cbUserData); diff --git a/Core/Util/BlockAllocator.cpp b/Core/Util/BlockAllocator.cpp index 2085781e70..c98c747d34 100644 --- a/Core/Util/BlockAllocator.cpp +++ b/Core/Util/BlockAllocator.cpp @@ -1,5 +1,6 @@ #include "Log.h" #include "BlockAllocator.h" +#include "ChunkFile.h" // Slow freaking thing but works (eventually) :) diff --git a/Core/Util/BlockAllocator.h b/Core/Util/BlockAllocator.h index 70f38e7c6a..0fd8abe351 100644 --- a/Core/Util/BlockAllocator.h +++ b/Core/Util/BlockAllocator.h @@ -2,12 +2,12 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" #include #include #include +class PointerWrap; // Generic allocator thingy // Allocates blocks from a range diff --git a/Core/Util/PPGeDraw.h b/Core/Util/PPGeDraw.h index 88dde42f49..0702934ecc 100644 --- a/Core/Util/PPGeDraw.h +++ b/Core/Util/PPGeDraw.h @@ -18,9 +18,10 @@ #pragma once #include "../../Globals.h" -#include "../../Common/ChunkFile.h" #include "ppge_atlas.h" +class PointerWrap; + ///////////////////////////////////////////////////////////////////////////////////////////// // PPGeDraw: Super simple internal drawing API for 2D overlays like sceUtility messageboxes // etc. Goes through the Ge emulation so that it's 100% portable - will work diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index f82ff8bcc1..d694b89b99 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -3,7 +3,7 @@ #include "GeDisasm.h" #include "GPUCommon.h" #include "GPUState.h" - +#include "ChunkFile.h" static int dlIdGenerator = 1; diff --git a/GPU/GPUInterface.h b/GPU/GPUInterface.h index 42ca2be528..c35aa5a88e 100644 --- a/GPU/GPUInterface.h +++ b/GPU/GPUInterface.h @@ -18,9 +18,10 @@ #pragma once #include "../Globals.h" -#include "../Common/ChunkFile.h" #include +class PointerWrap; + enum DisplayListStatus { PSP_GE_LIST_DONE = 0, // reached finish+end