Decrease some include madness

2025-02-21 18:39:57 +00:00 · 2023-04-26 19:21:26 +02:00 · 2023-04-26 19:21:26 +02:00 · cd9ff08235
commit cd9ff08235
parent 957713015a
35 changed files with 45 additions and 19 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 <thread>

--- 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"

--- 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"
--- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp
@ -5,6 +5,7 @@

 #include <queue>
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
 #include "Emu/vfs_config.h"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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<bool> g_user_asked_for_recording;
 extern atomic_t<bool> g_user_asked_for_screenshot;
--- 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
--- 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
 {
--- 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"
--- 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 <functional>
 #include <memory>
@ -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<void(std::function<void()>, atomic_t<bool>*)> call_from_main_thread;
--- a/rpcs3/Emu/config_mode.h
+++ 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.
+};
--- 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"

--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@ -497,6 +497,7 @@
    <ClInclude Include="Emu\Cell\Modules\cellStorage.h" />
    <ClInclude Include="Emu\Cell\Modules\libfs_utility_init.h" />
    <ClInclude Include="Emu\Cell\Modules\sys_crashdump.h" />
+    <ClInclude Include="Emu\config_mode.h" />
    <ClInclude Include="Emu\CPU\sse2neon.h" />
    <ClInclude Include="Emu\games_config.h" />
    <ClInclude Include="Emu\Io\camera_config.h" />
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@ -2317,6 +2317,9 @@
    <ClInclude Include="Emu\games_config.h">
      <Filter>Emu</Filter>
    </ClInclude>
+    <ClInclude Include="Emu\config_mode.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">
--- 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 <QMainWindow>
 #include <QToolBar>
@ -17,6 +17,7 @@
 #include <QTimer>

 #include <memory>
+#include <set>

 class game_list_grid;
 class gui_settings;
--- 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"
--- 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 <memory>