diff --git a/CMakeLists.txt b/CMakeLists.txt index 068bc808..33e3332b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,8 +43,8 @@ set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_ser src/Emulator/HLE/Libraries/LibSystemService/system_service.h ) -set(FILESYSTEM_SOURCES "src/Core/hle/libraries/libkernel/file_system.cpp" - "src/Core/hle/libraries/libkernel/file_system.h" +set(FILESYSTEM_SOURCES "src/core/hle/libraries/libkernel/file_system.cpp" + "src/core/hle/libraries/libkernel/file_system.h" ) @@ -68,37 +68,37 @@ add_executable(shadps4 src/Lib/Timer.h src/main.cpp src/types.h - src/Core/FsFile.cpp - src/Core/FsFile.h - src/Core/PS4/Loader/Elf.cpp - src/Core/PS4/Loader/Elf.h + src/core/FsFile.cpp + src/core/FsFile.h + src/core/PS4/Loader/Elf.cpp + src/core/PS4/Loader/Elf.h src/GUI/ElfViewer.cpp src/GUI/ElfViewer.h src/Util/log.h src/Util/log.cpp src/Util/config.cpp src/Util/config.h - src/Core/virtual_memory.cpp - src/Core/virtual_memory.h - src/Core/PS4/Linker.cpp - src/Core/PS4/Linker.h - src/Core/PS4/Stubs.cpp - src/Core/PS4/Stubs.h - src/Core/PS4/Util/aerolib.cpp - src/Core/PS4/HLE/Kernel/Objects/physical_memory.h - src/Core/PS4/HLE/Kernel/Objects/physical_memory.cpp + src/core/virtual_memory.cpp + src/core/virtual_memory.h + src/core/PS4/Linker.cpp + src/core/PS4/Linker.h + src/core/PS4/Stubs.cpp + src/core/PS4/Stubs.h + src/core/PS4/Util/aerolib.cpp + src/core/PS4/HLE/Kernel/Objects/physical_memory.h + src/core/PS4/HLE/Kernel/Objects/physical_memory.cpp src/Util/string_util.cpp src/Util/string_util.cpp - src/Core/PS4/HLE/Graphics/video_out.cpp - src/Core/PS4/HLE/Graphics/video_out.h + src/core/PS4/HLE/Graphics/video_out.cpp + src/core/PS4/HLE/Graphics/video_out.h src/discord.h src/discord.cpp - src/Core/PS4/HLE/Kernel/event_queues.cpp - src/Core/PS4/HLE/Kernel/event_queues.h - src/Core/PS4/HLE/Kernel/cpu_management.cpp - src/Core/PS4/HLE/Kernel/cpu_management.h + src/core/PS4/HLE/Kernel/event_queues.cpp + src/core/PS4/HLE/Kernel/event_queues.h + src/core/PS4/HLE/Kernel/cpu_management.cpp + src/core/PS4/HLE/Kernel/cpu_management.h - "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h" "src/Core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/Core/PS4/HLE/Kernel/ThreadManagement.h" "src/Core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/Core/PS4/HLE/Kernel/memory_management.cpp" "src/Core/PS4/HLE/Kernel/memory_management.h" "src/Core/PS4/GPU/gpu_memory.cpp" "src/Core/PS4/GPU/gpu_memory.h" "src/emulator.cpp" "src/emulator.h" "src/Core/PS4/HLE/Kernel/Objects/event_queue.h" "src/Core/PS4/HLE/Kernel/Objects/event_queue.cpp" "src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp" "src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h" "src/Core/PS4/HLE/Graphics/graphics_ctx.h" "src/vulkan_util.cpp" "src/vulkan_util.h" "src/Core/PS4/GPU/video_out_buffer.cpp" "src/Core/PS4/GPU/video_out_buffer.h" "src/Core/PS4/HLE/Graphics/graphics_render.cpp" "src/Core/PS4/HLE/Graphics/graphics_render.h" "src/Core/PS4/GPU/tile_manager.cpp" "src/Core/PS4/GPU/tile_manager.h" "src/version.h" "src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp" "src/Emulator/HLE/Libraries/LibSystemService/system_service.h" "src/emuTimer.cpp" "src/emuTimer.h" "src/Core/hle/libraries/libkernel/time_management.cpp" "src/Core/hle/libraries/libkernel/time_management.h") + "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/core/PS4/Util/aerolib.h" "src/core/PS4/Loader/SymbolsResolver.h" "src/core/PS4/Loader/SymbolsResolver.cpp" "src/core/PS4/HLE/Libs.cpp" "src/core/PS4/HLE/Libs.h" "src/core/PS4/HLE/LibC.cpp" "src/core/PS4/HLE/LibC.h" "src/core/PS4/HLE/LibKernel.cpp" "src/core/PS4/HLE/LibKernel.h" "src/core/PS4/HLE/LibSceGnmDriver.cpp" "src/core/PS4/HLE/LibSceGnmDriver.h" "src/core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/core/PS4/HLE/Kernel/ThreadManagement.h" "src/core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/core/PS4/HLE/Kernel/memory_management.cpp" "src/core/PS4/HLE/Kernel/memory_management.h" "src/core/PS4/GPU/gpu_memory.cpp" "src/core/PS4/GPU/gpu_memory.h" "src/emulator.cpp" "src/emulator.h" "src/core/PS4/HLE/Kernel/Objects/event_queue.h" "src/core/PS4/HLE/Kernel/Objects/event_queue.cpp" "src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp" "src/core/PS4/HLE/Graphics/Objects/video_out_ctx.h" "src/core/PS4/HLE/Graphics/graphics_ctx.h" "src/vulkan_util.cpp" "src/vulkan_util.h" "src/core/PS4/GPU/video_out_buffer.cpp" "src/core/PS4/GPU/video_out_buffer.h" "src/core/PS4/HLE/Graphics/graphics_render.cpp" "src/core/PS4/HLE/Graphics/graphics_render.h" "src/core/PS4/GPU/tile_manager.cpp" "src/core/PS4/GPU/tile_manager.h" "src/version.h" "src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp" "src/Emulator/HLE/Libraries/LibSystemService/system_service.h" "src/emuTimer.cpp" "src/emuTimer.h" "src/core/hle/libraries/libkernel/time_management.cpp" "src/core/hle/libraries/libkernel/time_management.h") find_package(OpenGL REQUIRED) target_link_libraries(shadps4 PUBLIC fmt mincore spdlog IMGUI SDL3-shared ${OPENGL_LIBRARY} vulkan-1 spirv-tools-opt spirv-tools) diff --git a/src/Core/PS4/GPU/gpu_memory.h b/src/Core/PS4/GPU/gpu_memory.h index 90151259..f4398085 100644 --- a/src/Core/PS4/GPU/gpu_memory.h +++ b/src/Core/PS4/GPU/gpu_memory.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp index 74af085c..c7586151 100644 --- a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp +++ b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp @@ -1,8 +1,8 @@ #include "video_out_ctx.h" -#include +#include #include -#include +#include namespace HLE::Graphics::Objects { diff --git a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h index 07f301ac..0a60c1cf 100644 --- a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h +++ b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include using namespace HLE::Libs::Graphics::VideoOut; diff --git a/src/Core/PS4/HLE/Graphics/video_out.cpp b/src/Core/PS4/HLE/Graphics/video_out.cpp index f8503edd..ac0c67d3 100644 --- a/src/Core/PS4/HLE/Graphics/video_out.cpp +++ b/src/Core/PS4/HLE/Graphics/video_out.cpp @@ -1,11 +1,11 @@ #include "video_out.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/Core/PS4/HLE/Graphics/video_out.h b/src/Core/PS4/HLE/Graphics/video_out.h index 9db9299d..be1fd514 100644 --- a/src/Core/PS4/HLE/Graphics/video_out.h +++ b/src/Core/PS4/HLE/Graphics/video_out.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h b/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h index 7e509bf3..e5ea7e5e 100644 --- a/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h +++ b/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/Core/PS4/HLE/Kernel/cpu_management.cpp b/src/Core/PS4/HLE/Kernel/cpu_management.cpp index 210d4caa..2a605452 100644 --- a/src/Core/PS4/HLE/Kernel/cpu_management.cpp +++ b/src/Core/PS4/HLE/Kernel/cpu_management.cpp @@ -1,7 +1,7 @@ #include "cpu_management.h" #include "Util/config.h" #include -#include +#include namespace HLE::Libs::LibKernel::CPUManagement { int PS4_SYSV_ABI sceKernelIsNeoMode() { diff --git a/src/Core/PS4/HLE/Kernel/event_queues.cpp b/src/Core/PS4/HLE/Kernel/event_queues.cpp index dc26f820..c7ea7adc 100644 --- a/src/Core/PS4/HLE/Kernel/event_queues.cpp +++ b/src/Core/PS4/HLE/Kernel/event_queues.cpp @@ -1,7 +1,7 @@ #include "event_queues.h" -#include -#include +#include +#include #include #include diff --git a/src/Core/PS4/HLE/Kernel/memory_management.cpp b/src/Core/PS4/HLE/Kernel/memory_management.cpp index bea58c25..d891f6b9 100644 --- a/src/Core/PS4/HLE/Kernel/memory_management.cpp +++ b/src/Core/PS4/HLE/Kernel/memory_management.cpp @@ -1,7 +1,7 @@ #include "memory_management.h" -#include -#include +#include +#include #include #include diff --git a/src/Core/PS4/HLE/LibKernel.cpp b/src/Core/PS4/HLE/LibKernel.cpp index 7a752c65..a7599afa 100644 --- a/src/Core/PS4/HLE/LibKernel.cpp +++ b/src/Core/PS4/HLE/LibKernel.cpp @@ -11,8 +11,8 @@ #include "Kernel/event_queues.h" #include "Kernel/memory_management.h" #include "Libs.h" -#include "Core/hle/libraries/libkernel/file_system.h" -#include "Core/hle/libraries/libkernel/time_management.h" +#include "core/hle/libraries/libkernel/file_system.h" +#include "core/hle/libraries/libkernel/time_management.h" namespace HLE::Libs::LibKernel { diff --git a/src/Core/PS4/HLE/LibSceGnmDriver.cpp b/src/Core/PS4/HLE/LibSceGnmDriver.cpp index 8b6a07af..14d1f43e 100644 --- a/src/Core/PS4/HLE/LibSceGnmDriver.cpp +++ b/src/Core/PS4/HLE/LibSceGnmDriver.cpp @@ -3,7 +3,7 @@ #include "../Loader/Elf.h" #include #include -#include +#include #include namespace HLE::Libs::LibSceGnmDriver { diff --git a/src/Core/PS4/HLE/Libs.cpp b/src/Core/PS4/HLE/Libs.cpp index f4230db2..8b0216fb 100644 --- a/src/Core/PS4/HLE/Libs.cpp +++ b/src/Core/PS4/HLE/Libs.cpp @@ -3,7 +3,7 @@ #include "LibC.h" #include "LibKernel.h" #include "LibSceGnmDriver.h" -#include +#include #include "Emulator/HLE/Libraries/LibUserService/user_service.h" #include "Emulator/HLE/Libraries/LibPad/pad.h" #include diff --git a/src/Core/PS4/HLE/Libs.h b/src/Core/PS4/HLE/Libs.h index 39c15d47..be663939 100644 --- a/src/Core/PS4/HLE/Libs.h +++ b/src/Core/PS4/HLE/Libs.h @@ -1,6 +1,6 @@ #pragma once #include "../Loader/SymbolsResolver.h" -#include +#include #define LIB_FUNCTION(nid, lib, libversion, mod, moduleVersionMajor, moduleVersionMinor, function) \ {\ diff --git a/src/Core/hle/libraries/libkernel/file_system.cpp b/src/Core/hle/libraries/libkernel/file_system.cpp index c6679b1d..bc3ba4d7 100644 --- a/src/Core/hle/libraries/libkernel/file_system.cpp +++ b/src/Core/hle/libraries/libkernel/file_system.cpp @@ -1,6 +1,6 @@ #include "file_system.h" -#include +#include #include #include diff --git a/src/Core/hle/libraries/libkernel/file_system.h b/src/Core/hle/libraries/libkernel/file_system.h index 549d2bd4..36c973aa 100644 --- a/src/Core/hle/libraries/libkernel/file_system.h +++ b/src/Core/hle/libraries/libkernel/file_system.h @@ -1,6 +1,6 @@ #pragma once #include -#include "Core/PS4/Loader/SymbolsResolver.h" +#include "core/PS4/Loader/SymbolsResolver.h" namespace Core::Libraries::LibKernel { int PS4_SYSV_ABI sceKernelOpen(const char *path, int flags, /* SceKernelMode*/ u16 mode); diff --git a/src/Core/hle/libraries/libkernel/time_management.cpp b/src/Core/hle/libraries/libkernel/time_management.cpp index ab5d94d4..77665812 100644 --- a/src/Core/hle/libraries/libkernel/time_management.cpp +++ b/src/Core/hle/libraries/libkernel/time_management.cpp @@ -1,6 +1,6 @@ #include "time_management.h" -#include +#include #include "Lib/Timer.h" #include "emuTimer.h" diff --git a/src/Core/hle/libraries/libkernel/time_management.h b/src/Core/hle/libraries/libkernel/time_management.h index faa4ed85..7ea068a9 100644 --- a/src/Core/hle/libraries/libkernel/time_management.h +++ b/src/Core/hle/libraries/libkernel/time_management.h @@ -1,7 +1,7 @@ #pragma once #include "types.h" -#include "Core/PS4/Loader/SymbolsResolver.h" +#include "core/PS4/Loader/SymbolsResolver.h" namespace Core::Libraries::LibKernel { u64 PS4_SYSV_ABI sceKernelGetProcessTime(); diff --git a/src/Core/virtual_memory.cpp b/src/Core/virtual_memory.cpp index d96f7c75..4f0c3c39 100644 --- a/src/Core/virtual_memory.cpp +++ b/src/Core/virtual_memory.cpp @@ -1,6 +1,6 @@ #include "virtual_memory.h" -#include "Core/PS4/Loader/Elf.h" +#include "core/PS4/Loader/Elf.h" #ifdef _WIN64 #include diff --git a/src/Emulator/HLE/Libraries/LibPad/pad.cpp b/src/Emulator/HLE/Libraries/LibPad/pad.cpp index 1fe2798d..dbcf5d4b 100644 --- a/src/Emulator/HLE/Libraries/LibPad/pad.cpp +++ b/src/Emulator/HLE/Libraries/LibPad/pad.cpp @@ -1,7 +1,7 @@ #include "pad.h" -#include -#include +#include +#include #include "Emulator/Util/singleton.h" #include "Emulator/Host/controller.h" diff --git a/src/Emulator/HLE/Libraries/LibPad/pad.h b/src/Emulator/HLE/Libraries/LibPad/pad.h index 72d09726..b47b1607 100644 --- a/src/Emulator/HLE/Libraries/LibPad/pad.h +++ b/src/Emulator/HLE/Libraries/LibPad/pad.h @@ -2,7 +2,7 @@ #include #include -#include "Core/PS4/Loader/SymbolsResolver.h" +#include "core/PS4/Loader/SymbolsResolver.h" namespace Emulator::HLE::Libraries::LibPad { diff --git a/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp b/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp index 4786b5fd..354241ce 100644 --- a/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp +++ b/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "system_service.h" diff --git a/src/Emulator/HLE/Libraries/LibSystemService/system_service.h b/src/Emulator/HLE/Libraries/LibSystemService/system_service.h index 4c098606..bb4e98a0 100644 --- a/src/Emulator/HLE/Libraries/LibSystemService/system_service.h +++ b/src/Emulator/HLE/Libraries/LibSystemService/system_service.h @@ -1,5 +1,5 @@ #pragma once -#include "Core/PS4/Loader/SymbolsResolver.h" +#include "core/PS4/Loader/SymbolsResolver.h" namespace Emulator::HLE::Libraries::LibSystemService { diff --git a/src/Emulator/HLE/Libraries/LibUserService/user_service.cpp b/src/Emulator/HLE/Libraries/LibUserService/user_service.cpp index 2f58b956..0b2f4ae7 100644 --- a/src/Emulator/HLE/Libraries/LibUserService/user_service.cpp +++ b/src/Emulator/HLE/Libraries/LibUserService/user_service.cpp @@ -1,7 +1,7 @@ #include "user_service.h" -#include -#include +#include +#include namespace Emulator::HLE::Libraries::LibUserService { diff --git a/src/Emulator/HLE/Libraries/LibUserService/user_service.h b/src/Emulator/HLE/Libraries/LibUserService/user_service.h index 6c22c217..7371950b 100644 --- a/src/Emulator/HLE/Libraries/LibUserService/user_service.h +++ b/src/Emulator/HLE/Libraries/LibUserService/user_service.h @@ -1,5 +1,5 @@ #pragma once -#include "Core/PS4/Loader/SymbolsResolver.h" +#include "core/PS4/Loader/SymbolsResolver.h" namespace Emulator::HLE::Libraries::LibUserService { diff --git a/src/Emulator/Host/controller.cpp b/src/Emulator/Host/controller.cpp index 55373f14..599fb46f 100644 --- a/src/Emulator/Host/controller.cpp +++ b/src/Emulator/Host/controller.cpp @@ -1,5 +1,5 @@ #include "controller.h" -#include +#include namespace Emulator::Host::Controller { GameController::GameController() { m_states_num = 0; diff --git a/src/GUI/ElfViewer.h b/src/GUI/ElfViewer.h index ee5cea92..13a24d8c 100644 --- a/src/GUI/ElfViewer.h +++ b/src/GUI/ElfViewer.h @@ -1,5 +1,5 @@ #pragma once -#include "../Core/PS4/Loader/Elf.h" +#include "../core/PS4/Loader/Elf.h" class ElfViewer { private: diff --git a/src/emulator.cpp b/src/emulator.cpp index b96ffeca..c997bfd5 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -1,12 +1,12 @@ #include "emulator.h" -#include +#include #include #include #include #include -#include "Core/PS4/HLE/Graphics/video_out.h" +#include "core/PS4/HLE/Graphics/video_out.h" #include "Emulator/HLE/Libraries/LibPad/pad.h" #include "Emulator/Util/singleton.h" #include "version.h" diff --git a/src/emulator.h b/src/emulator.h index 0e9f938d..6f0fe528 100644 --- a/src/emulator.h +++ b/src/emulator.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/main.cpp b/src/main.cpp index 0c10cbd1..b3fa7dcc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,14 +3,14 @@ #include #include "types.h" #include "Util/log.h" -#include +#include #include #include #include #include #include -#include "Core/PS4/HLE/Libs.h" -#include "Core/PS4/Linker.h" +#include "core/PS4/HLE/Libs.h" +#include "core/PS4/Linker.h" #include "Emulator/Util\singleton.h" #include "discord.h" #include "emuTimer.h" diff --git a/src/vulkan_util.cpp b/src/vulkan_util.cpp index 5821944d..2dedcd83 100644 --- a/src/vulkan_util.cpp +++ b/src/vulkan_util.cpp @@ -1,6 +1,6 @@ #include "vulkan_util.h" #include -#include +#include #include #include #include diff --git a/src/vulkan_util.h b/src/vulkan_util.h index bd1fdda8..e4eda911 100644 --- a/src/vulkan_util.h +++ b/src/vulkan_util.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include