From fb62c6d03a3654138719e8b2dfdc139f106b104d Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 13 Sep 2026 16:48:35 +0200 Subject: [PATCH] clean up some includes --- Utilities/Thread.cpp | 1 + rpcs3/Emu/Cell/Modules/cellMic.h | 1 + rpcs3/Emu/Cell/Modules/cellNetCtl.cpp | 1 - rpcs3/Emu/Cell/Modules/cellVideoOut.cpp | 1 + rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp | 1 - rpcs3/Emu/Cell/lv2/sys_fs.cpp | 1 - rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 1 + rpcs3/Emu/Io/LogitechG27.cpp | 2 -- rpcs3/Emu/Io/usb_microphone.cpp | 2 -- rpcs3/Emu/NP/clans_client.cpp | 1 - rpcs3/Emu/NP/ip_address.cpp | 1 - rpcs3/Emu/RSX/Common/surface_utils.h | 1 + rpcs3/Emu/RSX/Common/texture_cache.cpp | 1 + rpcs3/Emu/RSX/Core/RSXContext.cpp | 1 + rpcs3/Emu/RSX/Core/RSXDisplay.cpp | 2 ++ rpcs3/Emu/RSX/Core/RSXReservationLock.hpp | 1 + rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 1 - rpcs3/Emu/RSX/GSRender.cpp | 1 + rpcs3/Emu/RSX/GSRender.h | 1 + rpcs3/Emu/RSX/NV47/FW/draw_call.hpp | 1 + rpcs3/Emu/RSX/NV47/HW/nv406e.cpp | 1 + rpcs3/Emu/RSX/NV47/HW/nv4097.cpp | 2 +- .../RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp | 1 - rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp | 1 + rpcs3/Emu/RSX/Overlays/overlays.cpp | 1 + rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp | 1 - rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h | 2 -- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 1 - rpcs3/Emu/RSX/RSXTexture.cpp | 1 - rpcs3/Emu/RSX/Utils/rsx_utils.cpp | 1 + rpcs3/Emu/RSX/Utils/rsx_utils.h | 1 - rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp | 1 + rpcs3/Emu/RSX/VK/VKAsyncScheduler.h | 1 + rpcs3/Emu/RSX/VK/VKCompute.h | 1 + rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp | 1 + rpcs3/Emu/RSX/VK/VKVertexProgram.cpp | 1 + rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp | 2 ++ rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/commands.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/device.cpp | 5 +++++ rpcs3/Emu/RSX/VK/vkutils/device.h | 2 +- rpcs3/Emu/RSX/VK/vkutils/instance.cpp | 2 ++ rpcs3/Emu/RSX/VK/vkutils/memory.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/scratch.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp | 1 + rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp | 1 + rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp | 1 + rpcs3/Emu/RSX/VK/vkutils/sync.cpp | 1 + rpcs3/Emu/RSX/rsx_methods.cpp | 2 +- rpcs3/Emu/system_config.cpp | 2 -- rpcs3/Emu/system_progress.cpp | 1 + rpcs3/Input/camera_video_sink.cpp | 1 - rpcs3/headless_application.cpp | 2 +- rpcs3/rpcs3qt/debugger_frame.cpp | 1 + rpcs3/rpcs3qt/main_window.cpp | 1 - 57 files changed, 47 insertions(+), 25 deletions(-) diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index cc032b216a..a831ac7c09 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -6,6 +6,7 @@ #include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_process.h" #include "Emu/RSX/RSXThread.h" +#include "Emu/system_config.h" #include "Thread.h" #include "Utilities/JIT.h" #include diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index a07cec23a8..7d09546580 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -2,6 +2,7 @@ #include "Utilities/Thread.h" #include "Utilities/mutex.h" +#include "Emu/system_config_types.h" #include "alc.h" diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp index 83b001cc52..31e460db03 100644 --- a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp index 83bbb18ba8..903df5ffd9 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/system_config.h" #include "Emu/system_config_types.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUModule.h" diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp index 098761b259..6357224070 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" #include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/timers.hpp" diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index 4e902d6ae2..daa9a1653a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -6,7 +6,6 @@ #include "Emu/Cell/PPUThread.h" #include "Crypto/unedat.h" -#include "Emu/System.h" #include "Emu/system_config.h" #include "Emu/VFS.h" #include "Emu/vfs_config.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index d7ec048136..b15a33f879 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -2,6 +2,7 @@ #include "sys_rsx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/timers.hpp" diff --git a/rpcs3/Emu/Io/LogitechG27.cpp b/rpcs3/Emu/Io/LogitechG27.cpp index bddbded121..20fef8cf98 100644 --- a/rpcs3/Emu/Io/LogitechG27.cpp +++ b/rpcs3/Emu/Io/LogitechG27.cpp @@ -13,8 +13,6 @@ #include "LogitechG27.h" #include "Emu/Cell/lv2/sys_usbd.h" -#include "Emu/system_config.h" -#include "Input/pad_thread.h" #include "Input/sdl_instance.h" LOG_CHANNEL(logitech_g27_log, "logitech_g27"); diff --git a/rpcs3/Emu/Io/usb_microphone.cpp b/rpcs3/Emu/Io/usb_microphone.cpp index 39bf45d91d..eca24065ba 100644 --- a/rpcs3/Emu/Io/usb_microphone.cpp +++ b/rpcs3/Emu/Io/usb_microphone.cpp @@ -1,10 +1,8 @@ #include "stdafx.h" -#include "Emu/system_config.h" #include "Emu/IdManager.h" #include "Emu/Io/usb_microphone.h" #include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Cell/Modules/cellMic.h" -#include "Input/pad_thread.h" LOG_CHANNEL(usb_mic_log); diff --git a/rpcs3/Emu/NP/clans_client.cpp b/rpcs3/Emu/NP/clans_client.cpp index f6f26c07df..ae859d7df2 100644 --- a/rpcs3/Emu/NP/clans_client.cpp +++ b/rpcs3/Emu/NP/clans_client.cpp @@ -17,7 +17,6 @@ #pragma clang diagnostic pop #endif -#include #include #include diff --git a/rpcs3/Emu/NP/ip_address.cpp b/rpcs3/Emu/NP/ip_address.cpp index fe0124c74d..0c9d16b594 100644 --- a/rpcs3/Emu/NP/ip_address.cpp +++ b/rpcs3/Emu/NP/ip_address.cpp @@ -3,7 +3,6 @@ #include "ip_address.h" #include "Utilities/StrFmt.h" #include "Emu/IdManager.h" -#include "util/endian.hpp" #include "util/types.hpp" #include "Emu/NP/rpcn_config.h" #include "Emu/Cell/lv2/sys_net/sys_net_helpers.h" diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h index 0db764f0b7..429d949197 100644 --- a/rpcs3/Emu/RSX/Common/surface_utils.h +++ b/rpcs3/Emu/RSX/Common/surface_utils.h @@ -5,6 +5,7 @@ #include "TextureUtils.h" #include "../Utils/rsx_utils.h" #include "Emu/Memory/vm.h" +#include "Emu/system_config.h" #define ENABLE_SURFACE_CACHE_DEBUG 0 diff --git a/rpcs3/Emu/RSX/Common/texture_cache.cpp b/rpcs3/Emu/RSX/Common/texture_cache.cpp index 3881cb63e6..75020efd08 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.cpp +++ b/rpcs3/Emu/RSX/Common/texture_cache.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "Emu/RSX/RSXThread.h" +#include "Emu/system_config.h" #include "Utilities/address_range.h" #include "util/fnv_hash.hpp" diff --git a/rpcs3/Emu/RSX/Core/RSXContext.cpp b/rpcs3/Emu/RSX/Core/RSXContext.cpp index 43de7e1c74..ddfd4aaea3 100644 --- a/rpcs3/Emu/RSX/Core/RSXContext.cpp +++ b/rpcs3/Emu/RSX/Core/RSXContext.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/RSX/Utils/algorithm.hpp" +#include "Emu/system_config.h" #include "RSXContext.h" namespace rsx diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.cpp b/rpcs3/Emu/RSX/Core/RSXDisplay.cpp index e5f5371840..5bf899f5eb 100644 --- a/rpcs3/Emu/RSX/Core/RSXDisplay.cpp +++ b/rpcs3/Emu/RSX/Core/RSXDisplay.cpp @@ -4,6 +4,8 @@ #include "../Common/simple_array.hpp" #include "../Utils/rsx_utils.h" +#include "Emu/system_config.h" + namespace rsx { std::string framebuffer_dimensions_t::to_string(bool skip_aa_suffix) const diff --git a/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp b/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp index 7a4ab76624..a549adfe8c 100644 --- a/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp +++ b/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp @@ -2,6 +2,7 @@ #include #include "../RSXThread.h" +#include "Emu/system_config.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index f6d8a25aa6..4339362012 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -4,7 +4,6 @@ #include "Emu/system_config.h" #include "GLCommonDecompiler.h" #include "../Program/GLSLCommon.h" -#include "../RSXThread.h" std::string GLFragmentDecompilerThread::getFloatTypeName(usz elementCount) { diff --git a/rpcs3/Emu/RSX/GSRender.cpp b/rpcs3/Emu/RSX/GSRender.cpp index e35ea4ca37..e87d7fa15e 100644 --- a/rpcs3/Emu/RSX/GSRender.cpp +++ b/rpcs3/Emu/RSX/GSRender.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "Emu/emu_callbacks.h" +#include "Emu/system_config.h" #include "GSRender.h" GSRender::GSRender(utils::serial* ar) noexcept : rsx::thread(ar) diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/Emu/RSX/GSRender.h index f597b5562b..f2174b09a3 100644 --- a/rpcs3/Emu/RSX/GSRender.h +++ b/rpcs3/Emu/RSX/GSRender.h @@ -2,6 +2,7 @@ #include "GSFrameBase.h" #include "Emu/RSX/RSXThread.h" +#include "Emu/system_config_types.h" enum wm_event { diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp index 7b2591f544..53ef60aff6 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp @@ -4,6 +4,7 @@ #include "Emu/RSX/Common/simple_array.hpp" #include "Emu/RSX/gcm_enums.h" +#include "util/logs.hpp" namespace rsx { diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp index 3eaebb1528..fd8ec80c72 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp @@ -3,6 +3,7 @@ #include "nv47_sync.hpp" #include "Emu/RSX/RSXThread.h" +#include "Emu/system_config.h" #include "context_accessors.define.h" diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp index e810839b9d..313daf12c2 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp @@ -4,7 +4,7 @@ #include "Emu/RSX/RSXThread.h" #include "Emu/RSX/Common/BufferUtils.h" -#include "Emu/RSX/Host/MM.h" +#include "Emu/system_config.h" #define RSX(ctx) ctx->rsxthr #define REGS(ctx) (&rsx::method_registers) diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp index fb5eadf501..59a7ec31b5 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp @@ -7,7 +7,6 @@ #include "Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h" #include "Emu/RSX/Overlays/overlay_manager.h" #include "Emu/System.h" -#include "Emu/system_config.h" #include "Emu/Cell/Modules/sceNpTrophy.h" extern atomic_t g_user_asked_for_recording; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp index a3a53dc868..56903b2a49 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp @@ -4,6 +4,7 @@ #include "Emu/RSX/RSXThread.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/PPUThread.h" +#include "Emu/system_config.h" #include #include diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp index 9a12731f9f..4f7c7bf7f4 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp @@ -7,6 +7,7 @@ #include "Emu/RSX/RSXThread.h" #include "Emu/emu_callbacks.h" #include "Emu/System.h" +#include "Emu/system_config.h" LOG_CHANNEL(overlays); diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp index c5141b7fe7..f98afcd0d6 100644 --- a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "FragmentProgramDecompiler.h" -#include "ProgramStateCache.h" #include "Assembler/Passes/FP/RegisterAnnotationPass.h" #include "Assembler/Passes/FP/RegisterDependencyPass.h" diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h index f3cfaa8730..8032abd6f2 100644 --- a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h @@ -2,8 +2,6 @@ #include "ShaderParam.h" #include "RSXFragmentProgram.h" -#include "Assembler/CFG.h" - #include #include diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 221e24ea75..6a3f8ea500 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "ProgramStateCache.h" -#include "FragmentProgramDecompiler.h" #include "Emu/system_config.h" #include "Emu/RSX/Core/RSXDriverState.h" #include "util/sysinfo.hpp" diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp index a710d66394..bc7c379e05 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -2,7 +2,6 @@ #include "RSXTexture.h" #include "Common/TextureUtils.h" -#include "Program/GLSLCommon.h" #include "Utils/algorithm.hpp" #include "Utils/rsx_utils.h" diff --git a/rpcs3/Emu/RSX/Utils/rsx_utils.cpp b/rpcs3/Emu/RSX/Utils/rsx_utils.cpp index 439aea4a92..b96881dbcc 100644 --- a/rpcs3/Emu/RSX/Utils/rsx_utils.cpp +++ b/rpcs3/Emu/RSX/Utils/rsx_utils.cpp @@ -2,6 +2,7 @@ #include "rsx_utils.h" #include "Emu/RSX/rsx_methods.h" #include "Emu/Cell/Modules/cellVideoOut.h" +#include "Emu/system_config.h" #ifdef _MSC_VER #pragma warning(push, 0) diff --git a/rpcs3/Emu/RSX/Utils/rsx_utils.h b/rpcs3/Emu/RSX/Utils/rsx_utils.h index 1c21007a70..63bba0fb07 100644 --- a/rpcs3/Emu/RSX/Utils/rsx_utils.h +++ b/rpcs3/Emu/RSX/Utils/rsx_utils.h @@ -1,6 +1,5 @@ #pragma once -#include "../../system_config.h" #include "Utilities/address_range.h" #include "Utilities/geometry.h" #include "../gcm_enums.h" diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp index fd4e667ef9..3206bdc9a2 100644 --- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp +++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp @@ -1,5 +1,6 @@ #include "VKAsyncScheduler.h" #include "VKHelpers.h" +#include "Emu/system_config.h" #include diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h index 0b00830804..9981a1f115 100644 --- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h +++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h @@ -3,6 +3,7 @@ #include "vkutils/commands.h" #include "vkutils/sync.h" #include "Utilities/mutex.h" +#include "Emu/system_config_types.h" #define VK_MAX_ASYNC_COMPUTE_QUEUES 256 diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h index 9b69688f2e..194af88481 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.h +++ b/rpcs3/Emu/RSX/VK/VKCompute.h @@ -8,6 +8,7 @@ #include "Utilities/StrUtil.h" #include "util/asm.hpp" +#include "util/logs.hpp" #include diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp index 85e981c4f7..ff70d1cfa2 100644 --- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp @@ -3,6 +3,7 @@ #include "VKRenderPass.h" #include "vkutils/device.h" #include "Utilities/Thread.h" +#include "Emu/system_config.h" #include "util/sysinfo.hpp" diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp index 23efdce865..3d78e15781 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp @@ -5,6 +5,7 @@ #include "VKHelpers.h" #include "vkutils/device.h" #include "../Program/GLSLCommon.h" +#include "Emu/system_config.h" std::string VKVertexDecompilerThread::getFloatTypeName(usz elementCount) { diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp index dd10f2a22a..080bc88b58 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp +++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp @@ -4,6 +4,8 @@ #include "../fsr_pass.h" +#include "Emu/system_config.h" + #if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wignored-qualifiers" diff --git a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp b/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp index 47f79ad98a..b3d4ff8c74 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp @@ -1,6 +1,7 @@ #include "buffer_object.h" #include "device.h" #include "shared.h" +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp index 549d557afb..9740d7407e 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp @@ -2,6 +2,7 @@ #include "device.h" #include "shared.h" #include "sync.h" +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp b/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp index 9534b5f57c..6d9d8cd8eb 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp @@ -6,6 +6,7 @@ #include "../VKHelpers.h" #include "../VKResourceManager.h" #include "Emu/IdManager.h" +#include "Emu/system_config.h" #include diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp index 9650d7e855..74539e14e6 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp @@ -1,6 +1,7 @@ #include "Emu/IdManager.h" #include "descriptors.h" #include "garbage_collector.h" +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index d1f6ba6e54..d0435133ee 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -933,6 +933,11 @@ namespace vk memory_map.device_local.rebalance(); } + bool render_device::get_debug_utils_support() const + { + return g_cfg.video.renderdoc_compatiblity && pgpu->optional_features_support.debug_utils; + } + void render_device::dump_debug_info( const std::vector& requested_extensions, const VkPhysicalDeviceFeatures& requested_features) const diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.h b/rpcs3/Emu/RSX/VK/vkutils/device.h index 501c50825b..757874d8aa 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.h +++ b/rpcs3/Emu/RSX/VK/vkutils/device.h @@ -186,7 +186,7 @@ namespace vk bool get_unrestricted_depth_range_support() const { return pgpu->optional_features_support.unrestricted_depth_range; } bool get_external_memory_host_support() const { return pgpu->optional_features_support.external_memory_host; } bool get_surface_capabilities_2_support() const { return pgpu->optional_features_support.surface_capabilities_2; } - bool get_debug_utils_support() const { return g_cfg.video.renderdoc_compatiblity && pgpu->optional_features_support.debug_utils; } + bool get_debug_utils_support() const; bool get_framebuffer_loops_support() const { return pgpu->optional_features_support.framebuffer_loops; } bool get_barycoords_support() const { return pgpu->optional_features_support.barycentric_coords; } bool get_synchronization2_support() const { return pgpu->optional_features_support.synchronization_2; } diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp index cd13075f8c..e59c249482 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp @@ -1,6 +1,8 @@ #include "stdafx.h" #include "instance.h" +#include "Emu/system_config.h" + namespace vk { // Supported extensions diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.cpp b/rpcs3/Emu/RSX/VK/vkutils/memory.cpp index b7f018a799..7e1a2a00a6 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/memory.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/memory.cpp @@ -2,6 +2,7 @@ #include "memory.h" #include "Emu/RSX/Utils/algorithm.hpp" +#include "Emu/system_config.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp index 04cfded55c..81af86be1c 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp @@ -5,6 +5,7 @@ #include "../VKResourceManager.h" #include +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp index fe4464cb03..2fd2dc07bf 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "swapchain.h" +#include "Emu/system_config.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp index ec893da8e8..8715bba56d 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp @@ -1,6 +1,7 @@ #pragma once #include "swapchain_core.h" +#include "util/logs.hpp" #ifdef HAVE_X11 #include diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp index c509d7cffa..d916e4f8be 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp @@ -1,6 +1,7 @@ #pragma once #include "swapchain_core.h" +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp index 6d36283ca1..4041f4fa09 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp @@ -10,6 +10,7 @@ #include "util/sysinfo.hpp" #include "util/asm.hpp" +#include "util/logs.hpp" namespace vk { diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index 8aea1a4932..9ee302a804 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -4,8 +4,8 @@ #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/lv2/sys_rsx.h" - #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/RSX/NV47/HW/nv47.h" #include "Emu/RSX/NV47/HW/nv47_sync.hpp" #include "Emu/RSX/NV47/HW/context_accessors.define.h" // TODO: Context objects belong in FW not HW diff --git a/rpcs3/Emu/system_config.cpp b/rpcs3/Emu/system_config.cpp index cac546162d..e4649efe2c 100644 --- a/rpcs3/Emu/system_config.cpp +++ b/rpcs3/Emu/system_config.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "system_config.h" -#include "util/sysinfo.hpp" - #include cfg_root g_cfg{}; diff --git a/rpcs3/Emu/system_progress.cpp b/rpcs3/Emu/system_progress.cpp index a0ab2f6f72..bf3decbb66 100644 --- a/rpcs3/Emu/system_progress.cpp +++ b/rpcs3/Emu/system_progress.cpp @@ -8,6 +8,7 @@ #include "Emu/RSX/Overlays/overlay_compile_notification.h" #include "Emu/emu_callbacks.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "util/asm.hpp" diff --git a/rpcs3/Input/camera_video_sink.cpp b/rpcs3/Input/camera_video_sink.cpp index 7eb04472e1..9128e612f2 100644 --- a/rpcs3/Input/camera_video_sink.cpp +++ b/rpcs3/Input/camera_video_sink.cpp @@ -2,7 +2,6 @@ #include "camera_video_sink.h" #include "Emu/Cell/Modules/cellCamera.h" -#include "Emu/system_config.h" LOG_CHANNEL(camera_log, "Camera"); diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index eed0a29aed..a7a76a658c 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -1,7 +1,7 @@ #include "headless_application.h" #include "Emu/emu_callbacks.h" -#include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/RSX/Null/NullGSRender.h" #include "Emu/Cell/Modules/cellMsgDialog.h" #include "Emu/Cell/Modules/cellOskDialog.h" diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index cb508d0bdc..2c2ffbf220 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -13,6 +13,7 @@ #include "hex_validator.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/IdManager.h" #include "Emu/RSX/RSXThread.h" #include "Emu/Cell/lv2/sys_sync.h" diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 0d3bae38a5..fec2627e0b 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -86,7 +86,6 @@ #include "Utilities/Thread.h" #include "util/sysinfo.hpp" -#include "util/serialization_ext.hpp" #include "Input/gui_pad_thread.h"