From c963c51a6071746255d71b9521e06591914d3f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lassi=20H=C3=A4m=C3=A4l=C3=A4inen?= Date: Sat, 29 Sep 2018 01:12:00 +0300 Subject: [PATCH] Remove unnecessary header includes - Manually removed lot of unneeded #includes to clean code and reduce compilation time - Reordered some of the #includes to be in more logical order --- rpcs3/Crypto/unedat.h | 2 -- rpcs3/Emu/CPU/CPUThread.cpp | 3 ++- rpcs3/Emu/Cell/MFC.cpp | 3 ++- rpcs3/Emu/Cell/PPUAnalyser.cpp | 3 ++- rpcs3/Emu/Cell/PPUFunction.cpp | 2 ++ rpcs3/Emu/Cell/PPUInterpreter.cpp | 3 ++- rpcs3/Emu/Cell/PPUModule.cpp | 3 ++- rpcs3/Emu/Cell/PPUTranslator.h | 6 +++--- rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp | 5 ++--- rpcs3/Emu/Cell/SPUInterpreter.cpp | 4 ++-- rpcs3/Emu/Cell/SPURecompiler.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_cond.cpp | 5 ++--- rpcs3/Emu/Cell/lv2/sys_dbg.cpp | 3 +-- rpcs3/Emu/Cell/lv2/sys_event.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_event_flag.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_gamepad.cpp | 8 ++------ rpcs3/Emu/Cell/lv2/sys_gpio.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_interrupt.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_lwcond.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_memory.cpp | 3 ++- rpcs3/Emu/Cell/lv2/sys_mmapper.cpp | 3 ++- rpcs3/Emu/Cell/lv2/sys_mutex.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_net.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_process.cpp | 3 +-- rpcs3/Emu/Cell/lv2/sys_prx.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 6 +++--- rpcs3/Emu/Cell/lv2/sys_rwlock.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_semaphore.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_ss.cpp | 3 ++- rpcs3/Emu/Cell/lv2/sys_time.cpp | 7 +++---- rpcs3/Emu/Cell/lv2/sys_timer.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_trace.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 4 ++-- rpcs3/Emu/Memory/vm.cpp | 1 - rpcs3/Emu/Memory/vm.h | 2 -- rpcs3/Emu/Memory/vm_reservation.h | 2 ++ rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp | 2 +- rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp | 2 +- rpcs3/Emu/RSX/Common/BufferUtils.cpp | 1 + rpcs3/Emu/RSX/Common/BufferUtils.h | 3 +-- rpcs3/Emu/RSX/Common/ProgramStateCache.h | 1 - rpcs3/Emu/RSX/Common/texture_cache_utils.h | 1 - rpcs3/Emu/RSX/GCM.h | 1 + rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 4 ++-- rpcs3/Emu/RSX/GL/GLFragmentProgram.h | 2 -- rpcs3/Emu/RSX/GL/GLGSRender.h | 2 ++ rpcs3/Emu/RSX/GL/GLRenderTargets.cpp | 3 +-- rpcs3/Emu/RSX/GL/GLRenderTargets.h | 4 +--- rpcs3/Emu/RSX/GL/GLTexture.cpp | 1 - rpcs3/Emu/RSX/GL/GLTextureCache.h | 1 - rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp | 3 +-- rpcs3/Emu/RSX/GL/GLVertexProgram.cpp | 4 ++-- rpcs3/Emu/RSX/GL/GLVertexProgram.h | 2 -- rpcs3/Emu/RSX/GSRender.h | 1 + rpcs3/Emu/RSX/RSXFragmentProgram.h | 5 +++-- rpcs3/Emu/RSX/RSXTexture.cpp | 4 ++-- rpcs3/Emu/RSX/RSXTexture.h | 13 +------------ rpcs3/Emu/RSX/RSXThread.cpp | 2 +- rpcs3/Emu/RSX/RSXThread.h | 4 ---- rpcs3/Emu/RSX/RSXVertexProgram.h | 6 ++++-- rpcs3/Emu/RSX/VK/VKFragmentProgram.h | 3 +-- rpcs3/Emu/RSX/VK/VKGSRender.h | 3 ++- rpcs3/Emu/RSX/VK/VKHelpers.h | 7 +++---- rpcs3/Emu/RSX/VK/VKRenderTargets.h | 1 - rpcs3/Emu/RSX/VK/VKTextureCache.h | 3 +-- rpcs3/Emu/RSX/gcm_enums.h | 13 ++++++++++++- rpcs3/Emu/RSX/rsx_utils.cpp | 1 - rpcs3/Emu/RSX/rsx_utils.h | 5 +---- rpcs3/Emu/RSX/rsx_vertex_data.h | 3 +-- 72 files changed, 120 insertions(+), 139 deletions(-) diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h index 810ba3f9ea..57cdd7fd31 100644 --- a/rpcs3/Crypto/unedat.h +++ b/rpcs3/Crypto/unedat.h @@ -1,7 +1,5 @@ #pragma once -#include -#include #include #include "utils.h" diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index dc60f89484..28bf53a323 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "CPUThread.h" + #include "Emu/System.h" #include "Emu/Memory/vm_locking.h" -#include "CPUThread.h" #include "Emu/IdManager.h" #include "Utilities/GDBDebugServer.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/Emu/Cell/MFC.cpp index 4d36a18980..8f846c964b 100644 --- a/rpcs3/Emu/Cell/MFC.cpp +++ b/rpcs3/Emu/Cell/MFC.cpp @@ -1,10 +1,11 @@ #include "stdafx.h" +#include "MFC.h" + #include "Utilities/sysinfo.h" #include "Emu/Memory/vm.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/lv2/sys_sync.h" #include "Emu/System.h" -#include "MFC.h" template <> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/PPUAnalyser.cpp b/rpcs3/Emu/Cell/PPUAnalyser.cpp index 75968b726e..91c24c5da4 100644 --- a/rpcs3/Emu/Cell/PPUAnalyser.cpp +++ b/rpcs3/Emu/Cell/PPUAnalyser.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "PPUAnalyser.h" + #include "PPUOpcodes.h" #include "PPUModule.h" -#include "PPUAnalyser.h" #include #include "yaml-cpp/yaml.h" diff --git a/rpcs3/Emu/Cell/PPUFunction.cpp b/rpcs3/Emu/Cell/PPUFunction.cpp index f7ece6951d..97be469051 100644 --- a/rpcs3/Emu/Cell/PPUFunction.cpp +++ b/rpcs3/Emu/Cell/PPUFunction.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "PPUFunction.h" + #include "PPUModule.h" extern std::string ppu_get_syscall_name(u64 code) diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index 9ebf971566..56731f1d77 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -1,8 +1,9 @@ #include "stdafx.h" +#include "PPUInterpreter.h" + #include "Emu/Memory/vm_reservation.h" #include "Emu/System.h" #include "PPUThread.h" -#include "PPUInterpreter.h" #include "Utilities/asm.h" #include "Emu/Cell/Common.h" diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index db4915b25d..28e688d4d0 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/Cell/PPUModule.h" + #include "Utilities/VirtualMemory.h" #include "Utilities/bin_patch.h" #include "Crypto/sha1.h" @@ -8,7 +10,6 @@ #include "Emu/IdManager.h" #include "Emu/Cell/PPUOpcodes.h" -#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUAnalyser.h" #include "Emu/Cell/lv2/sys_prx.h" diff --git a/rpcs3/Emu/Cell/PPUTranslator.h b/rpcs3/Emu/Cell/PPUTranslator.h index 498c7b8711..a459cb4aef 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.h +++ b/rpcs3/Emu/Cell/PPUTranslator.h @@ -2,9 +2,9 @@ #ifdef LLVM_AVAILABLE -#include "../rpcs3/Emu/CPU/CPUTranslator.h" -#include "../rpcs3/Emu/Cell/PPUOpcodes.h" -#include "../rpcs3/Emu/Cell/PPUAnalyser.h" +#include "Emu/CPU/CPUTranslator.h" +#include "PPUOpcodes.h" +#include "PPUAnalyser.h" class PPUTranslator final : public cpu_translator { diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp index bf5c4485b8..e570326a47 100644 --- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "SPUASMJITRecompiler.h" + #include "Emu/System.h" #include "Emu/IdManager.h" @@ -14,8 +15,6 @@ #include #include -#include "SPUASMJITRecompiler.h" - #define SPU_OFF_128(x, ...) asmjit::x86::oword_ptr(*cpu, offset32(&spu_thread::x, ##__VA_ARGS__)) #define SPU_OFF_64(x, ...) asmjit::x86::qword_ptr(*cpu, offset32(&spu_thread::x, ##__VA_ARGS__)) #define SPU_OFF_32(x, ...) asmjit::x86::dword_ptr(*cpu, offset32(&spu_thread::x, ##__VA_ARGS__)) diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 6c90bb449f..c85faafc11 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "SPUInterpreter.h" + #include "Emu/System.h" #include "Utilities/JIT.h" #include "Utilities/sysinfo.h" #include "Utilities/asm.h" #include "SPUThread.h" -#include "SPUInterpreter.h" #include "Emu/Cell/Common.h" #include diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp index a20c95597a..8cf722f113 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.cpp +++ b/rpcs3/Emu/Cell/SPURecompiler.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "SPURecompiler.h" + #include "Emu/System.h" #include "Emu/IdManager.h" -#include "Emu/Memory/vm.h" #include "Crypto/sha1.h" #include "Utilities/StrUtil.h" #include "Utilities/JIT.h" @@ -11,7 +12,6 @@ #include "SPUAnalyser.h" #include "SPUInterpreter.h" #include "SPUDisAsm.h" -#include "SPURecompiler.h" #include #include #include diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index 7671ffe17e..dc86ebfe5c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp @@ -1,13 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_cond.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_mutex.h" -#include "sys_cond.h" LOG_CHANNEL(sys_cond); diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp index 149ac29ea9..6cef5f20c1 100644 --- a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp @@ -1,8 +1,7 @@ #include "stdafx.h" +#include "sys_dbg.h" #include "Emu/Cell/ErrorCodes.h" -#include "Emu/Memory/vm.h" -#include "sys_dbg.h" #include "Emu/Cell/Modules/sys_lv2dbg.h" LOG_CHANNEL(sys_dbg); diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp index 52b959afb7..c2218d316d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_event.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" @@ -8,7 +9,6 @@ #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" #include "sys_process.h" -#include "sys_event.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp index 84628e6f38..68c6ffdf88 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_event_flag.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_event_flag.h" #include diff --git a/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp b/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp index 4a479ce210..73e4e03cba 100644 --- a/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp @@ -1,12 +1,8 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" -#include "Emu/System.h" -#include "Emu/IdManager.h" - -#include "Emu/Cell/ErrorCodes.h" - #include "sys_gamepad.h" +#include "Emu/System.h" +#include "Emu/IdManager.h" LOG_CHANNEL(sys_gamepad); diff --git a/rpcs3/Emu/Cell/lv2/sys_gpio.cpp b/rpcs3/Emu/Cell/lv2/sys_gpio.cpp index 9ef52d6756..b03abbcb8c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_gpio.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_gpio.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_gpio.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" -#include "sys_gpio.h" error_code sys_gpio_get(u64 device_id, vm::ptr value) { diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp index 4185df50e9..384ef683d7 100644 --- a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_interrupt.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUOpcodes.h" -#include "sys_interrupt.h" LOG_CHANNEL(sys_interrupt); diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index 2427baf679..f477b00ca5 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_lwcond.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" #include "sys_lwmutex.h" -#include "sys_lwcond.h" LOG_CHANNEL(sys_lwcond); diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp index ad39578037..438a7c6642 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_lwmutex.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_lwmutex.h" LOG_CHANNEL(sys_lwmutex); diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp index 7e469209e0..6be2d59301 100644 --- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp @@ -1,8 +1,9 @@ #include "stdafx.h" +#include "sys_memory.h" + #include "Utilities/VirtualMemory.h" #include "Emu/Memory/vm_locking.h" #include "Emu/IdManager.h" -#include "sys_memory.h" LOG_CHANNEL(sys_memory); diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index 826f32f4f5..4ec30dd261 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -1,11 +1,12 @@ #include "stdafx.h" +#include "sys_mmapper.h" + #include "Emu/Cell/PPUThread.h" #include "sys_ppu_thread.h" #include "Emu/Cell/lv2/sys_event.h" #include "Emu/Memory/vm_var.h" #include "Utilities/VirtualMemory.h" #include "sys_memory.h" -#include "sys_mmapper.h" LOG_CHANNEL(sys_mmapper); diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp index 8777542919..5f7fb5843c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_mutex.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_mutex.h" LOG_CHANNEL(sys_mutex); diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index ea3d87d302..6de4dcf440 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_net.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/PPUThread.h" #include "Utilities/Thread.h" #include "sys_sync.h" -#include "sys_net.h" #ifdef _WIN32 #include diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp index 1482422853..b039739838 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_ppu_thread.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_ppu_thread.h" #include "sys_event.h" #include "sys_mmapper.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp index 790ffb0bc4..9c657de2ae 100644 --- a/rpcs3/Emu/Cell/lv2/sys_process.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Utilities/types.h" +#include "sys_process.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/System.h" #include "Emu/IdManager.h" @@ -23,7 +23,6 @@ #include "sys_timer.h" #include "sys_trace.h" #include "sys_fs.h" -#include "sys_process.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp index 76e206fbbb..092d5efcdf 100644 --- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_prx.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Crypto/unself.h" @@ -8,7 +9,6 @@ #include "Emu/Cell/ErrorCodes.h" #include "Crypto/unedat.h" #include "sys_fs.h" -#include "sys_prx.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index d9e89a4ade..ed1c9b9a7c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "stdafx.h" +#include "sys_rsx.h" + #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" #include "Emu/RSX/GSRender.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" -#include "sys_rsx.h" #include "sys_event.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index 4413b6f877..75205035da 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_rwlock.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_rwlock.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp index c82f633d4d..fb415ff424 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_semaphore.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "sys_semaphore.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 12880caca4..89bc0fd737 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_spu.h" + #include "Emu/System.h" #include "Emu/IdManager.h" #include "Crypto/unself.h" @@ -14,7 +15,6 @@ #include "sys_interrupt.h" #include "sys_mmapper.h" #include "sys_event.h" -#include "sys_spu.h" LOG_CHANNEL(sys_spu); diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/Emu/Cell/lv2/sys_ss.cpp index 4a5ac822f7..f8fcf47d8e 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ss.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ss.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "sys_ss.h" + #include "Emu/Cell/PPUThread.h" -#include "sys_ss.h" #ifdef _WIN32 #include diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp index c3ff1067bd..b166578e5a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -1,10 +1,9 @@ #include "stdafx.h" -#include "Emu/Memory/vm_ptr.h" -#include "Emu/System.h" - -#include "Emu/Cell/ErrorCodes.h" #include "sys_time.h" +#include "Emu/System.h" +#include "Emu/Cell/ErrorCodes.h" + #ifdef _WIN32 #include diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/Emu/Cell/lv2/sys_timer.cpp index 8f27d2f354..c07f738be1 100644 --- a/rpcs3/Emu/Cell/lv2/sys_timer.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_timer.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_timer.h" + #include "Emu/System.h" #include "Emu/IdManager.h" @@ -7,7 +8,6 @@ #include "Emu/Cell/PPUThread.h" #include "sys_event.h" #include "sys_process.h" -#include "sys_timer.h" #include diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.cpp b/rpcs3/Emu/Cell/lv2/sys_trace.cpp index 1f251bcec1..3007f8a56a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_trace.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_trace.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_trace.h" + #include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" -#include "sys_trace.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 8f3b421095..cc13ed230e 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_usbd.h" + #include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" -#include "sys_usbd.h" #include "sys_ppu_thread.h" diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index e270ef655c..092048e3de 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -5,7 +5,6 @@ #include "vm_reservation.h" #include "vm_var.h" -#include "Emu/System.h" #include "Utilities/mutex.h" #include "Utilities/cond.h" #include "Utilities/Thread.h" diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index e8a178ab24..2ea85e4e5b 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -1,10 +1,8 @@ #pragma once #include -#include #include #include "Utilities/types.h" -#include "Utilities/Atomic.h" #include "Utilities/VirtualMemory.h" #include "Utilities/StrFmt.h" #include "Utilities/BEType.h" diff --git a/rpcs3/Emu/Memory/vm_reservation.h b/rpcs3/Emu/Memory/vm_reservation.h index 1e32dac32e..35fe49f68e 100644 --- a/rpcs3/Emu/Memory/vm_reservation.h +++ b/rpcs3/Emu/Memory/vm_reservation.h @@ -3,6 +3,8 @@ #include "vm.h" #include "Utilities/cond.h" +#include "Utilities/Atomic.h" + class notifier; namespace vm diff --git a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp index 3626288526..dcfe2ff146 100644 --- a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" +#include "CgBinaryProgram.h" #include "Emu/System.h" -#include "CgBinaryProgram.h" #include "Emu/RSX/RSXFragmentProgram.h" #include diff --git a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp index 069ada918f..1a290a1247 100644 --- a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" +#include "CgBinaryProgram.h" #include "Emu/System.h" -#include "CgBinaryProgram.h" #include "Emu/RSX/RSXVertexProgram.h" void CgBinaryDisasm::AddScaCodeDisasm(const std::string& code) diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 639d9c5a2f..53e20aba99 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -2,6 +2,7 @@ #include "BufferUtils.h" #include "../rsx_methods.h" #include "Utilities/sysinfo.h" +#include "../RSXThread.h" #include diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.h b/rpcs3/Emu/RSX/Common/BufferUtils.h index e3061dfd0c..bd24aa4ce5 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.h +++ b/rpcs3/Emu/RSX/Common/BufferUtils.h @@ -3,8 +3,7 @@ #include #include "Utilities/GSL.h" -#include "Emu/Memory/vm.h" -#include "../RSXThread.h" +#include "../gcm_enums.h" /** * Write count vertex attributes from src_ptr. diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h index f263c9ad89..1a7705b59e 100644 --- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h @@ -2,7 +2,6 @@ #include "Emu/RSX/RSXFragmentProgram.h" #include "Emu/RSX/RSXVertexProgram.h" -#include "Emu/Memory/vm.h" #include "Utilities/GSL.h" #include "Utilities/hash.h" diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h index 81ecca46a3..39506d3e88 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h +++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h @@ -1,7 +1,6 @@ #pragma once #include "../rsx_cache.h" -#include "../rsx_utils.h" #include "texture_cache_predictor.h" #include "TextureUtils.h" diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h index cefddc32a6..68e85791d7 100644 --- a/rpcs3/Emu/RSX/GCM.h +++ b/rpcs3/Emu/RSX/GCM.h @@ -3,6 +3,7 @@ #include "Emu/Memory/vm_ptr.h" #include "gcm_enums.h" #include "gcm_printing.h" +#include "Utilities/Atomic.h" struct CellGcmControl diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 68c52d5a63..95b8519247 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include -#include "Emu/Memory/vm.h" +#include "GLFragmentProgram.h" + #include "Emu/System.h" #include "GLHelpers.h" #include "GLFragmentProgram.h" diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h index c62de5c325..19b980e8b4 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h @@ -1,8 +1,6 @@ #pragma once #include "../Common/FragmentProgramDecompiler.h" #include "Emu/RSX/RSXFragmentProgram.h" -#include "Utilities/Thread.h" -#include "OpenGL.h" struct GLFragmentDecompilerThread : public FragmentProgramDecompiler { diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index 46454c544f..4bb90cd6fc 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -8,6 +8,8 @@ #include "GLTextOut.h" #include "GLOverlays.h" +#include + #pragma comment(lib, "opengl32.lib") namespace gl diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp index 0422961fc5..7cfa9109ff 100644 --- a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp +++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp @@ -1,5 +1,4 @@ -#include "stdafx.h" -#include "../rsx_methods.h" +#include "stdafx.h" #include "GLGSRender.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.h b/rpcs3/Emu/RSX/GL/GLRenderTargets.h index 70d9873b11..c0463c4bb1 100644 --- a/rpcs3/Emu/RSX/GL/GLRenderTargets.h +++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.h @@ -1,8 +1,6 @@ -#pragma once +#pragma once #include "../Common/surface_store.h" #include "GLHelpers.h" -#include "stdafx.h" -#include "../RSXThread.h" #include "../rsx_utils.h" struct color_swizzle diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 8e59389c22..43c5efb41f 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -3,7 +3,6 @@ #include "../GCM.h" #include "../RSXThread.h" #include "../RSXTexture.h" -#include "../rsx_utils.h" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index 899eaadc8d..a70c51c408 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -18,7 +18,6 @@ #include "GLTexture.h" #include "../Common/TextureUtils.h" #include "../Common/texture_cache.h" -#include "../../Memory/vm.h" class GLGSRender; diff --git a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp index 947c022a6e..511699e2c2 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp @@ -1,6 +1,5 @@ -#include "stdafx.h" +#include "stdafx.h" #include "GLGSRender.h" -#include "../rsx_methods.h" #include "../Common/BufferUtils.h" #include "GLHelpers.h" diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index 6ea1720f1d..7906599295 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" +#include "GLVertexProgram.h" + #include "Emu/System.h" -#include "GLVertexProgram.h" #include "GLCommonDecompiler.h" #include "GLHelpers.h" -#include "../GCM.h" #include "../Common/GLSLCommon.h" #include diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/Emu/RSX/GL/GLVertexProgram.h index d510e5e1b9..bad54b5fff 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.h +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.h @@ -1,8 +1,6 @@ #pragma once #include "../Common/VertexProgramDecompiler.h" #include "Emu/RSX/RSXVertexProgram.h" -#include "Utilities/Thread.h" -#include "OpenGL.h" enum { diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/Emu/RSX/GSRender.h index 3718ab59c9..8aec937fa4 100644 --- a/rpcs3/Emu/RSX/GSRender.h +++ b/rpcs3/Emu/RSX/GSRender.h @@ -2,6 +2,7 @@ #include "Emu/RSX/RSXThread.h" #include +#include #ifdef _WIN32 #include diff --git a/rpcs3/Emu/RSX/RSXFragmentProgram.h b/rpcs3/Emu/RSX/RSXFragmentProgram.h index d8f875c45d..5a35eefe71 100644 --- a/rpcs3/Emu/RSX/RSXFragmentProgram.h +++ b/rpcs3/Emu/RSX/RSXFragmentProgram.h @@ -1,6 +1,7 @@ #pragma once -#include "GCM.h" -#include "RSXTexture.h" + +#include "gcm_enums.h" +#include "Utilities/types.h" enum register_type { diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp index 220d9d815d..03b26077e4 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" -#include "RSXThread.h" #include "RSXTexture.h" + #include "rsx_methods.h" +#include "rsx_utils.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/RSXTexture.h b/rpcs3/Emu/RSX/RSXTexture.h index 16a0136779..0b6f273095 100644 --- a/rpcs3/Emu/RSX/RSXTexture.h +++ b/rpcs3/Emu/RSX/RSXTexture.h @@ -1,19 +1,8 @@ #pragma once -#include "GCM.h" +#include "gcm_enums.h" namespace rsx { - /** - * Use an extra cubemap format - */ - enum class texture_dimension_extended : u8 - { - texture_dimension_1d = 0, - texture_dimension_2d = 1, - texture_dimension_cubemap = 2, - texture_dimension_3d = 3, - }; - class fragment_texture { protected: diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 31baf60a43..7796c6baec 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" #include "Emu/Memory/vm.h" #include "Emu/System.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index e0556c6cea..644b2db32a 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -1,10 +1,6 @@ #pragma once -#include #include -#include -#include -#include #include #include "GCM.h" #include "rsx_cache.h" diff --git a/rpcs3/Emu/RSX/RSXVertexProgram.h b/rpcs3/Emu/RSX/RSXVertexProgram.h index b22e4bdd3f..8643cb13df 100644 --- a/rpcs3/Emu/RSX/RSXVertexProgram.h +++ b/rpcs3/Emu/RSX/RSXVertexProgram.h @@ -1,7 +1,9 @@ #pragma once -#include "RSXTexture.h" +#include "gcm_enums.h" +#include "Utilities/types.h" +#include #include #include @@ -245,4 +247,4 @@ struct RSXVertexProgram { return (rsx::texture_dimension_extended)((texture_dimensions >> (id * 2)) & 0x3); } -}; \ No newline at end of file +}; diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h index 3239fac53c..a84c479e0d 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h @@ -1,9 +1,8 @@ #pragma once #include "../Common/FragmentProgramDecompiler.h" #include "Emu/RSX/RSXFragmentProgram.h" -#include "Utilities/Thread.h" #include "VulkanAPI.h" -#include "../VK/VKHelpers.h" +#include "VKHelpers.h" struct VKFragmentDecompilerThread : public FragmentProgramDecompiler { diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 253691f44b..8760dd4fd3 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -9,9 +9,10 @@ #include "VKProgramBuffer.h" #include "VKFramebuffer.h" #include "../GCM.h" -#include "../rsx_utils.h" + #include #include +#include namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index a0bc2c2c8f..24175dcab8 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1,14 +1,14 @@ -#pragma once +#pragma once #include "stdafx.h" #include #include -#include #include #include #include #include #include +#include #if !defined(_WIN32) && !defined(__APPLE__) #include @@ -19,9 +19,8 @@ #include "VulkanAPI.h" #include "VKCommonDecompiler.h" #include "../GCM.h" -#include "../Common/TextureUtils.h" #include "../Common/ring_buffer_helper.h" -#include "../rsx_cache.h" +#include "../Common/TextureUtils.h" #include "3rdparty/GPUOpen/include/vk_mem_alloc.h" diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 4785de57f5..a729296d6d 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -7,7 +7,6 @@ #include "../Common/surface_store.h" #include "../Common/TextureUtils.h" #include "../Common/texture_cache_utils.h" -#include "../rsx_utils.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 8f3f753c36..138aeb1f36 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -1,11 +1,10 @@ -#pragma once +#pragma once #include "stdafx.h" #include "VKRenderTargets.h" #include "VKGSRender.h" #include "VKCompute.h" #include "Emu/System.h" #include "../Common/TextureUtils.h" -#include "../rsx_utils.h" #include "Utilities/mutex.h" #include "../Common/texture_cache.h" diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/Emu/RSX/gcm_enums.h index 9518528245..0c5d24def5 100644 --- a/rpcs3/Emu/RSX/gcm_enums.h +++ b/rpcs3/Emu/RSX/gcm_enums.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Utilities/types.h" namespace rsx @@ -139,6 +139,17 @@ namespace rsx fog_mode to_fog_mode(u32 in); + /** + * Use an extra cubemap format + */ + enum class texture_dimension_extended : u8 + { + texture_dimension_1d = 0, + texture_dimension_2d = 1, + texture_dimension_cubemap = 2, + texture_dimension_3d = 3, + }; + enum class texture_dimension : u8 { dimension1d, diff --git a/rpcs3/Emu/RSX/rsx_utils.cpp b/rpcs3/Emu/RSX/rsx_utils.cpp index c875888112..a72ceca513 100644 --- a/rpcs3/Emu/RSX/rsx_utils.cpp +++ b/rpcs3/Emu/RSX/rsx_utils.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "rsx_utils.h" #include "rsx_methods.h" -#include "RSXThread.h" #include "Emu/RSX/GCM.h" #include "Common/BufferUtils.h" #include "Overlays/overlays.h" diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 0322e8db40..d10f7fc82e 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -4,13 +4,10 @@ #include "Utilities/address_range.h" #include "Utilities/geometry.h" #include "Utilities/asm.h" -#include "Utilities/VirtualMemory.h" -#include "Emu/Memory/vm.h" #include "gcm_enums.h" -#include + #include #include -#include extern "C" { diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h index 2081dc235a..0f2ef04f5d 100644 --- a/rpcs3/Emu/RSX/rsx_vertex_data.h +++ b/rpcs3/Emu/RSX/rsx_vertex_data.h @@ -1,10 +1,9 @@ #pragma once -#include "GCM.h" +#include "gcm_enums.h" #include "rsx_decode.h" #include "Utilities/types.h" -#include "Utilities/BEType.h" #include "rsx_utils.h" namespace rsx