vita3k: Cleanup headers, dependencies

scribam · Sep 15, 2024 · f640b4e · f640b4e
1 parent b55ae4f
commit f640b4e
Show file tree

Hide file tree

Showing 156 changed files with 169 additions and 250 deletions.
diff --git a/vita3k/app/include/app/functions.h b/vita3k/app/include/app/functions.h
@@ -23,9 +23,6 @@ struct Config;
 struct EmuEnvState;
 struct SDL_Window;
 struct ImGui_State;
-struct CPUDepInject;
-template <class T>
-class Ptr;
 class Root;
 
 namespace app {

diff --git a/vita3k/app/src/app_init.cpp b/vita3k/app/src/app_init.cpp
@@ -30,7 +30,6 @@
 #include <renderer/state.h>
 
 #include <renderer/functions.h>
-#include <rtc/rtc.h>
 #include <util/fs.h>
 #include <util/lock_and_find.h>
 #include <util/log.h>
@@ -42,8 +41,6 @@
 
 #include <gdbstub/functions.h>
 
-#include <renderer/vulkan/functions.h>
-
 #include <SDL.h>
 #include <SDL_video.h>
 #include <SDL_vulkan.h>

diff --git a/vita3k/codec/include/codec/state.h b/vita3k/codec/include/codec/state.h
@@ -23,7 +23,6 @@
 
 struct AVFrame;
 struct AVPacket;
-struct AVIOContext;
 struct AVCodecContext;
 struct AVFormatContext;
 struct AVCodecParserContext;

diff --git a/vita3k/codec/src/aac.cpp b/vita3k/codec/src/aac.cpp
@@ -17,8 +17,6 @@
 
 #include <codec/state.h>
 
-#include <map>
-
 #define DEBUG
 
 extern "C" {

diff --git a/vita3k/codec/src/atrac9.cpp b/vita3k/codec/src/atrac9.cpp
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <util/log.h>
 
-#include <cassert>
+#include <algorithm>
 
 struct FFMPEGAtrac9Info {
     uint32_t version;

diff --git a/vita3k/codec/src/decoder.cpp b/vita3k/codec/src/decoder.cpp
@@ -23,8 +23,6 @@ extern "C" {
 
 #include <util/log.h>
 
-#include <cassert>
-
 uint32_t DecoderState::get(DecoderQuery query) {
     return 0;
 }

diff --git a/vita3k/codec/src/mjpeg.cpp b/vita3k/codec/src/mjpeg.cpp
@@ -16,7 +16,6 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <codec/state.h>
-#include <codec/types.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>

diff --git a/vita3k/codec/src/player.cpp b/vita3k/codec/src/player.cpp
@@ -26,7 +26,6 @@ extern "C" {
 }
 
 #include <cassert>
-#include <chrono>
 
 uint64_t PlayerState::get_framerate_microseconds() {
     AVRational rational = format->streams[video_stream_id]->avg_frame_rate;

diff --git a/vita3k/config/src/config.cpp b/vita3k/config/src/config.cpp
@@ -24,11 +24,11 @@
 #include <util/string_utils.h>
 
 #include <CLI11.hpp>
-#include <vector>
 
 #include <algorithm>
 #include <exception>
 #include <iostream>
+#include <vector>
 
 namespace config {
 

diff --git a/vita3k/cpu/include/cpu/common.h b/vita3k/cpu/include/cpu/common.h
@@ -28,7 +28,6 @@
 #include <string>
 
 struct CPUState;
-struct MemState;
 struct CPUContext;
 struct CPUInterface;
 struct ThreadState;

diff --git a/vita3k/cpu/include/cpu/functions.h b/vita3k/cpu/include/cpu/functions.h
@@ -24,6 +24,8 @@
 
 #include <cstdint>
 
+struct MemState;
+
 CPUStatePtr init_cpu(CPUBackend backend, bool cpu_opt, SceUID thread_id, std::size_t processor_id, MemState &mem, CPUProtocolBase *protocol);
 int run(CPUState &state);
 int step(CPUState &state);

diff --git a/vita3k/cpu/include/cpu/state.h b/vita3k/cpu/include/cpu/state.h
@@ -21,6 +21,7 @@
 #include <cpu/disasm/state.h>
 #include <cpu/functions.h>
 #include <mem/block.h>
+#include <mem/state.h>
 
 struct CPUState {
     CPUState() = default;

diff --git a/vita3k/cpu/src/cpu.cpp b/vita3k/cpu/src/cpu.cpp
@@ -15,23 +15,17 @@
 // with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-#include <cpu/functions.h>
-#include <cpu/impl/interface.h>
-
 #include <cpu/disasm/functions.h>
-#include <cpu/disasm/state.h>
-#include <mem/ptr.h>
-#include <util/log.h>
-#include <util/types.h>
-
 #include <cpu/impl/dynarmic_cpu.h>
+#include <cpu/impl/interface.h>
 #include <cpu/impl/unicorn_cpu.h>
-
-#include <cassert>
+#include <cpu/functions.h>
 #include <cpu/state.h>
-#include <cstring>
+#include <mem/ptr.h>
+#include <util/types.h>
 
-#include <util/string_utils.h>
+#include <memory>
+#include <string>
 
 static void delete_cpu_state(CPUState *state) {
     delete state;

diff --git a/vita3k/cpu/src/dynarmic_cpu.cpp b/vita3k/cpu/src/dynarmic_cpu.cpp
@@ -18,7 +18,6 @@
 #include "cpu/common.h"
 #include <cpu/impl/dynarmic_cpu.h>
 #include <cpu/state.h>
-#include <set>
 #include <util/bit_cast.h>
 #include <util/log.h>
 
@@ -27,6 +26,10 @@
 #include <dynarmic/frontend/A32/a32_ir_emitter.h>
 #include <dynarmic/interface/A32/coprocessor.h>
 
+#include <memory>
+#include <optional>
+#include <string>
+
 class ArmDynarmicCP15 : public Dynarmic::A32::Coprocessor {
     uint32_t tpidruro;
 

diff --git a/vita3k/ctrl/include/ctrl/functions.h b/vita3k/ctrl/include/ctrl/functions.h
@@ -20,7 +20,7 @@
 #include <ctrl/state.h>
 #include <emuenv/state.h>
 
-struct ControllerBinding;
+#include <array>
 
 std::array<ControllerBinding, 15> get_controller_bindings_ext(EmuEnvState &emuenv);
 SceCtrlExternalInputMode get_type_of_controller(const int idx);

diff --git a/vita3k/display/include/display/functions.h b/vita3k/display/include/display/functions.h
@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <cstdint>
 #include <kernel/thread/thread_state.h>
 
+#include <cstdint>
+
 struct DisplayState;
 struct KernelState;
 struct EmuEnvState;

diff --git a/vita3k/display/include/display/state.h b/vita3k/display/include/display/state.h
@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include <atomic>
 #include <kernel/callback.h>
 #include <mem/ptr.h>
+#include <util/types.h>
+
+#include <atomic>
 #include <memory>
 #include <mutex>
 #include <thread>
 #include <vector>
 
-#include <util/types.h>
-
 enum SceDisplayPixelFormat {
     SCE_DISPLAY_PIXELFORMAT_A8B8G8R8 = 0x00000000U
 };

diff --git a/vita3k/emuenv/include/emuenv/app_util.h b/vita3k/emuenv/include/emuenv/app_util.h
@@ -20,9 +20,6 @@
 #include <mem/ptr.h>
 #include <util/types.h>
 
-// forward declarations
-typedef uint32_t SceUInt32;
-
 typedef SceUInt32 SceAppUtilBootAttribute;
 typedef SceUInt32 SceAppUtilAppEventType;
 typedef SceUInt32 SceAppUtilSaveDataSlotId;

diff --git a/vita3k/emuenv/include/emuenv/state.h b/vita3k/emuenv/include/emuenv/state.h
@@ -18,13 +18,12 @@
 #pragma once
 
 #include <emuenv/window.h>
+#include <util/fs.h>
 
 #include <memory>
 #include <set>
 #include <string>
 
-#include <util/fs.h>
-
 // forward declare everything used in EmuEnvState
 namespace sfo {
 struct SfoAppInfo;

diff --git a/vita3k/glutil/src/shader.cpp b/vita3k/glutil/src/shader.cpp
@@ -23,8 +23,8 @@
 #include <util/log.h>
 
 #include <fstream>
+#include <memory>
 #include <sstream>
-#include <utility>
 #include <vector>
 
 /**

diff --git a/vita3k/gui/include/gui/functions.h b/vita3k/gui/include/gui/functions.h
@@ -18,15 +18,15 @@
 #pragma once
 
 #include <gui/state.h>
+#include <ime/state.h>
+#include <io/vfs.h>
 
 #include <cstdint>
+#include <map>
 #include <string>
 #include <vector>
 
-struct DisplayState;
 struct EmuEnvState;
-struct SDL_Window;
-struct NpTrophyUnlockCallbackData;
 
 namespace gui {
 

diff --git a/vita3k/gui/include/gui/state.h b/vita3k/gui/include/gui/state.h
@@ -19,8 +19,6 @@
 
 #include <compat/state.h>
 #include <config/config.h>
-#include <dialog/state.h>
-#include <ime/state.h>
 #include <lang/state.h>
 #include <np/state.h>
 

diff --git a/vita3k/gui/src/about_dialog.cpp b/vita3k/gui/src/about_dialog.cpp
@@ -20,6 +20,7 @@
 #include "private.h"
 
 #include <config/version.h>
+#include <dialog/state.h>
 
 namespace gui {
 

diff --git a/vita3k/gui/src/allocations_dialog.cpp b/vita3k/gui/src/allocations_dialog.cpp
@@ -17,7 +17,6 @@
 
 #include "private.h"
 
-#include <cpu/functions.h>
 #include <util/vector_utils.h>
 
 #include <imgui_memory_editor.h>

diff --git a/vita3k/gui/src/app_context_menu.cpp b/vita3k/gui/src/app_context_menu.cpp
@@ -19,6 +19,7 @@
 
 #include <config/state.h>
 #include <config/version.h>
+#include <dialog/state.h>
 #include <gui/functions.h>
 #include <include/cpu.h>
 #include <include/environment.h>

diff --git a/vita3k/gui/src/archive_install_dialog.cpp b/vita3k/gui/src/archive_install_dialog.cpp
@@ -18,13 +18,14 @@
 #include "interface.h"
 #include "private.h"
 
+#include <dialog/state.h>
 #include <gui/functions.h>
 #include <host/dialog/filesystem.hpp>
 #include <packages/sfo.h>
 
 #include <util/string_utils.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thread>
 

diff --git a/vita3k/gui/src/common_dialog.cpp b/vita3k/gui/src/common_dialog.cpp
@@ -20,8 +20,8 @@
 #include <ctrl/ctrl.h>
 #include <gui/functions.h>
 
+#include <dialog/state.h>
 #include <config/state.h>
-#include <gui/imgui_impl_sdl.h>
 #include <util/string_utils.h>
 
 #include <SDL.h>

diff --git a/vita3k/gui/src/content_manager.cpp b/vita3k/gui/src/content_manager.cpp
@@ -24,6 +24,7 @@
 #include <gui/functions.h>
 
 #include <config/state.h>
+#include <dialog/state.h>
 #include <packages/sfo.h>
 
 #include <io/VitaIoDevice.h>

diff --git a/vita3k/gui/src/controllers_dialog.cpp b/vita3k/gui/src/controllers_dialog.cpp
@@ -20,6 +20,7 @@
 #include <config/functions.h>
 #include <config/state.h>
 #include <ctrl/state.h>
+#include <dialog/state.h>
 #include <emuenv/state.h>
 #include <gui/functions.h>
 

diff --git a/vita3k/gui/src/controls_dialog.cpp b/vita3k/gui/src/controls_dialog.cpp
@@ -19,6 +19,7 @@
 
 #include <config/functions.h>
 #include <config/state.h>
+#include <dialog/state.h>
 #include <emuenv/state.h>
 #include <gui/functions.h>
 #include <interface.h>

diff --git a/vita3k/gui/src/firmware_install_dialog.cpp b/vita3k/gui/src/firmware_install_dialog.cpp
@@ -18,11 +18,11 @@
 #include "private.h"
 
 #include <config/state.h>
+#include <dialog/state.h>
 #include <gui/functions.h>
 #include <host/dialog/filesystem.hpp>
 #include <packages/functions.h>
 #include <util/log.h>
-#include <util/string_utils.h>
 
 #include <thread>
 

diff --git a/vita3k/gui/src/gui.cpp b/vita3k/gui/src/gui.cpp
@@ -24,6 +24,7 @@
 
 #include <boost/algorithm/string/trim.hpp>
 #include <config/state.h>
+#include <dialog/state.h>
 #include <display/state.h>
 #include <io/VitaIoDevice.h>
 #include <io/state.h>
@@ -36,8 +37,6 @@
 #include <util/log.h>
 #include <util/string_utils.h>
 
-#include <SDL_video.h>
-
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
 

diff --git a/vita3k/gui/src/home_screen.cpp b/vita3k/gui/src/home_screen.cpp
@@ -19,16 +19,14 @@
 
 #include <app/functions.h>
 #include <compat/functions.h>
-#include <config/functions.h>
 #include <config/state.h>
 #include <ctrl/ctrl.h>
+#include <dialog/state.h>
 #include <display/state.h>
 #include <gui/functions.h>
 #include <io/state.h>
 #include <kernel/state.h>
 
-#include <io/VitaIoDevice.h>
-
 #include <util/log.h>
 #include <util/safe_time.h>
 #include <util/string_utils.h>

diff --git a/vita3k/gui/src/ime.cpp b/vita3k/gui/src/ime.cpp
@@ -19,6 +19,7 @@
 
 #include <config/functions.h>
 #include <config/state.h>
+#include <ime/state.h>
 #include <util/string_utils.h>
 
 namespace gui {