diff --git a/.gitmodules b/.gitmodules index 60fb5fbb..94996586 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,84 @@ -[submodule "externals/discord-rpc"] - path = externals/discord-rpc - url = https://github.com/shadps4-emu/ext-discord-rpc.git [submodule "externals/cryptopp-cmake"] path = externals/cryptopp-cmake url = https://github.com/shadps4-emu/ext-cryptopp-cmake.git + shallow = true [submodule "externals/cryptopp"] path = externals/cryptopp url = https://github.com/shadps4-emu/ext-cryptopp.git + shallow = true [submodule "externals/cryptoppwin"] path = externals/cryptoppwin url = https://github.com/shadps4-emu/ext-cryptoppwin.git + shallow = true [submodule "externals/zlib-ng"] path = externals/zlib-ng url = https://github.com/shadps4-emu/ext-zlib-ng.git + shallow = true [submodule "externals/sdl3"] path = externals/sdl3 url = https://github.com/shadps4-emu/ext-SDL.git + shallow = true [submodule "externals/fmt"] path = externals/fmt url = https://github.com/shadps4-emu/ext-fmt.git + shallow = true [submodule "externals/vulkan-headers"] path = externals/vulkan-headers url = https://github.com/KhronosGroup/Vulkan-Headers.git + shallow = true [submodule "externals/vma"] path = externals/vma url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git + shallow = true [submodule "externals/glslang"] path = externals/glslang url = https://github.com/KhronosGroup/glslang.git + shallow = true [submodule "externals/robin-map"] path = externals/robin-map url = https://github.com/Tessil/robin-map.git + shallow = true [submodule "externals/xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git + shallow = true [submodule "externals/winpthreads"] path = externals/winpthreads url = https://github.com/shadps4-emu/winpthreads.git + shallow = true [submodule "externals/magic_enum"] path = externals/magic_enum url = https://github.com/Neargye/magic_enum.git + shallow = true [submodule "externals/toml11"] path = externals/toml11 url = https://github.com/ToruNiina/toml11.git + shallow = true [submodule "externals/zydis"] path = externals/zydis url = https://github.com/zyantific/zydis.git + shallow = true [submodule "externals/sirit"] path = externals/sirit url = https://github.com/shadps4-emu/sirit.git + shallow = true [submodule "externals/xxhash"] path = externals/xxhash url = https://github.com/Cyan4973/xxHash.git + shallow = true [submodule "externals/tracy"] path = externals/tracy url = https://github.com/shadps4-emu/tracy.git + shallow = true [submodule "externals/ext-boost"] path = externals/ext-boost url = https://github.com/shadps4-emu/ext-boost.git + shallow = true [submodule "externals/date"] path = externals/date url = https://github.com/HowardHinnant/date.git + shallow = true [submodule "externals/ffmpeg-core"] path = externals/ffmpeg-core - url = https://github.com/shadps4-emu/ext-ffmpeg-core + url = https://github.com/shadps4-emu/ext-ffmpeg-core.git + shallow = true \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 478fb43d..8e349e58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,6 +262,7 @@ set(NP_LIBS src/core/libraries/np_manager/np_manager.cpp src/core/libraries/np_trophy/np_trophy.cpp src/core/libraries/np_trophy/np_trophy.h ) + set(MISC_LIBS src/core/libraries/screenshot/screenshot.cpp src/core/libraries/screenshot/screenshot.h ) @@ -411,7 +412,6 @@ set(SHADER_RECOMPILER src/shader_recompiler/exception.h src/shader_recompiler/backend/spirv/spirv_emit_context.h src/shader_recompiler/frontend/translate/data_share.cpp src/shader_recompiler/frontend/translate/export.cpp - src/shader_recompiler/frontend/translate/flat_memory.cpp src/shader_recompiler/frontend/translate/scalar_alu.cpp src/shader_recompiler/frontend/translate/scalar_memory.cpp src/shader_recompiler/frontend/translate/translate.cpp diff --git a/documents/Quickstart/1.png b/documents/Quickstart/1.png deleted file mode 100644 index 6dc0ce2e..00000000 Binary files a/documents/Quickstart/1.png and /dev/null differ diff --git a/documents/changelog.txt b/documents/changelog.txt index 7f9c2526..0e189f58 100644 --- a/documents/changelog.txt +++ b/documents/changelog.txt @@ -1,32 +1,44 @@ +v0.2.0 15/08/2024 - codename validptr +================= +- Adding macOS support +- Big shader recompiler improvements +- Core improvements +- GUI improvements + +v0.1.0 01/07/2024 - codename madturtle +================= +- Added a shader recompiler, with this we have a lot of games that starts to work +- Rewrote a big part of core + v0.0.3 23/03/2024 - codename salad ================= --Switching to std::thread --Use unique_ptr where possible --Replace printf/scanf with type safe fmt --Implemented sceKernelGetProcessTime --Implemented sceKernelGetProcessTimeCounter , sceKernelGetProcessTimeCounterFrequency --Pause emu with P button --Timers rewrote with std::chrono --Added sceSystemServiceGetStatus --Initial FileSystem implementation --Initial TLS work --New logging implementation --Some functions implemented for userService,systemService --Added sceAudioOut module and output using sdl audio +- Switching to std::thread +- Use unique_ptr where possible +- Replace printf/scanf with type safe fmt +- Implemented sceKernelGetProcessTime +- Implemented sceKernelGetProcessTimeCounter, sceKernelGetProcessTimeCounterFrequency +- Pause emu with P button +- Timers rewrote with std::chrono +- Added sceSystemServiceGetStatus +- Initial FileSystem implementation +- Initial TLS work +- New logging implementation +- Some functions implemented for userService, systemService +- Added sceAudioOut module and output using SDL audio v0.0.2 21/10/2023 ================= --using cstdint header in variable types --run_main_entry: Rewrite in asm for stack setup --printf libc implementation for work with sysv_abi --initial pad emulation (only digital pad atm) --Implemented sceVideoOutIsFlipPending --Added auto stubs , now unsupported hle function will resolve as empty stubs --Rewrote libc_cxa functions --Libc implementations ( _ZdlPv,_Znwm,rand,_Fsin,qsort,free,strncpy,memmove,atan2f,pow,_Sin) --ET_SCE_DYNAMIC behaves as valid for execution now. --Initial FileSystem work (not yet usable). +- Using cstdint header in variable types +- run_main_entry: Rewrite in asm for stack setup +- Printf libc implementation for work with sysv_abi +- Initial pad emulation (only digital pad atm) +- Implemented sceVideoOutIsFlipPending +- Added auto stubs, now unsupported hle function will resolve as empty stubs +- Rewrote libc_cxa functions +- Libc implementations ( _ZdlPv,_Znwm,rand,_Fsin,qsort,free,strncpy,memmove,atan2f,pow,_Sin) +- ET_SCE_DYNAMIC behaves as valid for execution now +- Initial FileSystem work (not yet usable) v0.0.1 29/09/2023 ================= -First public release . Everything is new \ No newline at end of file +First public release. Everything is new. \ No newline at end of file diff --git a/documents/readme.txt b/documents/readme.txt deleted file mode 100644 index 748dd060..00000000 --- a/documents/readme.txt +++ /dev/null @@ -1,35 +0,0 @@ -shadPS4 - A PS4 emulator -========================= - -1. Intro -2. Current status -3. Contributors -4. Greetings - -1.Intro -======= -shadPS4 is a Play Station 4 emulator for Windows and Linux. Although atm it can't run a lot of stuff, we are working torwards to make it more compatible. - -2.Current status -================ -shadPS4 is a HLE emulator. Currently on a small amount of functions is emulated, which is one of the reasons compatibility is low. - -3.Contributors -============== -- georgemoralis -- raphaelthegreat -- skmp -- wheremyfoodat - -4.Greetings -=========== -I would like to thank the following people for helping me so far, with coding or moral support. - -- wheremyfoodat - or @rodakinos for believed me -- paris - or OFFTKP for not believing me and that made me a better coder :D -- skmp - or kornilios for being good old friend -- PandaBad - our beloved stalker -- emufan4568 - for advices -- velocity - for talking 1-2 times per year on discord server. We miss you velocity - -- probably more, will include in the next readme :D diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 0b19034d..6fe73a29 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -25,11 +25,6 @@ if (NOT TARGET fmt::fmt) add_subdirectory(fmt) endif() -# Discord-RPC -set(BUILD_EXAMPLES OFF CACHE BOOL "") -add_subdirectory(discord-rpc) -target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC) # If it is clang and MSVC we will add a static lib # CryptoPP diff --git a/externals/discord-rpc b/externals/discord-rpc deleted file mode 160000 index 4ec21815..00000000 --- a/externals/discord-rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4ec218155d73bcb8022f8f7ca72305d801f84beb diff --git a/src/qt_gui/about_dialog.ui b/src/qt_gui/about_dialog.ui index 2b60476b..e2e76f4c 100644 --- a/src/qt_gui/about_dialog.ui +++ b/src/qt_gui/about_dialog.ui @@ -40,9 +40,6 @@ true - - true - @@ -106,5 +103,6 @@ + diff --git a/src/qt_gui/settings_dialog.ui b/src/qt_gui/settings_dialog.ui index dbb15206..d11f177d 100644 --- a/src/qt_gui/settings_dialog.ui +++ b/src/qt_gui/settings_dialog.ui @@ -51,8 +51,8 @@ 0 0 - 832 - 418 + 836 + 428 @@ -74,7 +74,7 @@ - + System @@ -112,28 +112,11 @@ - - + - - - - Qt::Orientation::Vertical - - - QSizePolicy::Policy::MinimumExpanding - - - - 0 - 0 - - - - @@ -148,35 +131,39 @@ - - - Enable Fullscreen - - - - - - - Show Splash - - - - - - - Is PS4 Pro - - + + + + + Enable Fullscreen + + + + + + + Show Splash + + + + + + + Is PS4 Pro + + + + - Qt::Orientation::Vertical + Qt::Orientation::Horizontal - 20 - 40 + 40 + 20 @@ -261,19 +248,6 @@ - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - @@ -282,34 +256,29 @@ - - - - 0 - - - 0 - - - 0 - - - 0 - - - + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + - + - GPU + Graphics - + - + - + @@ -323,8 +292,8 @@ - - + + 0 @@ -340,44 +309,10 @@ - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - Qt::Orientation::Vertical - - - QSizePolicy::Policy::MinimumExpanding - - - - 0 - 0 - - - - - + @@ -505,26 +440,10 @@ - - - - Qt::Orientation::Vertical - - - QSizePolicy::Policy::MinimumExpanding - - - - 0 - 0 - - - - - + 12 @@ -534,7 +453,7 @@ - Additional Settings + Advanced Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -565,17 +484,14 @@ - + Qt::Orientation::Vertical - - QSizePolicy::Policy::MinimumExpanding - - 0 - 0 + 20 + 40 @@ -584,6 +500,19 @@ + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + diff --git a/src/shader_recompiler/frontend/translate/flat_memory.cpp b/src/shader_recompiler/frontend/translate/flat_memory.cpp deleted file mode 100644 index e69de29b..00000000