From 9ee683c6dd6ca0720de05de0904834ec88e8d73c 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/Audio/AL/OpenALThread.cpp | 3 +- rpcs3/Emu/Audio/ALSA/ALSAThread.cpp | 3 +- rpcs3/Emu/Audio/Pulse/PulseThread.cpp | 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/PPUThread.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 | 6 +- 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 | 4 +- rpcs3/Emu/Cell/lv2/sys_prx.cpp | 4 +- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 8 +- 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 | 5 +- 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.h | 2 - rpcs3/Emu/RSX/Common/texture_cache_utils.h | 1 - rpcs3/Emu/RSX/GCM.h | 1 + rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 10 +- 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 | 3 +- rpcs3/Emu/RSX/RSXTexture.h | 13 +- rpcs3/Emu/RSX/RSXThread.cpp | 230 ++++++++++----------- rpcs3/Emu/RSX/RSXThread.h | 7 +- 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 | 6 +- 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 +- 77 files changed, 245 insertions(+), 265 deletions(-) diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h index 83f3aca5f53d..fd73c2e6cc8b 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/Audio/AL/OpenALThread.cpp b/rpcs3/Emu/Audio/AL/OpenALThread.cpp index 976ad26e5869..9498f07a2afb 100644 --- a/rpcs3/Emu/Audio/AL/OpenALThread.cpp +++ b/rpcs3/Emu/Audio/AL/OpenALThread.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "OpenALThread.h" + #include "Emu/System.h" -#include "OpenALThread.h" #ifdef _MSC_VER #pragma comment(lib, "OpenAL32.lib") diff --git a/rpcs3/Emu/Audio/ALSA/ALSAThread.cpp b/rpcs3/Emu/Audio/ALSA/ALSAThread.cpp index 4302dc1e441f..68891a5ec182 100644 --- a/rpcs3/Emu/Audio/ALSA/ALSAThread.cpp +++ b/rpcs3/Emu/Audio/ALSA/ALSAThread.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "ALSAThread.h" + #include "Emu/System.h" -#include "ALSAThread.h" #ifdef HAVE_ALSA diff --git a/rpcs3/Emu/Audio/Pulse/PulseThread.cpp b/rpcs3/Emu/Audio/Pulse/PulseThread.cpp index 8ad34120a2eb..d920c2a92f62 100644 --- a/rpcs3/Emu/Audio/Pulse/PulseThread.cpp +++ b/rpcs3/Emu/Audio/Pulse/PulseThread.cpp @@ -1,5 +1,5 @@ -#include "Emu/System.h" #include "PulseThread.h" +#include "Emu/System.h" #ifdef HAVE_PULSE diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 55f53d183467..146bba4a032b 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 diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/Emu/Cell/MFC.cpp index 4d36a18980b0..8f846c964ba9 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 8a975bcd8dca..7b5fa9dd0202 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 1eba98a64026..d331b277d729 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 3b0551704e16..261508a01306 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 diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 00c42866f71e..f2b9e778f775 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/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 6fa12669ecaa..5813a5fd7176 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "PPUThread.h" + #include "Utilities/VirtualMemory.h" #include "Utilities/sysinfo.h" #include "Utilities/JIT.h" @@ -6,7 +8,6 @@ #include "Emu/Memory/vm_reservation.h" #include "Emu/System.h" #include "Emu/IdManager.h" -#include "PPUThread.h" #include "PPUInterpreter.h" #include "PPUAnalyser.h" #include "PPUModule.h" diff --git a/rpcs3/Emu/Cell/PPUTranslator.h b/rpcs3/Emu/Cell/PPUTranslator.h index baf071832c44..b39df2d30269 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 03402567c002..2bc28b33618a 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(&SPUThread::x, ##__VA_ARGS__)) #define SPU_OFF_64(x, ...) asmjit::x86::qword_ptr(*cpu, offset32(&SPUThread::x, ##__VA_ARGS__)) #define SPU_OFF_32(x, ...) asmjit::x86::dword_ptr(*cpu, offset32(&SPUThread::x, ##__VA_ARGS__)) diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 6f5a6e03557f..03957135e726 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 #include diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp index 9bd8b5abe4b1..3265f58f6f1b 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.cpp +++ b/rpcs3/Emu/Cell/SPURecompiler.cpp @@ -1,7 +1,8 @@ -#include "stdafx.h" +#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" @@ -9,7 +10,6 @@ #include "SPUAnalyser.h" #include "SPUInterpreter.h" #include "SPUDisAsm.h" -#include "SPURecompiler.h" #include "PPUAnalyser.h" #include #include diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index a0e4d0969453..34ccd9133866 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" diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp index 149ac29ea96b..6cef5f20c1c6 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 5ea0742ac9d1..4319a20651f0 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 f3ff307498df..52d1c1940a06 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 4a479ce210f5..73e4e03cba32 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 9ef52d6756fa..b03abbcb8ce6 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 77c50e3c06c9..276d3bee5595 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" diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index 6bfe68a6fae6..44a9bcf111e1 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" diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp index 0708101be33c..c76b8e504c2a 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" diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp index 2b7ad501abe8..7fa76425148a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" +#include "sys_memory.h" + #include "Utilities/VirtualMemory.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 969d913af50a..9d0864c2b463 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 deaa413789ad..92b6fcc0be87 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" diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index fbe666204827..fef4b31b8eb9 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 e99ae658ef33..15a05e0eb4e6 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 a706e16f2cf9..df341c831287 100644 --- a/rpcs3/Emu/Cell/lv2/sys_process.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" +#include "sys_process.h" + #include "Emu/System.h" #include "Emu/IdManager.h" @@ -21,7 +22,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 44980dc62742..24ddf84df43e 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 4a78755643d3..6b78197df915 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" @@ -531,4 +531,4 @@ s32 sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5) sys_rsx.warning("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5); return CELL_OK; -} \ No newline at end of file +} diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index b1fa084896b1..89648c17f173 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 e38e5c46c1e1..7849e520b079 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 1171c269cd7b..904aa310acf9 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" @@ -13,7 +14,6 @@ #include "Emu/Cell/RawSPUThread.h" #include "sys_interrupt.h" #include "sys_event.h" -#include "sys_spu.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/Emu/Cell/lv2/sys_ss.cpp index 4a5ac822f7f1..f8fcf47d8ef5 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 c3ff1067bdce..b166578e5ae8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -1,9 +1,8 @@ #include "stdafx.h" -#include "Emu/Memory/vm_ptr.h" -#include "Emu/System.h" +#include "sys_time.h" +#include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" -#include "sys_time.h" #ifdef _WIN32 diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/Emu/Cell/lv2/sys_timer.cpp index e59f00d4fa63..94edb52cd72d 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 1f251bcec1b2..3007f8a56af3 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 8f3b4210954a..cc13ed230e8f 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 e69bb94ff8aa..86738fe544b2 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 d75fde906a0d..b9e4d5bc6040 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 c74ebebbeb12..57d0ef864488 100644 --- a/rpcs3/Emu/Memory/vm_reservation.h +++ b/rpcs3/Emu/Memory/vm_reservation.h @@ -2,6 +2,8 @@ #include "vm.h" +#include "Utilities/Atomic.h" + class notifier; namespace vm diff --git a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp index ca1e9b1571c6..826b027e0635 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 e37c1bd313ec..9a31a66e34dd 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 b9f46006c7a6..874c44fbe657 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" #define DEBUG_VERTEX_STREAMING 0 diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.h b/rpcs3/Emu/RSX/Common/BufferUtils.h index 01d98e6cd79d..466467aee61a 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 f37dd6dc2fe7..1aafb66e00f2 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.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 7406d1a8b0de..48df217ffdec 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -1,8 +1,6 @@ #pragma once #include "../rsx_cache.h" -#include "../rsx_utils.h" -#include "../RSXThread.h" #include "texture_cache_utils.h" #include "TextureUtils.h" diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h index 1262832e5db4..826d46be6858 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 "TextureUtils.h" #include diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h index 1bf9925fdafc..6c0224945d7a 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 1ca0a87aca2e..82d246933568 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include -#include "Emu/Memory/vm.h" -#include "Emu/System.h" #include "GLFragmentProgram.h" -#include "../Common/ProgramStateCache.h" + +#include "Emu/System.h" #include "GLCommonDecompiler.h" -#include "../GCM.h" +#include "OpenGL.h" + +#include std::string GLFragmentDecompilerThread::getFloatTypeName(size_t elementCount) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h index 9e65e2370f1d..3dc8e8af8f34 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 20f295ab0872..c91d64328a18 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 e0f13931c7a4..ada66a97af0a 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 cd1d124b0760..6b160217d6cb 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 83ffc907aa45..9a0b039a8290 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 6582c116accc..54f0544e6e83 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 21753030362b..767800ad591f 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 27730d369525..b2a86b76da47 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 diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/Emu/RSX/GL/GLVertexProgram.h index f883be01bab7..db008c85bbe8 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 f1d61cc7c22e..2667ee7b939d 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 10dae66e217c..7c25174b92d1 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 66b91f45dc3c..f89c0727d494 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" -#include "RSXThread.h" #include "RSXTexture.h" + #include "rsx_methods.h" namespace rsx diff --git a/rpcs3/Emu/RSX/RSXTexture.h b/rpcs3/Emu/RSX/RSXTexture.h index 2d02a29dc5d1..b3700d6e2af7 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 c371b2853a0e..fdf227ef4339 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" @@ -1763,6 +1763,120 @@ namespace rsx } } + void thread::get_current_fragment_program_legacy(std::function(u32, fragment_texture&, bool)> get_surface_info) + { + auto &result = current_fragment_program = {}; + + const u32 shader_program = rsx::method_registers.shader_program_address(); + const u32 program_location = (shader_program & 0x3) - 1; + const u32 program_offset = (shader_program & ~0x3); + + result.addr = vm::base(rsx::get_address(program_offset, program_location)); + auto program_info = program_hash_util::fragment_program_utils::analyse_fragment_program(result.addr); + + result.addr = ((u8*)result.addr + program_info.program_start_offset); + result.offset = program_offset + program_info.program_start_offset; + result.ucode_length = program_info.program_ucode_length; + result.valid = true; + result.ctrl = rsx::method_registers.shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT); + result.unnormalized_coords = 0; + result.front_back_color_enabled = !rsx::method_registers.two_side_light_en(); + result.back_color_diffuse_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE); + result.back_color_specular_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR); + result.front_color_diffuse_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE); + result.front_color_specular_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR); + result.redirected_textures = 0; + result.shadow_textures = 0; + + const auto resolution_scale = rsx::get_resolution_scale(); + + for (u32 i = 0; i < rsx::limits::fragment_textures_count; ++i) + { + auto &tex = rsx::method_registers.fragment_textures[i]; + result.texture_scale[i][0] = 1.f; + result.texture_scale[i][1] = 1.f; + result.textures_alpha_kill[i] = 0; + result.textures_zfunc[i] = 0; + + if (tex.enabled() && (program_info.referenced_textures_mask & (1 << i))) + { + result.texture_dimensions |= ((u32)tex.get_extended_texture_dimension() << (i << 1)); + + if (tex.alpha_kill_enabled()) + { + //alphakill can be ignored unless a valid comparison function is set + const rsx::comparison_function func = (rsx::comparison_function)tex.zfunc(); + if (func < rsx::comparison_function::always && func > rsx::comparison_function::never) + { + result.textures_alpha_kill[i] = 1; + result.textures_zfunc[i] = (u8)func; + } + } + + const u32 texaddr = rsx::get_address(tex.offset(), tex.location()); + const u32 raw_format = tex.format(); + + if (raw_format & CELL_GCM_TEXTURE_UN) + result.unnormalized_coords |= (1 << i); + + bool surface_exists; + u16 surface_pitch; + + std::tie(surface_exists, surface_pitch) = get_surface_info(texaddr, tex, false); + + if (surface_exists && surface_pitch) + { + if (raw_format & CELL_GCM_TEXTURE_UN) + { + result.texture_scale[i][0] = (resolution_scale * (float)surface_pitch) / tex.pitch(); + result.texture_scale[i][1] = resolution_scale; + } + } + else + { + std::tie(surface_exists, surface_pitch) = get_surface_info(texaddr, tex, true); + if (surface_exists) + { + if (raw_format & CELL_GCM_TEXTURE_UN) + { + result.texture_scale[i][0] = (resolution_scale * (float)surface_pitch) / tex.pitch(); + result.texture_scale[i][1] = resolution_scale; + } + + const u32 format = raw_format & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); + switch (format) + { + case CELL_GCM_TEXTURE_A8R8G8B8: + case CELL_GCM_TEXTURE_D8R8G8B8: + case CELL_GCM_TEXTURE_A4R4G4B4: + case CELL_GCM_TEXTURE_R5G6B5: + { + u32 remap = tex.remap(); + result.redirected_textures |= (1 << i); + result.texture_scale[i][2] = (f32&)remap; + break; + } + case CELL_GCM_TEXTURE_DEPTH16: + case CELL_GCM_TEXTURE_DEPTH16_FLOAT: + case CELL_GCM_TEXTURE_DEPTH24_D8: + case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT: + { + const auto compare_mode = (rsx::comparison_function)tex.zfunc(); + if (result.textures_alpha_kill[i] == 0 && + compare_mode < rsx::comparison_function::always && + compare_mode > rsx::comparison_function::never) + result.shadow_textures |= (1 << i); + break; + } + default: + LOG_ERROR(RSX, "Depth texture bound to pipeline with unexpected format 0x%X", format); + } + } + } + } + } + } + vertex_input_layout thread::analyse_inputs_interleaved() const { const rsx_state& state = rsx::method_registers; @@ -2050,120 +2164,6 @@ namespace rsx } } - void thread::get_current_fragment_program_legacy(std::function(u32, fragment_texture&, bool)> get_surface_info) - { - auto &result = current_fragment_program = {}; - - const u32 shader_program = rsx::method_registers.shader_program_address(); - const u32 program_location = (shader_program & 0x3) - 1; - const u32 program_offset = (shader_program & ~0x3); - - result.addr = vm::base(rsx::get_address(program_offset, program_location)); - auto program_info = program_hash_util::fragment_program_utils::analyse_fragment_program(result.addr); - - result.addr = ((u8*)result.addr + program_info.program_start_offset); - result.offset = program_offset + program_info.program_start_offset; - result.ucode_length = program_info.program_ucode_length; - result.valid = true; - result.ctrl = rsx::method_registers.shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT); - result.unnormalized_coords = 0; - result.front_back_color_enabled = !rsx::method_registers.two_side_light_en(); - result.back_color_diffuse_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE); - result.back_color_specular_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR); - result.front_color_diffuse_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE); - result.front_color_specular_output = !!(rsx::method_registers.vertex_attrib_output_mask() & CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR); - result.redirected_textures = 0; - result.shadow_textures = 0; - - const auto resolution_scale = rsx::get_resolution_scale(); - - for (u32 i = 0; i < rsx::limits::fragment_textures_count; ++i) - { - auto &tex = rsx::method_registers.fragment_textures[i]; - result.texture_scale[i][0] = 1.f; - result.texture_scale[i][1] = 1.f; - result.textures_alpha_kill[i] = 0; - result.textures_zfunc[i] = 0; - - if (tex.enabled() && (program_info.referenced_textures_mask & (1 << i))) - { - result.texture_dimensions |= ((u32)tex.get_extended_texture_dimension() << (i << 1)); - - if (tex.alpha_kill_enabled()) - { - //alphakill can be ignored unless a valid comparison function is set - const rsx::comparison_function func = (rsx::comparison_function)tex.zfunc(); - if (func < rsx::comparison_function::always && func > rsx::comparison_function::never) - { - result.textures_alpha_kill[i] = 1; - result.textures_zfunc[i] = (u8)func; - } - } - - const u32 texaddr = rsx::get_address(tex.offset(), tex.location()); - const u32 raw_format = tex.format(); - - if (raw_format & CELL_GCM_TEXTURE_UN) - result.unnormalized_coords |= (1 << i); - - bool surface_exists; - u16 surface_pitch; - - std::tie(surface_exists, surface_pitch) = get_surface_info(texaddr, tex, false); - - if (surface_exists && surface_pitch) - { - if (raw_format & CELL_GCM_TEXTURE_UN) - { - result.texture_scale[i][0] = (resolution_scale * (float)surface_pitch) / tex.pitch(); - result.texture_scale[i][1] = resolution_scale; - } - } - else - { - std::tie(surface_exists, surface_pitch) = get_surface_info(texaddr, tex, true); - if (surface_exists) - { - if (raw_format & CELL_GCM_TEXTURE_UN) - { - result.texture_scale[i][0] = (resolution_scale * (float)surface_pitch) / tex.pitch(); - result.texture_scale[i][1] = resolution_scale; - } - - const u32 format = raw_format & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); - switch (format) - { - case CELL_GCM_TEXTURE_A8R8G8B8: - case CELL_GCM_TEXTURE_D8R8G8B8: - case CELL_GCM_TEXTURE_A4R4G4B4: - case CELL_GCM_TEXTURE_R5G6B5: - { - u32 remap = tex.remap(); - result.redirected_textures |= (1 << i); - result.texture_scale[i][2] = (f32&)remap; - break; - } - case CELL_GCM_TEXTURE_DEPTH16: - case CELL_GCM_TEXTURE_DEPTH16_FLOAT: - case CELL_GCM_TEXTURE_DEPTH24_D8: - case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT: - { - const auto compare_mode = (rsx::comparison_function)tex.zfunc(); - if (result.textures_alpha_kill[i] == 0 && - compare_mode < rsx::comparison_function::always && - compare_mode > rsx::comparison_function::never) - result.shadow_textures |= (1 << i); - break; - } - default: - LOG_ERROR(RSX, "Depth texture bound to pipeline with unexpected format 0x%X", format); - } - } - } - } - } - } - void thread::reset() { rsx::method_registers.reset(); diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 70d541a7ec61..335897b70271 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -1,14 +1,9 @@ #pragma once -#include #include -#include -#include -#include #include #include "GCM.h" #include "rsx_cache.h" -#include "RSXTexture.h" #include "RSXVertexProgram.h" #include "RSXFragmentProgram.h" #include "rsx_methods.h" @@ -453,6 +448,7 @@ namespace rsx RSXFragmentProgram current_fragment_program = {}; void get_current_vertex_program(const std::array, rsx::limits::vertex_textures_count>& sampler_descriptors, bool skip_textures = false, bool skip_vertex_inputs = true); + void get_current_fragment_program_legacy(std::function(u32, fragment_texture&, bool)> get_surface_info); /** * Gets current fragment program and associated fragment state @@ -460,7 +456,6 @@ namespace rsx * returns whether surface is a render target and surface pitch in native format */ void get_current_fragment_program(const std::array, rsx::limits::fragment_textures_count>& sampler_descriptors); - void get_current_fragment_program_legacy(std::function(u32, fragment_texture&, bool)> get_surface_info); public: double fps_limit = 59.94; diff --git a/rpcs3/Emu/RSX/RSXVertexProgram.h b/rpcs3/Emu/RSX/RSXVertexProgram.h index b22e4bdd3ff4..8643cb13dfa0 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 6d75e021e875..86307a758c41 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 9b5ebdfe2bae..cc84322a196c 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -8,9 +8,10 @@ #include "VKOverlays.h" #include "VKProgramBuffer.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 e1526de208a0..ef3f02345b59 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1,9 +1,8 @@ -#pragma once +#pragma once #include "stdafx.h" #include #include -#include #include #include #include @@ -19,9 +18,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 cd8280cf1d38..730e4a5fd9df 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -6,7 +6,6 @@ #include "../Common/surface_store.h" #include "../Common/TextureUtils.h" #include "VKFormats.h" -#include "../rsx_utils.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index d2d42a90a8ec..74a016607d36 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 bd861028e4d8..c91cdfc6f845 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 @@ -133,6 +133,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 79381d20275a..30b875bd3385 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 9630053d0731..7fdeb5b5fc47 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 055ec9ae9d97..7018f4d171e4 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" namespace rsx {