From a2f98541b3d96285193098dfe2a71211bf297310 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 4 Aug 2024 14:29:27 +1000 Subject: [PATCH] Misc: Slim down some header includes --- data/resources/gamedb.yaml | 51 +++++++++++++++++++++--- src/core/achievements.cpp | 2 +- src/core/analog_controller.h | 5 ++- src/core/analog_joystick.cpp | 2 - src/core/analog_joystick.h | 5 ++- src/core/bios.cpp | 2 - src/core/cdrom.cpp | 1 + src/core/cheats.cpp | 4 +- src/core/cheats.h | 5 ++- src/core/cpu_code_cache.cpp | 2 + src/core/cpu_code_cache_private.h | 5 --- src/core/cpu_recompiler_code_generator.h | 7 ++-- src/core/digital_controller.h | 6 +-- src/core/dma.cpp | 1 - src/core/fullscreen_ui.cpp | 7 +--- src/core/fullscreen_ui.h | 1 - src/core/game_list.cpp | 3 +- src/core/gpu.cpp | 1 - src/core/gpu_backend.h | 6 ++- src/core/gpu_commands.cpp | 10 +++-- src/core/gpu_hw.cpp | 1 + src/core/gpu_hw.h | 2 - src/core/gpu_hw_shadergen.cpp | 2 +- src/core/gpu_hw_shadergen.h | 2 + src/core/gpu_sw.h | 5 +-- src/core/gpu_sw_backend.h | 2 - src/core/gpu_types.h | 5 ++- src/core/gte.cpp | 1 - src/core/guncon.h | 6 +-- src/core/host.h | 3 -- src/core/hotkeys.cpp | 1 + src/core/imgui_overlays.cpp | 6 --- src/core/justifier.cpp | 1 - src/core/justifier.h | 2 - src/core/mdec.cpp | 4 +- src/core/memory_card.cpp | 2 - src/core/multitap.cpp | 9 +++-- src/core/multitap.h | 9 +++-- src/core/negcon.h | 5 ++- src/core/negcon_rumble.h | 5 ++- src/core/pad.h | 2 + src/core/pcdrv.cpp | 8 ++-- src/core/pcdrv.h | 4 +- src/core/pine_server.cpp | 1 - src/core/playstation_mouse.h | 6 +-- src/core/psf_loader.cpp | 2 - src/core/psf_loader.h | 1 - src/core/save_state_version.h | 3 +- src/core/shader_cache_version.h | 1 + src/core/sio.cpp | 5 +-- src/core/sio.h | 3 +- src/core/spu.cpp | 1 + src/core/spu.h | 4 +- src/core/system.h | 6 --- src/core/timers.h | 1 + src/util/audio_stream.cpp | 1 - src/util/cd_image.cpp | 3 ++ src/util/cd_image.h | 4 +- 58 files changed, 142 insertions(+), 113 deletions(-) diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml index 148ff4a17..1190014ff 100644 --- a/data/resources/gamedb.yaml +++ b/data/resources/gamedb.yaml @@ -30721,6 +30721,9 @@ SLES-02495: linkCable: false SCPS-10003: name: "Crime Crackers (Japan)" + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController settings: @@ -31038,10 +31041,16 @@ SLUS-00530: linkCable: false SLED-02119: name: "Croc 2 (Europe) (Demo)" + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" traits: - ForcePGXPCPUMode SLES-02088: name: "Croc 2 (Europe) (En,Fr,De,Es,It,Nl,Sv)" + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - AnalogController - DigitalController @@ -56420,6 +56429,9 @@ SCES-00867: - SCES-00867 - SCES-10867 - SCES-20867 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56449,6 +56461,9 @@ SCES-10867: - SCES-00867 - SCES-10867 - SCES-20867 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56478,6 +56493,9 @@ SCES-20867: - SCES-00867 - SCES-10867 - SCES-20867 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56507,6 +56525,9 @@ SCES-00868: - SCES-00868 - SCES-10868 - SCES-20868 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56536,6 +56557,9 @@ SCES-10868: - SCES-00868 - SCES-10868 - SCES-20868 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56565,6 +56589,9 @@ SCES-20868: - SCES-00868 - SCES-10868 - SCES-20868 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56594,6 +56621,9 @@ SCES-00869: - SCES-00869 - SCES-10869 - SCES-20869 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56623,6 +56653,9 @@ SCES-10869: - SCES-00869 - SCES-10869 - SCES-20869 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56652,6 +56685,9 @@ SCES-20869: - SCES-00869 - SCES-10869 - SCES-20869 + compatibility: + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController traits: @@ -56711,6 +56747,9 @@ SLPS-00701: - SLPS-00700 - SLPS-00701 - SLPS-00702 + compatibility: + rating: NoIssues + versionTested: "0.1-841-g777809b" controllers: - DigitalController traits: @@ -56738,6 +56777,9 @@ SLPS-00702: - SLPS-00700 - SLPS-00701 - SLPS-00702 + compatibility: + rating: NoIssues + versionTested: "0.1-841-g777809b" controllers: - DigitalController traits: @@ -58208,9 +58250,8 @@ SCES-03884: SLPS-00148: name: "Firemen 2, The - Pete & Danny (Japan)" compatibility: - rating: GraphicalAudioIssues - versionTested: "0.1-4693-gbbcf1c67" - comments: "Dialogue in certain cutscenes ends too early or is missing entirely (Issue #575)" + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - DigitalController codes: @@ -71234,8 +71275,8 @@ SLUS-00830: SLUS-01244: name: "High Heat Major League Baseball 2002 (USA)" compatibility: - rating: GraphicalAudioIssues - versionTested: "0.1-4693-gbbcf1c67" + rating: NoIssues + versionTested: "0.1-7272-g143acca03" controllers: - AnalogController - DigitalController diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index 92cba6839..5648e791d 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -26,6 +26,7 @@ #include "common/scoped_guard.h" #include "common/small_string.h" #include "common/string_util.h" +#include "common/timer.h" #include "util/cd_image.h" #include "util/http_downloader.h" @@ -39,7 +40,6 @@ #include "fmt/format.h" #include "imgui.h" #include "imgui_internal.h" -#include "imgui_stdlib.h" #include "rc_client.h" #include diff --git a/src/core/analog_controller.h b/src/core/analog_controller.h index 6e1e843a7..549a8cc37 100644 --- a/src/core/analog_controller.h +++ b/src/core/analog_controller.h @@ -1,12 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include #include #include -#include class AnalogController final : public Controller { diff --git a/src/core/analog_joystick.cpp b/src/core/analog_joystick.cpp index fb01e9d46..f9dc7eb7d 100644 --- a/src/core/analog_joystick.cpp +++ b/src/core/analog_joystick.cpp @@ -15,8 +15,6 @@ #include "IconsFontAwesome5.h" #include "IconsPromptFont.h" -#include - Log_SetChannel(AnalogJoystick); AnalogJoystick::AnalogJoystick(u32 index) : Controller(index) diff --git a/src/core/analog_joystick.h b/src/core/analog_joystick.h index 5a80550a4..a33deb3cd 100644 --- a/src/core/analog_joystick.h +++ b/src/core/analog_joystick.h @@ -1,12 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include #include #include -#include class AnalogJoystick final : public Controller { diff --git a/src/core/bios.cpp b/src/core/bios.cpp index c8f900c1d..842a1bb12 100644 --- a/src/core/bios.cpp +++ b/src/core/bios.cpp @@ -13,8 +13,6 @@ #include "common/md5_digest.h" #include "common/path.h" -#include - Log_SetChannel(BIOS); namespace BIOS { diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 4e287946d..f10b440cd 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -10,6 +10,7 @@ #include "settings.h" #include "spu.h" #include "system.h" +#include "timing_event.h" #include "util/cd_image.h" #include "util/imgui_manager.h" diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index 82cd56d9c..94dfce97c 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -4,12 +4,10 @@ #include "cheats.h" #include "bus.h" #include "controller.h" -#include "cpu_code_cache.h" #include "cpu_core.h" #include "host.h" #include "system.h" -#include "common/assert.h" #include "common/file_system.h" #include "common/log.h" #include "common/small_string.h" @@ -19,7 +17,9 @@ #include #include #include + Log_SetChannel(Cheats); + static std::array cht_register; // Used for D7 ,51 & 52 cheat types using KeyValuePairVector = std::vector>; diff --git a/src/core/cheats.h b/src/core/cheats.h index 59550a099..c56990402 100644 --- a/src/core/cheats.h +++ b/src/core/cheats.h @@ -1,9 +1,12 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "common/bitfield.h" + #include "types.h" + #include #include #include diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp index 1b4a90b62..68ab18330 100644 --- a/src/core/cpu_code_cache.cpp +++ b/src/core/cpu_code_cache.cpp @@ -12,6 +12,8 @@ #include "system.h" #include "timing_event.h" +#include "util/page_fault_handler.h" + #include "common/assert.h" #include "common/error.h" #include "common/intrin.h" diff --git a/src/core/cpu_code_cache_private.h b/src/core/cpu_code_cache_private.h index 024d21cd8..be1c05108 100644 --- a/src/core/cpu_code_cache_private.h +++ b/src/core/cpu_code_cache_private.h @@ -10,13 +10,8 @@ #include "cpu_core_private.h" #include "cpu_types.h" -#include "util/page_fault_handler.h" - #include -#include -#include #include -#include namespace CPU::CodeCache { diff --git a/src/core/cpu_recompiler_code_generator.h b/src/core/cpu_recompiler_code_generator.h index d0744dba6..c6b53eb1c 100644 --- a/src/core/cpu_recompiler_code_generator.h +++ b/src/core/cpu_recompiler_code_generator.h @@ -2,10 +2,6 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once -#include -#include -#include -#include #include "cpu_code_cache_private.h" #include "cpu_recompiler_register_cache.h" @@ -13,6 +9,9 @@ #include "cpu_recompiler_types.h" #include "cpu_types.h" +#include +#include + namespace CPU::Recompiler { enum class Condition : u8 diff --git a/src/core/digital_controller.h b/src/core/digital_controller.h index bbe469170..48d631a8f 100644 --- a/src/core/digital_controller.h +++ b/src/core/digital_controller.h @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include -#include -#include class DigitalController final : public Controller { diff --git a/src/core/dma.cpp b/src/core/dma.cpp index ea90daa15..2d904b83e 100644 --- a/src/core/dma.cpp +++ b/src/core/dma.cpp @@ -4,7 +4,6 @@ #include "dma.h" #include "bus.h" #include "cdrom.h" -#include "cpu_code_cache.h" #include "cpu_core.h" #include "gpu.h" #include "host.h" diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 89daffb5c..d8b3b4f55 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -8,12 +8,9 @@ #include "bios.h" #include "cheats.h" #include "controller.h" -#include "core/memory_card_image.h" -#include "cpu_core.h" #include "game_list.h" #include "gpu.h" #include "host.h" -#include "resources.h" #include "settings.h" #include "system.h" @@ -33,15 +30,13 @@ #include "common/path.h" #include "common/small_string.h" #include "common/string_util.h" -#include "common/threading.h" +#include "common/timer.h" #include "IconsFontAwesome5.h" #include "IconsPromptFont.h" #include "fmt/chrono.h" -#include "fmt/format.h" #include "imgui.h" #include "imgui_internal.h" -#include "imgui_stdlib.h" #include #include diff --git a/src/core/fullscreen_ui.h b/src/core/fullscreen_ui.h index f33da4566..5942239f3 100644 --- a/src/core/fullscreen_ui.h +++ b/src/core/fullscreen_ui.h @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index 1922d912b..9b446043e 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -15,7 +15,6 @@ #include "util/image.h" #include "util/ini_settings_interface.h" -#include "common/assert.h" #include "common/binary_reader_writer.h" #include "common/error.h" #include "common/file_system.h" @@ -24,10 +23,10 @@ #include "common/path.h" #include "common/progress_callback.h" #include "common/string_util.h" +#include "common/timer.h" #include #include -#include #include #include #include diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp index 6822c268e..0d8ff3ee8 100644 --- a/src/core/gpu.cpp +++ b/src/core/gpu.cpp @@ -22,7 +22,6 @@ #include "common/error.h" #include "common/file_system.h" #include "common/gsvector_formatter.h" -#include "common/heap_array.h" #include "common/log.h" #include "common/path.h" #include "common/small_string.h" diff --git a/src/core/gpu_backend.h b/src/core/gpu_backend.h index 932419db9..67854dc5a 100644 --- a/src/core/gpu_backend.h +++ b/src/core/gpu_backend.h @@ -2,14 +2,16 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + +#include "gpu_types.h" + #include "common/heap_array.h" #include "common/threading.h" -#include "gpu_types.h" + #include #include #include #include -#include #ifdef _MSC_VER #pragma warning(push) diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp index 3955d813e..3fe1c9eb0 100644 --- a/src/core/gpu_commands.cpp +++ b/src/core/gpu_commands.cpp @@ -1,13 +1,15 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "gpu.h" #include "interrupt_controller.h" #include "system.h" #include "texture_replacements.h" + +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + Log_SetChannel(GPU); #define CHECK_COMMAND_SIZE(num_words) \ diff --git a/src/core/gpu_hw.cpp b/src/core/gpu_hw.cpp index 7b19ba065..b08a596a2 100644 --- a/src/core/gpu_hw.cpp +++ b/src/core/gpu_hw.cpp @@ -21,6 +21,7 @@ #include "common/log.h" #include "common/scoped_guard.h" #include "common/string_util.h" +#include "common/timer.h" #include "IconsFontAwesome5.h" #include "imgui.h" diff --git a/src/core/gpu_hw.h b/src/core/gpu_hw.h index 7eccdd751..9131a5911 100644 --- a/src/core/gpu_hw.h +++ b/src/core/gpu_hw.h @@ -10,12 +10,10 @@ #include "common/dimensional_array.h" #include "common/gsvector.h" -#include "common/heap_array.h" #include #include #include -#include class Error; diff --git a/src/core/gpu_hw_shadergen.cpp b/src/core/gpu_hw_shadergen.cpp index ab57a5d10..8633de9ae 100644 --- a/src/core/gpu_hw_shadergen.cpp +++ b/src/core/gpu_hw_shadergen.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "gpu_hw_shadergen.h" + #include "common/assert.h" -#include GPU_HW_ShaderGen::GPU_HW_ShaderGen(RenderAPI render_api, u32 resolution_scale, u32 multisamples, bool per_sample_shading, bool true_color, bool scaled_dithering, diff --git a/src/core/gpu_hw_shadergen.h b/src/core/gpu_hw_shadergen.h index fc7cc2e53..e8ccf4947 100644 --- a/src/core/gpu_hw_shadergen.h +++ b/src/core/gpu_hw_shadergen.h @@ -2,7 +2,9 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "gpu_hw.h" + #include "util/shadergen.h" class GPU_HW_ShaderGen : public ShaderGen diff --git a/src/core/gpu_sw.h b/src/core/gpu_sw.h index 7e510ffaa..515db17b5 100644 --- a/src/core/gpu_sw.h +++ b/src/core/gpu_sw.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "gpu.h" #include "gpu_sw_backend.h" @@ -9,9 +10,7 @@ #include "common/heap_array.h" -#include #include -#include namespace Threading { class Thread; diff --git a/src/core/gpu_sw_backend.h b/src/core/gpu_sw_backend.h index 7cde4c2b7..8d21793fa 100644 --- a/src/core/gpu_sw_backend.h +++ b/src/core/gpu_sw_backend.h @@ -7,8 +7,6 @@ #include "gpu_backend.h" #include -#include -#include class GPU_SW_Backend final : public GPUBackend { diff --git a/src/core/gpu_types.h b/src/core/gpu_types.h index ea41d4991..2a01679e8 100644 --- a/src/core/gpu_types.h +++ b/src/core/gpu_types.h @@ -2,10 +2,13 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + +#include "types.h" + #include "common/bitfield.h" #include "common/bitutils.h" #include "common/gsvector.h" -#include "types.h" + #include enum : u32 diff --git a/src/core/gte.cpp b/src/core/gte.cpp index 9940296df..e2d73d60f 100644 --- a/src/core/gte.cpp +++ b/src/core/gte.cpp @@ -7,7 +7,6 @@ #include "cpu_core_private.h" #include "cpu_pgxp.h" #include "settings.h" -#include "timing_event.h" #include "util/gpu_device.h" #include "util/state_wrapper.h" diff --git a/src/core/guncon.h b/src/core/guncon.h index bf1c86a12..3a596a7b2 100644 --- a/src/core/guncon.h +++ b/src/core/guncon.h @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include -#include -#include class GunCon final : public Controller { diff --git a/src/core/host.h b/src/core/host.h index fa98edd33..a66e78727 100644 --- a/src/core/host.h +++ b/src/core/host.h @@ -8,11 +8,8 @@ #include "common/small_string.h" #include "common/types.h" -#include #include -#include #include -#include #include #include #include diff --git a/src/core/hotkeys.cpp b/src/core/hotkeys.cpp index e1a5365be..f99fd9a60 100644 --- a/src/core/hotkeys.cpp +++ b/src/core/hotkeys.cpp @@ -20,6 +20,7 @@ #include "common/error.h" #include "common/file_system.h" +#include "common/timer.h" #include "IconsFontAwesome5.h" diff --git a/src/core/imgui_overlays.cpp b/src/core/imgui_overlays.cpp index b8b7ca360..7737f1446 100644 --- a/src/core/imgui_overlays.cpp +++ b/src/core/imgui_overlays.cpp @@ -12,12 +12,10 @@ #include "gpu.h" #include "host.h" #include "mdec.h" -#include "resources.h" #include "settings.h" #include "spu.h" #include "system.h" -#include "util/audio_stream.h" #include "util/gpu_device.h" #include "util/imgui_animated.h" #include "util/imgui_fullscreen.h" @@ -25,8 +23,6 @@ #include "util/input_manager.h" #include "common/align.h" -#include "common/assert.h" -#include "common/easing.h" #include "common/error.h" #include "common/file_system.h" #include "common/gsvector.h" @@ -38,7 +34,6 @@ #include "IconsFontAwesome5.h" #include "fmt/chrono.h" -#include "fmt/format.h" #include "imgui.h" #include "imgui_internal.h" @@ -48,7 +43,6 @@ #include #include #include -#include Log_SetChannel(ImGuiManager); diff --git a/src/core/justifier.cpp b/src/core/justifier.cpp index d623ad43b..0332d7cbe 100644 --- a/src/core/justifier.cpp +++ b/src/core/justifier.cpp @@ -5,7 +5,6 @@ #include "gpu.h" #include "host.h" #include "interrupt_controller.h" -#include "resources.h" #include "system.h" #include "util/imgui_manager.h" diff --git a/src/core/justifier.h b/src/core/justifier.h index 51895bdcc..fff679c16 100644 --- a/src/core/justifier.h +++ b/src/core/justifier.h @@ -7,8 +7,6 @@ #include "timing_event.h" #include -#include -#include class TimingEvent; diff --git a/src/core/mdec.cpp b/src/core/mdec.cpp index 4605157a5..54bada107 100644 --- a/src/core/mdec.cpp +++ b/src/core/mdec.cpp @@ -1,12 +1,12 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "mdec.h" #include "cpu_core.h" #include "dma.h" #include "host.h" -#include "interrupt_controller.h" #include "system.h" +#include "timing_event.h" #include "util/imgui_manager.h" #include "util/state_wrapper.h" diff --git a/src/core/memory_card.cpp b/src/core/memory_card.cpp index 73f7c4b9d..550793f09 100644 --- a/src/core/memory_card.cpp +++ b/src/core/memory_card.cpp @@ -17,8 +17,6 @@ #include "IconsFontAwesome5.h" -#include - Log_SetChannel(MemoryCard); MemoryCard::MemoryCard() diff --git a/src/core/multitap.cpp b/src/core/multitap.cpp index 18a61ef84..6ea5e4683 100644 --- a/src/core/multitap.cpp +++ b/src/core/multitap.cpp @@ -1,13 +1,16 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "multitap.h" -#include "common/log.h" -#include "common/types.h" #include "controller.h" #include "memory_card.h" #include "pad.h" + #include "util/state_wrapper.h" + +#include "common/log.h" +#include "common/types.h" + Log_SetChannel(Multitap); Multitap::Multitap() diff --git a/src/core/multitap.h b/src/core/multitap.h index f69813fd6..040e47f45 100644 --- a/src/core/multitap.h +++ b/src/core/multitap.h @@ -1,11 +1,12 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once -#include "common/types.h" + #include "controller.h" -#include "memory_card.h" -#include "util/state_wrapper.h" + +#include "common/types.h" + #include class Multitap final diff --git a/src/core/negcon.h b/src/core/negcon.h index b9adfbb42..e7fd61392 100644 --- a/src/core/negcon.h +++ b/src/core/negcon.h @@ -1,12 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include #include #include -#include class NeGcon final : public Controller { diff --git a/src/core/negcon_rumble.h b/src/core/negcon_rumble.h index 632c42bc3..48f542fcd 100644 --- a/src/core/negcon_rumble.h +++ b/src/core/negcon_rumble.h @@ -1,12 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include #include #include -#include class NeGconRumble final : public Controller { diff --git a/src/core/pad.h b/src/core/pad.h index 227ac2d39..45ba93ba0 100644 --- a/src/core/pad.h +++ b/src/core/pad.h @@ -2,7 +2,9 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "types.h" + #include class StateWrapper; diff --git a/src/core/pcdrv.cpp b/src/core/pcdrv.cpp index 2983b14c2..dd27a7d8e 100644 --- a/src/core/pcdrv.cpp +++ b/src/core/pcdrv.cpp @@ -1,13 +1,15 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "pcdrv.h" +#include "cpu_core.h" +#include "settings.h" + #include "common/file_system.h" #include "common/log.h" #include "common/path.h" #include "common/string_util.h" -#include "cpu_core.h" -#include "settings.h" + Log_SetChannel(PCDrv); static constexpr u32 MAX_FILES = 100; diff --git a/src/core/pcdrv.h b/src/core/pcdrv.h index fd7a2eaf8..aca11424c 100644 --- a/src/core/pcdrv.h +++ b/src/core/pcdrv.h @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "cpu_types.h" -#include "types.h" ////////////////////////////////////////////////////////////////////////// // HLE Implementation of PCDrv diff --git a/src/core/pine_server.cpp b/src/core/pine_server.cpp index c479d89a0..0adb50e75 100644 --- a/src/core/pine_server.cpp +++ b/src/core/pine_server.cpp @@ -9,7 +9,6 @@ #include "scmversion/scmversion.h" -#include "util/platform_misc.h" #include "util/sockets.h" #include "common/binary_reader_writer.h" diff --git a/src/core/playstation_mouse.h b/src/core/playstation_mouse.h index 3c7e6b117..4e53ce225 100644 --- a/src/core/playstation_mouse.h +++ b/src/core/playstation_mouse.h @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "controller.h" + #include -#include -#include class PlayStationMouse final : public Controller { diff --git a/src/core/psf_loader.cpp b/src/core/psf_loader.cpp index 966a5447a..8ed3fcd97 100644 --- a/src/core/psf_loader.cpp +++ b/src/core/psf_loader.cpp @@ -6,7 +6,6 @@ #include "bus.h" #include "system.h" -#include "common/assert.h" #include "common/error.h" #include "common/file_system.h" #include "common/log.h" @@ -14,7 +13,6 @@ #include "zlib.h" -#include #include Log_SetChannel(PSFLoader); diff --git a/src/core/psf_loader.h b/src/core/psf_loader.h index 5e5879e32..84e272140 100644 --- a/src/core/psf_loader.h +++ b/src/core/psf_loader.h @@ -8,7 +8,6 @@ #include #include #include -#include #include class Error; diff --git a/src/core/save_state_version.h b/src/core/save_state_version.h index 7c53d3cb7..d5f04b230 100644 --- a/src/core/save_state_version.h +++ b/src/core/save_state_version.h @@ -2,7 +2,8 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once -#include "types.h" + +#include "common/types.h" static constexpr u32 SAVE_STATE_MAGIC = 0x43435544; static constexpr u32 SAVE_STATE_VERSION = 69; diff --git a/src/core/shader_cache_version.h b/src/core/shader_cache_version.h index bcf27217c..f1c67d8da 100644 --- a/src/core/shader_cache_version.h +++ b/src/core/shader_cache_version.h @@ -2,6 +2,7 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "common/types.h" static constexpr u32 SHADER_CACHE_VERSION = 18; diff --git a/src/core/sio.cpp b/src/core/sio.cpp index 037aa86f7..81e4ef7f7 100644 --- a/src/core/sio.cpp +++ b/src/core/sio.cpp @@ -1,16 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "sio.h" #include "controller.h" -#include "interrupt_controller.h" -#include "memory_card.h" #include "util/state_wrapper.h" #include "common/bitfield.h" #include "common/bitutils.h" -#include "common/fifo_queue.h" #include "common/log.h" #include diff --git a/src/core/sio.h b/src/core/sio.h index 142c2b519..da35af248 100644 --- a/src/core/sio.h +++ b/src/core/sio.h @@ -2,7 +2,8 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once -#include "types.h" + +#include "common/types.h" class StateWrapper; diff --git a/src/core/spu.cpp b/src/core/spu.cpp index 29bed3992..d5c90a62f 100644 --- a/src/core/spu.cpp +++ b/src/core/spu.cpp @@ -8,6 +8,7 @@ #include "imgui.h" #include "interrupt_controller.h" #include "system.h" +#include "timing_event.h" #include "util/audio_stream.h" #include "util/imgui_manager.h" diff --git a/src/core/spu.h b/src/core/spu.h index 1bbcee772..3f61eae19 100644 --- a/src/core/spu.h +++ b/src/core/spu.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "types.h" + #include class StateWrapper; diff --git a/src/core/system.h b/src/core/system.h index 1d68478c2..6164c5853 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -4,18 +4,13 @@ #pragma once #include "settings.h" -#include "timing_event.h" #include "types.h" #include "util/image.h" -#include "common/timer.h" - #include #include -#include #include -#include class ByteStream; class CDImage; @@ -32,7 +27,6 @@ struct CheatCode; class CheatList; class GPUTexture; -class GrowableMemoryByteStream; namespace BIOS { struct ImageInfo; diff --git a/src/core/timers.h b/src/core/timers.h index c8a128c6d..778c8e24b 100644 --- a/src/core/timers.h +++ b/src/core/timers.h @@ -2,6 +2,7 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "types.h" class StateWrapper; diff --git a/src/util/audio_stream.cpp b/src/util/audio_stream.cpp index 3af43f061..9841ce476 100644 --- a/src/util/audio_stream.cpp +++ b/src/util/audio_stream.cpp @@ -10,7 +10,6 @@ #include "common/gsvector.h" #include "common/log.h" #include "common/settings_interface.h" -#include "common/small_string.h" #include "common/timer.h" #include "soundtouch/SoundTouch.h" diff --git a/src/util/cd_image.cpp b/src/util/cd_image.cpp index 82c66a946..effd2eaeb 100644 --- a/src/util/cd_image.cpp +++ b/src/util/cd_image.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #include "cd_image.h" + #include "common/assert.h" #include "common/bitutils.h" #include "common/error.h" @@ -9,7 +10,9 @@ #include "common/log.h" #include "common/path.h" #include "common/string_util.h" + #include + Log_SetChannel(CDImage); CDImage::CDImage() = default; diff --git a/src/util/cd_image.h b/src/util/cd_image.h index 37ce92061..c1ae38257 100644 --- a/src/util/cd_image.h +++ b/src/util/cd_image.h @@ -1,11 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) #pragma once + #include "common/bitfield.h" #include "common/bitutils.h" #include "common/progress_callback.h" #include "common/types.h" + #include #include #include