Merge https://github.com/shadps4-emu/shadPS4 into rb4-testing

Author: LlysiX

.github/ISSUE_TEMPLATE/app-bug-report.yaml

@@ -10,8 +10,8 @@ body:
       value: |
         ## Important: Read First
 
-        Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only
-        If you need help using the emulator or unsure about your issue please contact us on [discord](https://discord.gg/bFJxfftGW6).
+        **Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only.
+        If you have a support request or are unsure about the nature of your issue please contact us on [discord](https://discord.gg/bFJxfftGW6).**
 
         Please make an effort to make sure your issue isn't already reported.
 

.github/ISSUE_TEMPLATE/game-bug-report.yaml

@@ -10,26 +10,30 @@ body:
       value: |
         ## Important: Read First
 
-        Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only
-        If you need help using the emulator or unsure about your issue please contact us on [discord](https://discord.gg/bFJxfftGW6).
+        **Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only.
+        If you have a support request or are unsure about the nature of your issue please contact us on [discord](https://discord.gg/bFJxfftGW6).**
 
-        You can also check the [Game Compatibility Repository](https://github.com/shadps4-emu/shadps4-game-compatibility) for the information about the status of the game.
+        This repository does not provide support for modded games. You should perform and test a clean game installation before submitting an issue.
+
+        This repository does not provide support for game patches. If you are having issues with patches please refer to [Cheats and Patches Repository](https://github.com/shadps4-emu/ps4_cheats).
+
+        Before submitting an issue please check [Game Compatibility Repository](https://github.com/shadps4-emu/shadps4-game-compatibility) for the information about the status of the game.
 
         Please make an effort to make sure your issue isn't already reported.
 
         Do not create issues involving software piracy, our rules specifically prohibit this. Otherwise your issue will be closed and you will be banned in this repository.
   - type: checkboxes
     id: checklist
     attributes:
-      label: Checklist
+      label: Checklist (we expect you to perform these steps before opening the issue)
       options:
         - label: I have searched for a similar issue in this repository and did not find one.
           required: true
         - label: I am using an official build obtained from [releases](https://github.com/shadps4-emu/shadPS4/releases) or updated one of those builds using its in-app updater.
           required: true
-        - label: I have re-dumped the game and performed a clean install without mods.
+        - label: I have re-dumped the game and performed a clean install without mods and the issue is still present.
           required: true
-        - label: I have disabled all patches and cheats.
+        - label: I have disabled all patches and cheats and the issue is still present.
           required: true
         - label: I have all the required [system modules](https://github.com/shadps4-emu/shadps4-game-compatibility?tab=readme-ov-file#informations) installed.
           required: true

.gitmodules

@@ -119,7 +119,3 @@
 	path = externals/MoltenVK/cereal
 	url = https://github.com/USCiLab/cereal
 	shallow = true
-[submodule "externals/cubeb"]
-	path = externals/cubeb
-	url = https://github.com/mozilla/cubeb
-	shallow = true

CMakeLists.txt

@@ -127,7 +127,6 @@ find_package(xxHash 0.8.2 MODULE)
 find_package(ZLIB 1.3 MODULE)
 find_package(Zydis 5.0.0 CONFIG)
 find_package(pugixml 1.14 CONFIG)
-find_package(cubeb CONFIG)
 
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR NOT MSVC)
     find_package(cryptopp 8.9.0 MODULE)
@@ -203,7 +202,6 @@ set(AUDIO_LIB src/core/libraries/audio/audioin.cpp
               src/core/libraries/audio/audioout.h
               src/core/libraries/audio/audioout_backend.h
               src/core/libraries/audio/audioout_error.h
-              src/core/libraries/audio/cubeb_audio.cpp
               src/core/libraries/audio/sdl_audio.cpp
               src/core/libraries/ngs2/ngs2.cpp
               src/core/libraries/ngs2/ngs2.h
@@ -499,7 +497,6 @@ set(COMMON src/common/logging/backend.cpp
            src/common/polyfill_thread.h
            src/common/rdtsc.cpp
            src/common/rdtsc.h
-           src/common/ringbuffer.h
            src/common/signal_context.h
            src/common/signal_context.cpp
            src/common/singleton.h
@@ -701,6 +698,7 @@ set(SHADER_RECOMPILER src/shader_recompiler/exception.h
                       src/shader_recompiler/ir/post_order.h
                       src/shader_recompiler/ir/program.cpp
                       src/shader_recompiler/ir/program.h
+                      src/shader_recompiler/ir/reinterpret.h
                       src/shader_recompiler/ir/reg.h
                       src/shader_recompiler/ir/type.cpp
                       src/shader_recompiler/ir/type.h
@@ -891,7 +889,7 @@ endif()
 create_target_directory_groups(shadps4)
 
 target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG)
-target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers cubeb::cubeb)
+target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers)
 
 target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h")
 target_compile_definitions(Dear_ImGui PRIVATE IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/src/imgui/imgui_config.h")

LICENSES/ISC.txt

@@ -228,16 +228,6 @@ if (NOT TARGET stb::headers)
     add_library(stb::headers ALIAS stb)
 endif()
 
-# cubeb
-if (NOT TARGET cubeb::cubeb)
-    option(BUILD_TESTS "" OFF)
-    option(BUILD_TOOLS "" OFF)
-    option(BUNDLE_SPEEX "" ON)
-    option(USE_SANITIZERS "" OFF)
-    add_subdirectory(cubeb)
-    add_library(cubeb::cubeb ALIAS cubeb)
-endif()
-
 # Apple-only dependencies
 if (APPLE)
     # date

externals/CMakeLists.txt

@@ -67,7 +67,7 @@ static int cursorHideTimeout = 5; // 5 seconds (default)
 static bool separateupdatefolder = false;
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
-static std::string audioBackend = "cubeb";
+static std::string trophyKey;
 
 // Gui
 std::vector<std::filesystem::path> settings_install_dirs = {};
@@ -92,6 +92,14 @@ std::string emulator_language = "en";
 // Language
 u32 m_language = 1; // english
 
+std::string getTrophyKey() {
+    return trophyKey;
+}
+
+void setTrophyKey(std::string key) {
+    trophyKey = key;
+}
+
 bool isNeoMode() {
     return isNeo;
 }
@@ -240,10 +248,6 @@ bool getCheckCompatibilityOnStartup() {
     return checkCompatibilityOnStartup;
 }
 
-std::string getAudioBackend() {
-    return audioBackend;
-}
-
 void setGpuId(s32 selectedGpuId) {
     gpuId = selectedGpuId;
 }
@@ -376,10 +380,6 @@ void setCheckCompatibilityOnStartup(bool use) {
     checkCompatibilityOnStartup = use;
 }
 
-void setAudioBackend(std::string backend) {
-    audioBackend = backend;
-}
-
 void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h) {
     main_window_geometry_x = x;
     main_window_geometry_y = y;
@@ -620,12 +620,6 @@ void load(const std::filesystem::path& path) {
         vkCrashDiagnostic = toml::find_or<bool>(vk, "crashDiagnostic", false);
     }
 
-    if (data.contains("Audio")) {
-        const toml::value& audio = data.at("Audio");
-
-        audioBackend = toml::find_or<std::string>(audio, "backend", "cubeb");
-    }
-
     if (data.contains("Debug")) {
         const toml::value& debug = data.at("Debug");
 
@@ -667,6 +661,11 @@ void load(const std::filesystem::path& path) {
 
         m_language = toml::find_or<int>(settings, "consoleLanguage", 1);
     }
+
+    if (data.contains("Keys")) {
+        const toml::value& keys = data.at("Keys");
+        trophyKey = toml::find_or<std::string>(keys, "TrophyKey", "");
+    }
 }
 
 void save(const std::filesystem::path& path) {
@@ -724,10 +723,11 @@ void save(const std::filesystem::path& path) {
     data["Vulkan"]["rdocEnable"] = rdocEnable;
     data["Vulkan"]["rdocMarkersEnable"] = vkMarkers;
     data["Vulkan"]["crashDiagnostic"] = vkCrashDiagnostic;
-    data["Audio"]["backend"] = audioBackend;
     data["Debug"]["DebugDump"] = isDebugDump;
     data["Debug"]["CollectShader"] = isShaderDebug;
 
+    data["Keys"]["TrophyKey"] = trophyKey;
+
     std::vector<std::string> install_dirs;
     for (const auto& dirString : settings_install_dirs) {
         install_dirs.emplace_back(std::string{fmt::UTF(dirString.u8string()).data});
@@ -828,7 +828,6 @@ void setDefaultValues() {
     separateupdatefolder = false;
     compatibilityData = false;
     checkCompatibilityOnStartup = false;
-    audioBackend = "cubeb";
 }
 
 } // namespace Config

externals/cubeb

@@ -15,6 +15,9 @@ void load(const std::filesystem::path& path);
 void save(const std::filesystem::path& path);
 void saveMainWindow(const std::filesystem::path& path);
 
+std::string getTrophyKey();
+void setTrophyKey(std::string key);
+
 bool isNeoMode();
 bool isFullscreenMode();
 bool getPlayBGM();
@@ -24,7 +27,6 @@ bool getEnableDiscordRPC();
 bool getSeparateUpdateEnabled();
 bool getCompatibilityEnabled();
 bool getCheckCompatibilityOnStartup();
-std::string getAudioBackend();
 
 std::string getLogFilter();
 std::string getLogType();
@@ -76,7 +78,6 @@ void setSeparateUpdateEnabled(bool use);
 void setGameInstallDirs(const std::vector<std::filesystem::path>& settings_install_dirs_config);
 void setCompatibilityEnabled(bool use);
 void setCheckCompatibilityOnStartup(bool use);
-void setAudioBackend(std::string backend);
 
 void setCursorState(s16 cursorState);
 void setCursorHideTimeout(int newcursorHideTimeout);

src/common/config.cpp

@@ -4,11 +4,6 @@
 #include "common/native_clock.h"
 #include "common/rdtsc.h"
 #include "common/uint128.h"
-#ifdef _WIN64
-#include <pthread_time.h>
-#else
-#include <time.h>
-#endif
 
 namespace Common {
 
@@ -34,10 +29,4 @@ u64 NativeClock::GetUptime() const {
     return FencedRDTSC();
 }
 
-u64 NativeClock::GetProcessTimeUS() const {
-    timespec ret;
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ret);
-    return ret.tv_nsec / 1000 + ret.tv_sec * 1000000;
-}
-
 } // namespace Common

src/common/config.h

@@ -20,7 +20,6 @@ class NativeClock final {
     u64 GetTimeUS(u64 base_ptc = 0) const;
     u64 GetTimeMS(u64 base_ptc = 0) const;
     u64 GetUptime() const;
-    u64 GetProcessTimeUS() const;
 
 private:
     u64 rdtsc_frequency;