From cd9ff08235a895b906177542d91b7fce86a4493a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Apr 2023 19:21:26 +0200 Subject: [PATCH] Decrease some include madness --- rpcs3/Emu/Cell/Modules/cellAudio.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAudioOut.cpp | 1 + rpcs3/Emu/Cell/Modules/cellCamera.cpp | 1 + rpcs3/Emu/Cell/Modules/cellSpurs.cpp | 1 + rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp | 1 + rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp | 1 + rpcs3/Emu/Cell/PPUModule.cpp | 1 + rpcs3/Emu/Cell/lv2/lv2.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_fs.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_overlay.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_prx.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_rsxaudio.h | 1 + rpcs3/Emu/Cell/lv2/sys_spu.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_sync.h | 1 - rpcs3/Emu/Cell/lv2/sys_timer.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_uart.cpp | 1 + rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 1 + rpcs3/Emu/RSX/GL/GLHelpers.h | 1 - rpcs3/Emu/RSX/GL/GLOverlays.cpp | 1 + rpcs3/Emu/RSX/GL/GLOverlays.h | 1 + rpcs3/Emu/RSX/GL/GLVertexProgram.cpp | 1 + .../Overlays/HomeMenu/overlay_home_menu_main_menu.cpp | 1 + .../Overlays/HomeMenu/overlay_home_menu_settings.cpp | 1 + .../Overlays/HomeMenu/overlay_home_menu_settings.h | 2 +- rpcs3/Emu/RSX/RSXThread.h | 1 - rpcs3/Emu/System.h | 11 +---------- rpcs3/Emu/config_mode.h | 11 +++++++++++ rpcs3/Emu/system_config.h | 1 + rpcs3/emucore.vcxproj | 1 + rpcs3/emucore.vcxproj.filters | 3 +++ rpcs3/rpcs3qt/game_list_frame.h | 3 ++- rpcs3/rpcs3qt/main_window.cpp | 1 + rpcs3/rpcs3qt/main_window.h | 2 +- 35 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 rpcs3/Emu/config_mode.h diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp index 1454c4a418..dfc3d6ea24 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" - #include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_event.h" #include "cellAudio.h" diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp index fb4af3ff8a..ff7e630022 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp @@ -3,6 +3,7 @@ #include "Emu/Cell/lv2/sys_rsxaudio.h" #include "Emu/IdManager.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Loader/PSF.h" #include "cellAudioOut.h" diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index acca4f0846..836ae106f3 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -2,6 +2,7 @@ #include "cellCamera.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/lv2/sys_event.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index bb8a94dbe5..aebe51617c 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/IdManager.h" #include "Emu/Memory/vm_reservation.h" #include "Emu/Cell/PPUModule.h" diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp index 7e1fbd022b..3e29fdf427 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/VFS.h" #include "Emu/IdManager.h" #include "Emu/Cell/PPUModule.h" diff --git a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp index 8b362c022f..2f39c208a5 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" - #include "Emu/Cell/lv2/sys_lwmutex.h" #include "Emu/Cell/lv2/sys_lwcond.h" #include "Emu/Cell/lv2/sys_cond.h" diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp index 8882e685f0..a9ec0b5b3d 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/lv2/sys_lwmutex.h" diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index e9fbaed7b6..a817c7d46e 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -9,6 +9,7 @@ #include "Crypto/unself.h" #include "Loader/ELF.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/VFS.h" #include "Emu/Cell/PPUOpcodes.h" diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index 1482fa7a3f..88ae1c639a 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_locking.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index 5c27bb7a32..17896af853 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -7,6 +7,7 @@ #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" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp index e573bb2ab4..79baf0ce6b 100644 --- a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp @@ -4,6 +4,7 @@ #include "Emu/Memory/vm_ptr.h" #include "Emu/VFS.h" #include "Emu/IdManager.h" +#include "Emu/system_config.h" #include "Crypto/unself.h" #include "Crypto/unedat.h" #include "Loader/ELF.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp index ebddeb06dd..6bc148ceda 100644 --- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "sys_prx.h" +#include "Emu/system_config.h" #include "Emu/VFS.h" #include "Emu/IdManager.h" #include "Crypto/unself.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp index 07bcb48b77..f82b01488d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp @@ -2,6 +2,7 @@ #include "Emu/Memory/vm.h" #include "Emu/IdManager.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "sys_process.h" #include "sys_rsxaudio.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h index 13c12b1221..5a625728ac 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h +++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h @@ -5,6 +5,7 @@ #include "Utilities/simple_ringbuf.h" #include "Utilities/transactional_storage.h" #include "Utilities/cond.h" +#include "Emu/system_config_types.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Audio/AudioDumper.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 5406818d8f..9e2cd527d2 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -2,6 +2,7 @@ #include "sys_spu.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/VFS.h" #include "Emu/IdManager.h" #include "Crypto/unself.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_sync.h b/rpcs3/Emu/Cell/lv2/sys_sync.h index e0b12392f4..d394413b84 100644 --- a/rpcs3/Emu/Cell/lv2/sys_sync.h +++ b/rpcs3/Emu/Cell/lv2/sys_sync.h @@ -8,7 +8,6 @@ #include "Emu/Cell/timers.hpp" #include "Emu/IdManager.h" #include "Emu/IPC.h" -#include "Emu/system_config.h" #include diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/Emu/Cell/lv2/sys_timer.cpp index 84ef5ba281..44609ecc89 100644 --- a/rpcs3/Emu/Cell/lv2/sys_timer.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_timer.cpp @@ -2,11 +2,11 @@ #include "sys_timer.h" #include "Emu/IdManager.h" - #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/timers.hpp" #include "Emu/System.h" +#include "Emu/system_config.h" #include "sys_event.h" #include "sys_process.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.cpp b/rpcs3/Emu/Cell/lv2/sys_uart.cpp index 7284f8f981..2982cf0bc9 100644 --- a/rpcs3/Emu/Cell/lv2/sys_uart.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_uart.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/lv2/sys_sync.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 0c698056bd..d5f88ff7e3 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -5,6 +5,7 @@ #include #include "Emu/System.h" +#include "Emu/system_config.h" #include "Emu/Memory/vm.h" #include "Emu/IdManager.h" #include "Emu/vfs_config.h" diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index 3ab61751df..368cd9e124 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -11,7 +11,6 @@ #include "../Common/TextureUtils.h" #include "../Program/GLSLTypes.h" -#include "Emu/system_config.h" #include "Utilities/mutex.h" #include "Utilities/geometry.h" #include "Utilities/File.h" diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp index 4777d8b7f1..d4e779453d 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp +++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp @@ -1,5 +1,6 @@ #include "GLOverlays.h" +#include "Emu/system_config.h" #include "../rsx_utils.h" #include "../Program/RSXOverlay.h" diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h index 5a9a9385b3..47454d8523 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.h +++ b/rpcs3/Emu/RSX/GL/GLOverlays.h @@ -1,5 +1,6 @@ #pragma once +#include "Emu/system_config_types.h" #include "util/types.hpp" #include "../Common/simple_array.hpp" #include "../Overlays/overlays.h" diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index c4d7b4bf8a..fce7786b30 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -2,6 +2,7 @@ #include "GLVertexProgram.h" #include "Emu/System.h" +#include "Emu/system_config.h" #include "GLCommonDecompiler.h" #include "../Program/GLSLCommon.h" 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 ba260c216c..4eddf98e9f 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 @@ -2,6 +2,7 @@ #include "overlay_home_menu_main_menu.h" #include "overlay_home_menu_components.h" #include "Emu/System.h" +#include "Emu/system_config.h" extern atomic_t g_user_asked_for_recording; extern atomic_t g_user_asked_for_screenshot; diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index 80f090ae1c..257e4e983a 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "overlay_home_menu_settings.h" #include "overlay_home_menu_components.h" +#include "Emu/system_config.h" // TODO: Localization of the setting names // TODO: Localization of the dropdown values diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h index 85779c23a2..1b7419fb78 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h @@ -2,7 +2,7 @@ #include "overlay_home_menu_page.h" #include "Emu/System.h" -#include "Emu/system_config.h" +#include "Utilities/Config.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 82f5277d63..a4cc71b640 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -26,7 +26,6 @@ #include "Emu/Cell/lv2/sys_rsx.h" #include "Emu/IdManager.h" -#include "Emu/system_config.h" #include "Core/RSXDisplay.h" #include "Core/RSXFrameBuffer.h" diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index d90f4c05b3..657a1a5ff3 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -3,6 +3,7 @@ #include "util/types.hpp" #include "util/atomic.hpp" #include "Utilities/bit_set.h" +#include "config_mode.h" #include "games_config.h" #include #include @@ -57,16 +58,6 @@ constexpr bool is_error(game_boot_result res) return res != game_boot_result::no_errors; } -enum class cfg_mode -{ - custom, // Prefer regular custom config. Fall back to global config. - custom_selection, // Use user-selected custom config. Fall back to global config. - global, // Use global config. - config_override, // Use config override. This does not use the global VFS settings! Fall back to global config. - continuous, // Use same config as on last boot. Fall back to global config. - default_config // Use the default values of the config entries. -}; - struct EmuCallbacks { std::function, atomic_t*)> call_from_main_thread; diff --git a/rpcs3/Emu/config_mode.h b/rpcs3/Emu/config_mode.h new file mode 100644 index 0000000000..0ca006e0c8 --- /dev/null +++ b/rpcs3/Emu/config_mode.h @@ -0,0 +1,11 @@ +#pragma once + +enum class cfg_mode +{ + custom, // Prefer regular custom config. Fall back to global config. + custom_selection, // Use user-selected custom config. Fall back to global config. + global, // Use global config. + config_override, // Use config override. This does not use the global VFS settings! Fall back to global config. + continuous, // Use same config as on last boot. Fall back to global config. + default_config // Use the default values of the config entries. +}; diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index e2f3488330..986eaf1cef 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -1,5 +1,6 @@ #pragma once +#include "config_mode.h" #include "system_config_types.h" #include "Utilities/Config.h" diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 57509a687c..e9bd8a9efb 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -497,6 +497,7 @@ + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 31d0ce0a18..f4d6cbd2dc 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -2317,6 +2317,9 @@ Emu + + Emu + diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index b09c8f5ade..c3e7827139 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -6,7 +6,7 @@ #include "shortcut_utils.h" #include "Utilities/lockless.h" #include "Utilities/mutex.h" -#include "Emu/System.h" +#include "Emu/config_mode.h" #include #include @@ -17,6 +17,7 @@ #include #include +#include class game_list_grid; class gui_settings; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 927d3e246f..820f2e007c 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -51,6 +51,7 @@ #include "Emu/IdManager.h" #include "Emu/VFS.h" #include "Emu/vfs_config.h" +#include "Emu/System.h" #include "Emu/system_utils.hpp" #include "Crypto/unpkg.h" diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 02f9ac6640..7deef4f59e 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -13,7 +13,7 @@ #include "update_manager.h" #include "settings.h" #include "shortcut_handler.h" -#include "Emu/System.h" +#include "Emu/config_mode.h" #include