Canary #2798

Merge PR 7472
Merge PR 7429
2026-10-25 23:06:01 +00:00 · 2024-03-04 00:25:34 +00:00 · 2024-03-04 00:25:34 +00:00 · 2024-03-04 00:25:34 +00:00 · 2024-03-04 00:25:34 +00:00 · 2024-03-04 00:25:34 +00:00
33 changed files with 282 additions and 255 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -12,13 +12,13 @@ jobs:
    if: ${{ !github.head_ref }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Pack
        run: ./.ci/source.sh
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: source
          path: artifacts/
@ -37,11 +37,11 @@ jobs:
      OS: linux
      TARGET: ${{ matrix.target }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
@ -53,7 +53,7 @@ jobs:
        run: ./.ci/pack.sh
        if: ${{ matrix.target == 'appimage' }}
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: ${{ matrix.target == 'appimage' }}
        with:
          name: ${{ env.OS }}-${{ env.TARGET }}
@ -70,24 +70,24 @@ jobs:
      OS: macos
      TARGET: ${{ matrix.target }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
          restore-keys: |
            ${{ runner.os }}-${{ matrix.target }}-
      - name: Install tools
-        run: brew install ccache glslang ninja
+        run: brew install ccache ninja
      - name: Build
        run: ./.ci/macos.sh
      - name: Prepare outputs for caching
        run: mv build/bundle $OS-$TARGET
      - name: Cache outputs for universal build
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
        with:
          path: ${{ env.OS }}-${{ env.TARGET }}
          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
@ -98,15 +98,15 @@ jobs:
      OS: macos
      TARGET: universal
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Download x86_64 build from cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
        with:
          path: ${{ env.OS }}-x86_64
          key: ${{ runner.os }}-x86_64-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
          fail-on-cache-miss: true
      - name: Download ARM64 build from cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
        with:
          path: ${{ env.OS }}-arm64
          key: ${{ runner.os }}-arm64-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
@ -118,7 +118,7 @@ jobs:
      - name: Pack
        run: ./.ci/pack.sh
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ env.OS }}-${{ env.TARGET }}
          path: artifacts/
@ -137,11 +137,11 @@ jobs:
      OS: windows
      TARGET: ${{ matrix.target }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
@ -153,13 +153,6 @@ jobs:
      - name: Install extra tools (MSVC)
        run: choco install ccache ninja wget
        if: ${{ matrix.target == 'msvc' }}
-      - name: Set up Vulkan SDK (MSVC)
-        uses: humbletim/setup-vulkan-sdk@v1.2.0
-        if: ${{ matrix.target == 'msvc' }}
-        with:
-          vulkan-query-version: latest
-          vulkan-components: SPIRV-Tools, Glslang
-          vulkan-use-cache: true
      - name: Set up MSYS2
        uses: msys2/setup-msys2@v2
        if: ${{ matrix.target == 'msys2' }}
@ -168,10 +161,8 @@ jobs:
          update: true
          install: git make p7zip
          pacboy: >-
-            toolchain:p ccache:p cmake:p ninja:p glslang:p
+            toolchain:p ccache:p cmake:p ninja:p
            qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
-      - name: Test glslang
-        run: glslang --version || glslangValidator --version
      - name: Disable line ending translation
        run: git config --global core.autocrlf input
      - name: Build
@ -179,7 +170,7 @@ jobs:
      - name: Pack
        run: ./.ci/pack.sh
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ env.OS }}-${{ env.TARGET }}
          path: artifacts/
@ -192,11 +183,11 @@ jobs:
      OS: android
      TARGET: universal
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: |
            ~/.gradle/caches
@ -215,7 +206,7 @@ jobs:
        run: |
          sudo add-apt-repository -y ppa:theofficialgman/gpu-tools
          sudo apt-get update -y
-          sudo apt-get install ccache glslang-dev glslang-tools apksigner -y
+          sudo apt-get install ccache apksigner -y
      - name: Build
        run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh
        env:
@ -228,7 +219,7 @@ jobs:
        env:
          UNPACKED: 1
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ env.OS }}-${{ env.TARGET }}
          path: src/android/app/artifacts/
@ -242,18 +233,18 @@ jobs:
      OS: ios
      TARGET: arm64
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ runner.os }}-ios-${{ github.sha }}
          restore-keys: |
            ${{ runner.os }}-ios-
      - name: Install tools
-        run: brew install ccache glslang ninja
+        run: brew install ccache ninja
      - name: Build
        run: ./.ci/ios.sh
  release:
@ -261,7 +252,7 @@ jobs:
    needs: [windows, linux, macos-universal, android, source]
    if: ${{ startsWith(github.ref, 'refs/tags/') }}
    steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
      - name: Create release
        uses: actions/create-release@v1
        env:
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@ -13,7 +13,7 @@ jobs:
      image: citraemu/build-environments:linux-fresh
      options: -u 1001
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Build
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -20,11 +20,11 @@ jobs:
    if: ${{ github.event.inputs.nightly != 'false' && github.repository == 'citra-emu/citra' }}
    steps:
      # this checkout is required to make sure the GitHub Actions scripts are available
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        name: Pre-checkout
        with:
          submodules: false
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
        id: check-changes
        name: 'Check for new changes'
        env:
@ -38,7 +38,7 @@ jobs:
            return checkBaseChanges(github, context);
      - run: npm install execa@5
        if: ${{ steps.check-changes.outputs.result == 'true' }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        name: Checkout
        if: ${{ steps.check-changes.outputs.result == 'true' }}
        with:
@ -46,7 +46,7 @@ jobs:
          fetch-depth: 0
          submodules: true
          token: ${{ secrets.ALT_GITHUB_TOKEN }}
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
        name: 'Update and tag new commits'
        if: ${{ steps.check-changes.outputs.result == 'true' }}
        env:
@ -62,11 +62,11 @@ jobs:
    if: ${{ github.event.inputs.canary != 'false' && github.repository == 'citra-emu/citra' }}
    steps:
      # this checkout is required to make sure the GitHub Actions scripts are available
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        name: Pre-checkout
        with:
          submodules: false
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
        id: check-changes
        name: 'Check for new changes'
        env:
@ -79,7 +79,7 @@ jobs:
            return checkCanaryChanges(github, context);
      - run: npm install execa@5
        if: ${{ steps.check-changes.outputs.result == 'true' }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        name: Checkout
        if: ${{ steps.check-changes.outputs.result == 'true' }}
        with:
@ -87,7 +87,7 @@ jobs:
          fetch-depth: 0
          submodules: true
          token: ${{ secrets.ALT_GITHUB_TOKEN }}
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
        name: 'Check and merge canary changes'
        if: ${{ steps.check-changes.outputs.result == 'true' }}
        env:
--- a/.github/workflows/transifex.yml
+++ b/.github/workflows/transifex.yml
@ -10,7 +10,7 @@ jobs:
    container: citraemu/build-environments:linux-fresh
    if: ${{ github.repository == 'citra-emu/citra' }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
          fetch-depth: 0
--- a/README.md
+++ b/README.md
@ -2,11 +2,9 @@
 |----|----|----|----|----|
 | [7372](https://github.com/citra-emu/citra//pull/7372) | [`265ed7ec1`](https://github.com/citra-emu/citra//pull/7372/files) | pica_types: Correctly restrict Float<M, E> precision | [vitor-k](https://github.com/vitor-k/) | Yes |
 | [7384](https://github.com/citra-emu/citra//pull/7384) | [`20ef8e47e`](https://github.com/citra-emu/citra//pull/7384/files) | host_shaders: Remove dependency on shaderSampledImageArrayDynamicIndexing | [GPUCode](https://github.com/GPUCode/) | Yes |
-| [7419](https://github.com/citra-emu/citra//pull/7419) | [`19821b2a8`](https://github.com/citra-emu/citra//pull/7419/files) | Port several small multiplayer PRs from yuzu | [FearlessTobi](https://github.com/FearlessTobi/) | Yes |
 | [7420](https://github.com/citra-emu/citra//pull/7420) | [`1d2f9bc7c`](https://github.com/citra-emu/citra//pull/7420/files) | 3dsx: Minor cleanups and add argument support | [GPUCode](https://github.com/GPUCode/) | Yes |
-| [7429](https://github.com/citra-emu/citra//pull/7429) | [`0c9037f07`](https://github.com/citra-emu/citra//pull/7429/files) | renderer_vulkan: Rewrite descriptor set management and various small fixes | [GPUCode](https://github.com/GPUCode/) | Yes |
-| [7431](https://github.com/citra-emu/citra//pull/7431) | [`68e9a68fd`](https://github.com/citra-emu/citra//pull/7431/files) | android: Port yuzu system info logging | [t895](https://github.com/t895/) | Yes |
-| [7432](https://github.com/citra-emu/citra//pull/7432) | [`a2fd9b751`](https://github.com/citra-emu/citra//pull/7432/files) | audio_core\hle\source.cpp: Improve accuracy of SourceStatus | [SachinVin](https://github.com/SachinVin/) | Yes |
+| [7429](https://github.com/citra-emu/citra//pull/7429) | [`2fe2dd148`](https://github.com/citra-emu/citra//pull/7429/files) | renderer_vulkan: Rewrite descriptor set management and various small fixes | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [7472](https://github.com/citra-emu/citra//pull/7472) | [`2855c5414`](https://github.com/citra-emu/citra//pull/7472/files) | y2r: Delay completion event | [GPUCode](https://github.com/GPUCode/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -294,11 +294,20 @@ endif()
 add_library(httplib INTERFACE)
 if(USE_SYSTEM_CPP_HTTPLIB)
    find_package(CppHttp 0.14.1)
-    if(CppHttp_FOUND)
-        target_link_libraries(httplib INTERFACE httplib::httplib)
-    else()
-        message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
+    # Detect if system cpphttplib is a shared library
+    # this breaks building as Citra relies on functions that are moved
+    # into the shared object.
+    get_target_property(HTTP_LIBS httplib::httplib INTERFACE_LINK_LIBRARIES)
+    if(HTTP_LIBS)
+        message(WARNING "Shared cpp-http (${HTTP_LIBS}) not supported. Falling back to bundled...")
        target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+    else()
+        if(CppHttp_FOUND)
+            target_link_libraries(httplib INTERFACE httplib::httplib)
+        else()
+            message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
+            target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+        endif()
    endif()
 else()
    target_include_directories(httplib SYSTEM INTERFACE ./httplib)
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@ -3197,8 +3197,10 @@ int main(int argc, char* argv[]) {
    QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_policy);

 #ifdef __APPLE__
-    std::string bin_path = FileUtil::GetBundleDirectory() + DIR_SEP + "..";
-    chdir(bin_path.c_str());
+    auto bundle_dir = FileUtil::GetBundleDirectory();
+    if (bundle_dir) {
+        FileUtil::SetCurrentDir(bundle_dir.value() + "..");
+    }
 #endif

 #ifdef ENABLE_OPENGL
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@ -13,7 +13,6 @@
 #endif

 // The user data dir
-#define ROOT_DIR "."
 #define USERDATA_DIR "user"
 #ifdef USER_DIR
 #define EMU_DATA_DIR USER_DIR
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@ -634,6 +634,10 @@ std::optional<std::string> GetCurrentDir() {
    std::string strDir = dir;
 #endif
    free(dir);
+
+    if (!strDir.ends_with(DIR_SEP)) {
+        strDir += DIR_SEP;
+    }
    return strDir;
 } // namespace FileUtil

@ -646,17 +650,36 @@ bool SetCurrentDir(const std::string& directory) {
 }

 #if defined(__APPLE__)
-std::string GetBundleDirectory() {
-    CFURLRef BundleRef;
-    char AppBundlePath[MAXPATHLEN];
+std::optional<std::string> GetBundleDirectory() {
    // Get the main bundle for the app
-    BundleRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-    CFStringRef BundlePath = CFURLCopyFileSystemPath(BundleRef, kCFURLPOSIXPathStyle);
-    CFStringGetFileSystemRepresentation(BundlePath, AppBundlePath, sizeof(AppBundlePath));
-    CFRelease(BundleRef);
-    CFRelease(BundlePath);
+    CFBundleRef bundle_ref = CFBundleGetMainBundle();
+    if (!bundle_ref) {
+        return {};
+    }

-    return AppBundlePath;
+    CFURLRef bundle_url_ref = CFBundleCopyBundleURL(bundle_ref);
+    if (!bundle_url_ref) {
+        return {};
+    }
+    SCOPE_EXIT({ CFRelease(bundle_url_ref); });
+
+    CFStringRef bundle_path_ref = CFURLCopyFileSystemPath(bundle_url_ref, kCFURLPOSIXPathStyle);
+    if (!bundle_path_ref) {
+        return {};
+    }
+    SCOPE_EXIT({ CFRelease(bundle_path_ref); });
+
+    char app_bundle_path[MAXPATHLEN];
+    if (!CFStringGetFileSystemRepresentation(bundle_path_ref, app_bundle_path,
+                                             sizeof(app_bundle_path))) {
+        return {};
+    }
+
+    std::string path_str(app_bundle_path);
+    if (!path_str.ends_with(DIR_SEP)) {
+        path_str += DIR_SEP;
+    }
+    return path_str;
 }
 #endif

@ -732,22 +755,6 @@ static const std::string& GetHomeDirectory() {
 }
 #endif

-std::string GetSysDirectory() {
-    std::string sysDir;
-
-#if defined(__APPLE__)
-    sysDir = GetBundleDirectory();
-    sysDir += DIR_SEP;
-    sysDir += SYSDATA_DIR;
-#else
-    sysDir = SYSDATA_DIR;
-#endif
-    sysDir += DIR_SEP;
-
-    LOG_DEBUG(Common_Filesystem, "Setting to {}:", sysDir);
-    return sysDir;
-}
-
 namespace {
 std::unordered_map<UserPath, std::string> g_paths;
 std::unordered_map<UserPath, std::string> g_default_paths;
@ -777,8 +784,10 @@ void SetUserPath(const std::string& path) {
        g_paths.emplace(UserPath::ConfigDir, user_path + CONFIG_DIR DIR_SEP);
        g_paths.emplace(UserPath::CacheDir, user_path + CACHE_DIR DIR_SEP);
 #else
-        if (FileUtil::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) {
-            user_path = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
+        auto current_dir = FileUtil::GetCurrentDir();
+        if (current_dir.has_value() &&
+            FileUtil::Exists(current_dir.value() + USERDATA_DIR DIR_SEP)) {
+            user_path = current_dir.value() + USERDATA_DIR DIR_SEP;
            g_paths.emplace(UserPath::ConfigDir, user_path + CONFIG_DIR DIR_SEP);
            g_paths.emplace(UserPath::CacheDir, user_path + CACHE_DIR DIR_SEP);
        } else {
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@ -193,11 +193,8 @@ void SetCurrentRomPath(const std::string& path);
 // Update the Global Path with the new value
 void UpdateUserPath(UserPath path, const std::string& filename);

-// Returns the path to where the sys file are
-[[nodiscard]] std::string GetSysDirectory();
-
 #ifdef __APPLE__
-[[nodiscard]] std::string GetBundleDirectory();
+[[nodiscard]] std::optional<std::string> GetBundleDirectory();
 #endif

 #ifdef _WIN32
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@ -451,7 +451,7 @@ void SetColorConsoleBackendEnabled(bool enabled) {
 }

 void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
-                       unsigned int line_num, const char* function, const char* format,
+                       unsigned int line_num, const char* function, fmt::string_view format,
                       const fmt::format_args& args) {
    if (!initialization_in_progress_suppress_logging) {
        Impl::Instance().PushEntry(log_class, log_level, filename, line_num, function,
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@ -24,12 +24,12 @@ constexpr const char* TrimSourcePath(std::string_view source) {

 /// Logs a message to the global logger, using fmt
 void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
-                       unsigned int line_num, const char* function, const char* format,
+                       unsigned int line_num, const char* function, fmt::string_view format,
                       const fmt::format_args& args);

 template <typename... Args>
 void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num,
-                   const char* function, const char* format, const Args&... args) {
+                   const char* function, fmt::format_string<Args...> format, const Args&... args) {
    FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format,
                      fmt::make_format_args(args...));
 }
--- a/src/core/hle/kernel/config_mem.cpp
+++ b/src/core/hle/kernel/config_mem.cpp
@ -14,18 +14,18 @@ namespace ConfigMem {
 Handler::Handler() {
    std::memset(&config_mem, 0, sizeof(config_mem));

-    // Values extracted from firmware 11.2.0-35E
-    config_mem.kernel_version_min = 0x34;
+    // Values extracted from firmware 11.17.0-50E
+    config_mem.kernel_version_min = 0x3a;
    config_mem.kernel_version_maj = 0x2;
    config_mem.ns_tid = 0x0004013000008002;
    config_mem.sys_core_ver = 0x2;
    config_mem.unit_info = 0x1; // Bit 0 set for Retail
    config_mem.prev_firm = 0x1;
-    config_mem.ctr_sdk_ver = 0x0000F297;
-    config_mem.firm_version_min = 0x34;
+    config_mem.ctr_sdk_ver = 0x0000F450;
+    config_mem.firm_version_min = 0x3a;
    config_mem.firm_version_maj = 0x2;
    config_mem.firm_sys_core_ver = 0x2;
-    config_mem.firm_ctr_sdk_ver = 0x0000F297;
+    config_mem.firm_ctr_sdk_ver = 0x0000F450;
 }

 ConfigMemDef& Handler::GetConfigMem() {
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@ -210,10 +210,10 @@ void Process::Set3dsxKernelCaps() {
    };

    // Similar to Rosalina, we set kernel version to a recent one.
-    // This is 11.2.0, to be consistent with core/hle/kernel/config_mem.cpp
+    // This is 11.17.0, to be consistent with core/hle/kernel/config_mem.cpp
    // TODO: refactor kernel version out so it is configurable and consistent
    // among all relevant places.
-    kernel_version = 0x234;
+    kernel_version = 0x23a;
 }

 void Process::Run(s32 main_thread_priority, u32 stack_size) {
--- a/src/core/hle/service/apt/applet_manager.cpp
+++ b/src/core/hle/service/apt/applet_manager.cpp
@ -373,7 +373,10 @@ ResultVal<AppletManager::InitializeResult> AppletManager::Initialize(AppletId ap
    if (active_slot == AppletSlot::Error) {
        active_slot = slot;

-        // Wake up the application.
+        // APT automatically calls enable on the first registered applet.
+        Enable(attributes);
+
+        // Wake up the applet.
        SendParameter({
            .sender_id = AppletId::None,
            .destination_id = app_id,
@ -398,7 +401,8 @@ Result AppletManager::Enable(AppletAttributes attributes) {
    auto slot_data = GetAppletSlot(slot);
    slot_data->registered = true;

-    if (slot_data->attributes.applet_pos == AppletPos::System &&
+    if (slot_data->applet_id != AppletId::None &&
+        slot_data->attributes.applet_pos == AppletPos::System &&
        slot_data->attributes.is_home_menu) {
        slot_data->attributes.raw |= attributes.raw;
        LOG_DEBUG(Service_APT, "Updated home menu attributes to {:08X}.",
@ -786,16 +790,23 @@ Result AppletManager::PrepareToStartSystemApplet(AppletId applet_id) {

 Result AppletManager::StartSystemApplet(AppletId applet_id, std::shared_ptr<Kernel::Object> object,
                                        const std::vector<u8>& buffer) {
-    auto source_applet_id = AppletId::None;
+    auto source_applet_id = AppletId::Application;
    if (last_system_launcher_slot != AppletSlot::Error) {
-        const auto slot_data = GetAppletSlot(last_system_launcher_slot);
-        source_applet_id = slot_data->applet_id;
+        const auto launcher_slot_data = GetAppletSlot(last_system_launcher_slot);
+        source_applet_id = launcher_slot_data->applet_id;

-        // If a system applet is launching another system applet, reset the slot to avoid conflicts.
-        // This is needed because system applets won't necessarily call CloseSystemApplet before
-        // exiting.
-        if (last_system_launcher_slot == AppletSlot::SystemApplet) {
-            slot_data->Reset();
+        // APT generally clears and terminates the caller of StartSystemApplet. This helps in
+        // situations such as a system applet launching another system applet, which would
+        // otherwise deadlock.
+        // TODO: In real APT, the check for AppletSlot::Application does not exist; there is
+        // TODO: something wrong with our implementation somewhere that makes this necessary.
+        // TODO: Otherwise, games that attempt to launch system applets will be cleared and
+        // TODO: emulation will crash.
+        if (!launcher_slot_data->registered ||
+            (last_system_launcher_slot != AppletSlot::Application &&
+             !launcher_slot_data->attributes.no_exit_on_system_applet)) {
+            launcher_slot_data->Reset();
+            // TODO: Implement launcher process termination.
        }
    }

--- a/src/core/hle/service/apt/applet_manager.h
+++ b/src/core/hle/service/apt/applet_manager.h
@ -152,6 +152,7 @@ union AppletAttributes {
    u32 raw;

    BitField<0, 3, AppletPos> applet_pos;
+    BitField<28, 1, u32> no_exit_on_system_applet;
    BitField<29, 1, u32> is_home_menu;

    AppletAttributes() : raw(0) {}
--- a/src/core/hle/service/cam/y2r_u.cpp
+++ b/src/core/hle/service/cam/y2r_u.cpp
@ -7,6 +7,7 @@
 #include "common/archives.h"
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
+#include "common/scope_exit.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/event.h"
@ -522,7 +523,13 @@ void Y2R_U::StartConversion(Kernel::HLERequestContext& ctx) {

    HW::Y2R::PerformConversion(system.Memory(), conversion);

-    completion_event->Signal();
+    if (is_busy_conversion) {
+        system.CoreTiming().RemoveEvent(completion_signal_event);
+    }
+
+    static constexpr s64 MinY2RDelay = 50000;
+    system.CoreTiming().ScheduleEvent(MinY2RDelay, completion_signal_event);
+    is_busy_conversion = true;

    IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
    rb.Push(ResultSuccess);
@ -533,6 +540,10 @@ void Y2R_U::StartConversion(Kernel::HLERequestContext& ctx) {
 void Y2R_U::StopConversion(Kernel::HLERequestContext& ctx) {
    IPC::RequestParser rp(ctx);

+    if (is_busy_conversion) {
+        system.CoreTiming().RemoveEvent(completion_signal_event);
+    }
+
    IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
    rb.Push(ResultSuccess);

@ -544,7 +555,7 @@ void Y2R_U::IsBusyConversion(Kernel::HLERequestContext& ctx) {

    IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
    rb.Push(ResultSuccess);
-    rb.Push<u8>(0); // StartConversion always finishes immediately
+    rb.Push(is_busy_conversion);

    LOG_DEBUG(Service_Y2R, "called");
 }
@ -558,34 +569,38 @@ void Y2R_U::SetPackageParameter(Kernel::HLERequestContext& ctx) {
    conversion.rotation = params.rotation;
    conversion.block_alignment = params.block_alignment;

-    Result result = conversion.SetInputLineWidth(params.input_line_width);
-
-    if (result.IsError())
-        goto cleanup;
-
-    result = conversion.SetInputLines(params.input_lines);
-
-    if (result.IsError())
-        goto cleanup;
-
-    result = conversion.SetStandardCoefficient(params.standard_coefficient);
-
-    if (result.IsError())
-        goto cleanup;
-
-    conversion.padding = params.padding;
-    conversion.alpha = params.alpha;
-
-cleanup:
-    IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
-    rb.Push(result);
-
    LOG_DEBUG(Service_Y2R,
              "called input_format={} output_format={} rotation={} block_alignment={} "
              "input_line_width={} input_lines={} standard_coefficient={} reserved={} alpha={:X}",
              params.input_format, params.output_format, params.rotation, params.block_alignment,
              params.input_line_width, params.input_lines, params.standard_coefficient,
              params.padding, params.alpha);
+
+    auto result = conversion.SetInputLineWidth(params.input_line_width);
+
+    SCOPE_EXIT({
+        IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+        rb.Push(result);
+    });
+
+    if (result.IsError()) {
+        return;
+    }
+
+    result = conversion.SetInputLines(params.input_lines);
+
+    if (result.IsError()) {
+        return;
+    }
+
+    result = conversion.SetStandardCoefficient(params.standard_coefficient);
+
+    if (result.IsError()) {
+        return;
+    }
+
+    conversion.padding = params.padding;
+    conversion.alpha = params.alpha;
 }

 void Y2R_U::PingProcess(Kernel::HLERequestContext& ctx) {
@ -697,6 +712,11 @@ Y2R_U::Y2R_U(Core::System& system) : ServiceFramework("y2r:u", 1), system(system
    RegisterHandlers(functions);

    completion_event = system.Kernel().CreateEvent(Kernel::ResetType::OneShot, "Y2R:Completed");
+    completion_signal_event =
+        system.CoreTiming().RegisterEvent("Y2R Completion Signal Event", [this](uintptr_t, s64) {
+            completion_event->Signal();
+            is_busy_conversion = false;
+        });
 }

 Y2R_U::~Y2R_U() = default;
--- a/src/core/hle/service/cam/y2r_u.h
+++ b/src/core/hle/service/cam/y2r_u.h
@ -349,11 +349,13 @@ private:
    Core::System& system;

    std::shared_ptr<Kernel::Event> completion_event;
+    Core::TimingEventType* completion_signal_event;
    ConversionConfiguration conversion{};
    DitheringWeightParams dithering_weight_params{};
    bool temporal_dithering_enabled = false;
    bool transfer_end_interrupt_enabled = false;
    bool spacial_dithering_enabled = false;
+    bool is_busy_conversion = false;

    template <class Archive>
    void serialize(Archive& ar, const unsigned int);
--- a/src/core/hle/service/soc/soc_u.cpp
+++ b/src/core/hle/service/soc/soc_u.cpp
@ -1014,8 +1014,8 @@ void SOC_U::Accept(Kernel::HLERequestContext& ctx) {
                ctr_addr_buf.resize(async_data->max_addr_len);
            }

-            LOG_DEBUG(Service_SOC, "called, pid={}, fd={}, ret={}", async_data->socket_handle,
-                      static_cast<s32>(async_data->ret));
+            LOG_DEBUG(Service_SOC, "called, pid={}, fd={}, ret={}", async_data->pid,
+                      async_data->socket_handle, static_cast<s32>(async_data->ret));

            IPC::RequestBuilder rb(ctx, 0x04, 2, 2);
            rb.Push(ResultSuccess);
--- a/src/dedicated_room/citra-room.cpp
+++ b/src/dedicated_room/citra-room.cpp
@ -152,6 +152,7 @@ static void SaveBanList(const Network::Room::BanList& ban_list, const std::strin
 static void InitializeLogging(const std::string& log_file) {
    Common::Log::Initialize(log_file);
    Common::Log::SetColorConsoleBackendEnabled(true);
+    Common::Log::Start();
 }

 /// Application entry point
--- a/src/video_core/host_shaders/CMakeLists.txt
+++ b/src/video_core/host_shaders/CMakeLists.txt
@ -26,17 +26,6 @@ set(SHADER_FILES
    vulkan_blit_depth_stencil.frag
 )

-find_program(GLSLANG "glslang")
-if ("${GLSLANG}" STREQUAL "GLSLANG-NOTFOUND")
-    find_program(GLSLANG "glslangValidator")
-    if ("${GLSLANG}" STREQUAL "GLSLANG-NOTFOUND")
-        message(FATAL_ERROR "Required program `glslang` (or `glslangValidator`) not found.")
-    endif()
-endif()
-
-set(MACROS "-Dgl_VertexID=gl_VertexIndex")
-set(QUIET_FLAG "--quiet")
-
 set(SHADER_INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/include)
 set(SHADER_DIR ${SHADER_INCLUDE}/video_core/host_shaders)
 set(HOST_SHADERS_INCLUDE ${SHADER_INCLUDE} PARENT_SCOPE)
@ -44,57 +33,22 @@ set(HOST_SHADERS_INCLUDE ${SHADER_INCLUDE} PARENT_SCOPE)
 set(INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/source_shader.h.in)
 set(HEADER_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/StringShaderHeader.cmake)

-# Check if `--quiet` is available on host's glslang version
-# glslang prints to STDERR iff an unrecognized flag is passed to it
-execute_process(
-    COMMAND
-        ${GLSLANG} ${QUIET_FLAG}
-    ERROR_VARIABLE
-        GLSLANG_ERROR
-    # STDOUT variable defined to silence unnecessary output during CMake configuration
-    OUTPUT_VARIABLE
-        GLSLANG_OUTPUT
-)
-
-if (NOT GLSLANG_ERROR STREQUAL "")
-    message(WARNING "Refusing to use unavailable flag `${QUIET_FLAG}` on `${GLSLANG}`")
-    set(QUIET_FLAG "")
-endif()
-
 foreach(FILENAME IN ITEMS ${SHADER_FILES})
    string(REPLACE "." "_" SHADER_NAME ${FILENAME})
    set(SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME})
-    # Skip generating source headers on Vulkan exclusive files
-    if (NOT ${FILENAME} MATCHES "vulkan.*")
-        set(SOURCE_HEADER_FILE ${SHADER_DIR}/${SHADER_NAME}.h)
-        add_custom_command(
-            OUTPUT
-                ${SOURCE_HEADER_FILE}
-            COMMAND
-                ${CMAKE_COMMAND} -P ${HEADER_GENERATOR} ${SOURCE_FILE} ${SOURCE_HEADER_FILE} ${INPUT_FILE}
-            MAIN_DEPENDENCY
-                ${SOURCE_FILE}
-            DEPENDS
-                ${INPUT_FILE}
-                # HEADER_GENERATOR should be included here but msbuild seems to assume it's always modified
-        )
-        set(SHADER_HEADERS ${SHADER_HEADERS} ${SOURCE_HEADER_FILE})
-    endif()
-    # Skip compiling to SPIR-V OpenGL exclusive files
-    if (NOT ${FILENAME} MATCHES "opengl.*")
-        get_filename_component(FILE_NAME ${SHADER_NAME} NAME)
-        string(TOUPPER ${FILE_NAME}_SPV SPIRV_VARIABLE_NAME)
-        set(SPIRV_HEADER_FILE ${SHADER_DIR}/${SHADER_NAME}_spv.h)
-        add_custom_command(
-            OUTPUT
-                ${SPIRV_HEADER_FILE}
-            COMMAND
-                ${GLSLANG} --target-env vulkan1.1 --glsl-version 450 ${QUIET_FLAG} ${MACROS} --variable-name ${SPIRV_VARIABLE_NAME} -o ${SPIRV_HEADER_FILE} ${SOURCE_FILE}
-            MAIN_DEPENDENCY
-                ${SOURCE_FILE}
-        )
-        set(SHADER_HEADERS ${SHADER_HEADERS} ${SPIRV_HEADER_FILE})
-    endif()
+    set(SOURCE_HEADER_FILE ${SHADER_DIR}/${SHADER_NAME}.h)
+    add_custom_command(
+        OUTPUT
+            ${SOURCE_HEADER_FILE}
+        COMMAND
+            ${CMAKE_COMMAND} -P ${HEADER_GENERATOR} ${SOURCE_FILE} ${SOURCE_HEADER_FILE} ${INPUT_FILE}
+        MAIN_DEPENDENCY
+            ${SOURCE_FILE}
+        DEPENDS
+            ${INPUT_FILE}
+            # HEADER_GENERATOR should be included here but msbuild seems to assume it's always modified
+    )
+    set(SHADER_HEADERS ${SHADER_HEADERS} ${SOURCE_HEADER_FILE})
 endforeach()

 set(SHADER_SOURCES ${SHADER_FILES})
--- a/src/video_core/host_shaders/format_reinterpreter/fullscreen_quad.vert
+++ b/src/video_core/host_shaders/format_reinterpreter/fullscreen_quad.vert
@ -8,6 +8,10 @@ layout(location = 0) out vec2 dst_coord;

 layout(location = 0) uniform mediump ivec2 dst_size;

+#ifdef VULKAN
+#define gl_VertexID gl_VertexIndex
+#endif
+
 const vec2 vertices[4] =
 vec2[4](vec2(-1.0, -1.0), vec2(1.0, -1.0), vec2(-1.0, 1.0), vec2(1.0, 1.0));

--- a/src/video_core/host_shaders/full_screen_triangle.vert
+++ b/src/video_core/host_shaders/full_screen_triangle.vert
@ -10,6 +10,7 @@ out gl_PerVertex {
 layout(location = 0) out vec2 texcoord;

 #ifdef VULKAN
+#define gl_VertexID gl_VertexIndex
 #define BEGIN_PUSH_CONSTANTS layout(push_constant) uniform PushConstants {
 #define END_PUSH_CONSTANTS };
 #define UNIFORM(n)
--- a/src/video_core/host_shaders/texture_filtering/tex_coord.vert
+++ b/src/video_core/host_shaders/texture_filtering/tex_coord.vert
@ -5,6 +5,10 @@
 //? #version 430 core
 layout(location = 0) out vec2 tex_coord;

+#ifdef VULKAN
+#define gl_VertexID gl_VertexIndex
+#endif
+
 const vec2 vertices[4] =
    vec2[4](vec2(-1.0, -1.0), vec2(1.0, -1.0), vec2(-1.0, 1.0), vec2(1.0, 1.0));

--- a/src/video_core/renderer_opengl/pica_to_gl.h
+++ b/src/video_core/renderer_opengl/pica_to_gl.h
@ -148,8 +148,6 @@ inline GLenum BlendFunc(Pica::FramebufferRegs::BlendFactor factor) {
    // Range check table for input
    if (index >= blend_func_table.size()) {
        LOG_CRITICAL(Render_OpenGL, "Unknown blend factor {}", index);
-        UNREACHABLE();
-
        return GL_ONE;
    }

--- a/src/video_core/renderer_vulkan/pica_to_vk.h
+++ b/src/video_core/renderer_vulkan/pica_to_vk.h
@ -96,7 +96,10 @@ inline vk::BlendFactor BlendFunc(Pica::FramebufferRegs::BlendFactor factor) {
    }};

    const auto index = static_cast<std::size_t>(factor);
-    ASSERT_MSG(index < blend_func_table.size(), "Unknown blend factor {}", index);
+    if (index >= blend_func_table.size()) {
+        LOG_CRITICAL(Render_Vulkan, "Unknown blend factor {}", index);
+        return vk::BlendFactor::eOne;
+    }
    return blend_func_table[index];
 }

--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@ -15,10 +15,10 @@
 #include "video_core/renderer_vulkan/vk_memory_util.h"
 #include "video_core/renderer_vulkan/vk_shader_util.h"

-#include "video_core/host_shaders/vulkan_present_anaglyph_frag_spv.h"
-#include "video_core/host_shaders/vulkan_present_frag_spv.h"
-#include "video_core/host_shaders/vulkan_present_interlaced_frag_spv.h"
-#include "video_core/host_shaders/vulkan_present_vert_spv.h"
+#include "video_core/host_shaders/vulkan_present_anaglyph_frag.h"
+#include "video_core/host_shaders/vulkan_present_frag.h"
+#include "video_core/host_shaders/vulkan_present_interlaced_frag.h"
+#include "video_core/host_shaders/vulkan_present_vert.h"

 #include <vk_mem_alloc.h>

@ -223,10 +223,14 @@ void RendererVulkan::LoadFBToScreenInfo(const Pica::FramebufferConfig& framebuff

 void RendererVulkan::CompileShaders() {
    vk::Device device = instance.GetDevice();
-    present_vertex_shader = CompileSPV(VULKAN_PRESENT_VERT_SPV, device);
-    present_shaders[0] = CompileSPV(VULKAN_PRESENT_FRAG_SPV, device);
-    present_shaders[1] = CompileSPV(VULKAN_PRESENT_ANAGLYPH_FRAG_SPV, device);
-    present_shaders[2] = CompileSPV(VULKAN_PRESENT_INTERLACED_FRAG_SPV, device);
+    present_vertex_shader =
+        Compile(HostShaders::VULKAN_PRESENT_VERT, vk::ShaderStageFlagBits::eVertex, device);
+    present_shaders[0] =
+        Compile(HostShaders::VULKAN_PRESENT_FRAG, vk::ShaderStageFlagBits::eFragment, device);
+    present_shaders[1] = Compile(HostShaders::VULKAN_PRESENT_ANAGLYPH_FRAG,
+                                 vk::ShaderStageFlagBits::eFragment, device);
+    present_shaders[2] = Compile(HostShaders::VULKAN_PRESENT_INTERLACED_FRAG,
+                                 vk::ShaderStageFlagBits::eFragment, device);

    auto properties = instance.GetPhysicalDevice().getProperties();
    for (std::size_t i = 0; i < present_samplers.size(); i++) {
--- a/src/video_core/renderer_vulkan/vk_blit_helper.cpp
+++ b/src/video_core/renderer_vulkan/vk_blit_helper.cpp
@ -11,10 +11,10 @@
 #include "video_core/renderer_vulkan/vk_shader_util.h"
 #include "video_core/renderer_vulkan/vk_texture_runtime.h"

-#include "video_core/host_shaders/format_reinterpreter/vulkan_d24s8_to_rgba8_comp_spv.h"
-#include "video_core/host_shaders/full_screen_triangle_vert_spv.h"
-#include "video_core/host_shaders/vulkan_blit_depth_stencil_frag_spv.h"
-#include "video_core/host_shaders/vulkan_depth_to_buffer_comp_spv.h"
+#include "video_core/host_shaders/format_reinterpreter/vulkan_d24s8_to_rgba8_comp.h"
+#include "video_core/host_shaders/full_screen_triangle_vert.h"
+#include "video_core/host_shaders/vulkan_blit_depth_stencil_frag.h"
+#include "video_core/host_shaders/vulkan_depth_to_buffer_comp.h"

 namespace Vulkan {

@ -191,10 +191,14 @@ BlitHelper::BlitHelper(const Instance& instance_, Scheduler& scheduler_,
          PipelineLayoutCreateInfo(&compute_buffer_provider.Layout(), true))},
      two_textures_pipeline_layout{
          device.createPipelineLayout(PipelineLayoutCreateInfo(&two_textures_provider.Layout()))},
-      full_screen_vert{CompileSPV(FULL_SCREEN_TRIANGLE_VERT_SPV, device)},
-      d24s8_to_rgba8_comp{CompileSPV(VULKAN_D24S8_TO_RGBA8_COMP_SPV, device)},
-      depth_to_buffer_comp{CompileSPV(VULKAN_DEPTH_TO_BUFFER_COMP_SPV, device)},
-      blit_depth_stencil_frag{CompileSPV(VULKAN_BLIT_DEPTH_STENCIL_FRAG_SPV, device)},
+      full_screen_vert{Compile(HostShaders::FULL_SCREEN_TRIANGLE_VERT,
+                               vk::ShaderStageFlagBits::eVertex, device)},
+      d24s8_to_rgba8_comp{Compile(HostShaders::VULKAN_D24S8_TO_RGBA8_COMP,
+                                  vk::ShaderStageFlagBits::eCompute, device)},
+      depth_to_buffer_comp{Compile(HostShaders::VULKAN_DEPTH_TO_BUFFER_COMP,
+                                   vk::ShaderStageFlagBits::eCompute, device)},
+      blit_depth_stencil_frag{Compile(HostShaders::VULKAN_BLIT_DEPTH_STENCIL_FRAG,
+                                      vk::ShaderStageFlagBits::eFragment, device)},
      d24s8_to_rgba8_pipeline{MakeComputePipeline(d24s8_to_rgba8_comp, compute_pipeline_layout)},
      depth_to_buffer_pipeline{
          MakeComputePipeline(depth_to_buffer_comp, compute_buffer_pipeline_layout)},
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@ -4,6 +4,7 @@

 #include <span>
 #include <boost/container/static_vector.hpp>
+#include <fmt/format.h>

 #include "common/assert.h"
 #include "common/settings.h"
@ -153,6 +154,12 @@ Instance::Instance(Core::TelemetrySession& telemetry, Frontend::EmuWindow& windo
    physical_device = physical_devices[physical_device_index];
    available_extensions = GetSupportedExtensions(physical_device);
    properties = physical_device.getProperties();
+    if (properties.apiVersion < TargetVulkanApiVersion) {
+        throw std::runtime_error(fmt::format(
+            "Vulkan {}.{} is required, but only {}.{} is supported by device!",
+            VK_VERSION_MAJOR(TargetVulkanApiVersion), VK_VERSION_MINOR(TargetVulkanApiVersion),
+            VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion)));
+    }

    CollectTelemetryParameters(telemetry);
    CreateDevice();
@ -629,7 +636,7 @@ void Instance::CreateAllocator() {
        .device = *device,
        .pVulkanFunctions = &functions,
        .instance = *instance,
-        .vulkanApiVersion = properties.apiVersion,
+        .vulkanApiVersion = TargetVulkanApiVersion,
    };

    const VkResult result = vmaCreateAllocator(&allocator_info, &allocator);
@ -670,7 +677,7 @@ void Instance::CollectToolingInfo() {
    if (!tooling_info) {
        return;
    }
-    const auto tools = physical_device.getToolProperties();
+    const auto tools = physical_device.getToolPropertiesEXT();
    for (const vk::PhysicalDeviceToolProperties& tool : tools) {
        const std::string_view name = tool.name;
        LOG_INFO(Render_Vulkan, "Attached debugging tool: {}", name);
--- a/src/video_core/renderer_vulkan/vk_platform.cpp
+++ b/src/video_core/renderer_vulkan/vk_platform.cpp
@ -17,6 +17,7 @@
 #include <memory>
 #include <vector>
 #include <boost/container/static_vector.hpp>
+#include <fmt/format.h>

 #include "common/assert.h"
 #include "common/logging/log.h"
@ -291,13 +292,14 @@ vk::UniqueInstance CreateInstance(const Common::DynamicLibrary& library,
    }
    VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);

-    if (!VULKAN_HPP_DEFAULT_DISPATCHER.vkEnumerateInstanceVersion) {
-        throw std::runtime_error("Vulkan 1.0 is not supported, 1.1 is required!");
-    }
-
-    const u32 available_version = vk::enumerateInstanceVersion();
-    if (available_version < VK_API_VERSION_1_1) {
-        throw std::runtime_error("Vulkan 1.0 is not supported, 1.1 is required!");
+    const u32 available_version = VULKAN_HPP_DEFAULT_DISPATCHER.vkEnumerateInstanceVersion
+                                      ? vk::enumerateInstanceVersion()
+                                      : VK_API_VERSION_1_0;
+    if (available_version < TargetVulkanApiVersion) {
+        throw std::runtime_error(fmt::format(
+            "Vulkan {}.{} is required, but only {}.{} is supported by instance!",
+            VK_VERSION_MAJOR(TargetVulkanApiVersion), VK_VERSION_MINOR(TargetVulkanApiVersion),
+            VK_VERSION_MAJOR(available_version), VK_VERSION_MINOR(available_version)));
    }

    const auto extensions = GetInstanceExtensions(window_type, enable_validation);
@ -307,7 +309,7 @@ vk::UniqueInstance CreateInstance(const Common::DynamicLibrary& library,
        .applicationVersion = VK_MAKE_VERSION(1, 0, 0),
        .pEngineName = "Citra Vulkan",
        .engineVersion = VK_MAKE_VERSION(1, 0, 0),
-        .apiVersion = VK_API_VERSION_1_3,
+        .apiVersion = TargetVulkanApiVersion,
    };

    boost::container::static_vector<const char*, 2> layers;
--- a/src/video_core/renderer_vulkan/vk_platform.h
+++ b/src/video_core/renderer_vulkan/vk_platform.h
@ -19,6 +19,8 @@ enum class WindowSystemType : u8;

 namespace Vulkan {

+constexpr u32 TargetVulkanApiVersion = VK_API_VERSION_1_1;
+
 using DebugCallback =
    std::variant<vk::UniqueDebugUtilsMessengerEXT, vk::UniqueDebugReportCallbackEXT>;

--- a/src/video_core/renderer_vulkan/vk_texture_runtime.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_runtime.cpp
@ -3,6 +3,7 @@
 // Refer to the license.txt file included.

 #include <boost/container/small_vector.hpp>
+#include <boost/container/static_vector.hpp>

 #include "common/literals.h"
 #include "common/microprofile.h"
@ -118,9 +119,9 @@ u32 UnpackDepthStencil(const VideoCore::StagingData& data, vk::Format dest) {
 }

 boost::container::small_vector<vk::ImageMemoryBarrier, 3> MakeInitBarriers(
-    vk::ImageAspectFlags aspect, std::span<const vk::Image> images, std::size_t num_images) {
+    vk::ImageAspectFlags aspect, std::span<const vk::Image> images) {
    boost::container::small_vector<vk::ImageMemoryBarrier, 3> barriers;
-    for (std::size_t i = 0; i < num_images; i++) {
+    for (const vk::Image& image : images) {
        barriers.push_back(vk::ImageMemoryBarrier{
            .srcAccessMask = vk::AccessFlagBits::eNone,
            .dstAccessMask = vk::AccessFlagBits::eNone,
@ -128,7 +129,7 @@ boost::container::small_vector<vk::ImageMemoryBarrier, 3> MakeInitBarriers(
            .newLayout = vk::ImageLayout::eGeneral,
            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-            .image = images[i],
+            .image = image,
            .subresourceRange{
                .aspectMask = aspect,
                .baseMipLevel = 0,
@ -218,11 +219,10 @@ Handle MakeHandle(const Instance* instance, u32 width, u32 height, u32 levels, T
 }

 vk::UniqueFramebuffer MakeFramebuffer(vk::Device device, vk::RenderPass render_pass, u32 width,
-                                      u32 height, std::span<const vk::ImageView> attachments,
-                                      u32 num_attachments) {
+                                      u32 height, std::span<const vk::ImageView> attachments) {
    const vk::FramebufferCreateInfo framebuffer_info = {
        .renderPass = render_pass,
-        .attachmentCount = num_attachments,
+        .attachmentCount = static_cast<u32>(attachments.size()),
        .pAttachments = attachments.data(),
        .width = width,
        .height = height,
@ -710,8 +710,7 @@ Surface::Surface(TextureRuntime& runtime_, const VideoCore::SurfaceParams& param
    ASSERT_MSG(format != vk::Format::eUndefined && levels >= 1,
               "Image allocation parameters are invalid");

-    u32 num_images = 0;
-    std::array<vk::Image, 3> raw_images;
+    boost::container::static_vector<vk::Image, 3> raw_images;

    vk::ImageCreateFlags flags{};
    if (texture_type == VideoCore::TextureType::CubeMap) {
@ -724,18 +723,18 @@ Surface::Surface(TextureRuntime& runtime_, const VideoCore::SurfaceParams& param
    const bool need_format_list = is_mutable && instance->IsImageFormatListSupported();
    handles[0] = MakeHandle(instance, width, height, levels, texture_type, format, traits.usage,
                            flags, traits.aspect, need_format_list, DebugName(false));
-    raw_images[num_images++] = handles[0].image;
+    raw_images.emplace_back(handles[0].image);

    if (res_scale != 1) {
        handles[1] =
            MakeHandle(instance, GetScaledWidth(), GetScaledHeight(), levels, texture_type, format,
                       traits.usage, flags, traits.aspect, need_format_list, DebugName(true));
-        raw_images[num_images++] = handles[1].image;
+        raw_images.emplace_back(handles[1].image);
    }

    runtime->render_manager.EndRendering();
-    scheduler->Record([raw_images, num_images, aspect = traits.aspect](vk::CommandBuffer cmdbuf) {
-        const auto barriers = MakeInitBarriers(aspect, raw_images, num_images);
+    scheduler->Record([raw_images, aspect = traits.aspect](vk::CommandBuffer cmdbuf) {
+        const auto barriers = MakeInitBarriers(aspect, raw_images);
        cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eTopOfPipe,
                               vk::PipelineStageFlagBits::eTopOfPipe,
                               vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
@ -753,8 +752,7 @@ Surface::Surface(TextureRuntime& runtime_, const VideoCore::SurfaceBase& surface
    const bool has_normal = mat && mat->Map(MapType::Normal);
    const vk::Format format = traits.native;

-    u32 num_images = 0;
-    std::array<vk::Image, 2> raw_images;
+    boost::container::static_vector<vk::Image, 2> raw_images;

    vk::ImageCreateFlags flags{};
    if (texture_type == VideoCore::TextureType::CubeMap) {
@ -764,23 +762,23 @@ Surface::Surface(TextureRuntime& runtime_, const VideoCore::SurfaceBase& surface
    const std::string debug_name = DebugName(false, true);
    handles[0] = MakeHandle(instance, mat->width, mat->height, levels, texture_type, format,
                            traits.usage, flags, traits.aspect, false, debug_name);
-    raw_images[num_images++] = handles[0].image;
+    raw_images.emplace_back(handles[0].image);

    if (res_scale != 1) {
        handles[1] = MakeHandle(instance, mat->width, mat->height, levels, texture_type,
                                vk::Format::eR8G8B8A8Unorm, traits.usage, flags, traits.aspect,
                                false, debug_name);
-        raw_images[num_images++] = handles[1].image;
+        raw_images.emplace_back(handles[1].image);
    }
    if (has_normal) {
        handles[2] = MakeHandle(instance, mat->width, mat->height, levels, texture_type, format,
                                traits.usage, flags, traits.aspect, false, debug_name);
-        raw_images[num_images++] = handles[2].image;
+        raw_images.emplace_back(handles[2].image);
    }

    runtime->render_manager.EndRendering();
-    scheduler->Record([raw_images, num_images, aspect = traits.aspect](vk::CommandBuffer cmdbuf) {
-        const auto barriers = MakeInitBarriers(aspect, raw_images, num_images);
+    scheduler->Record([raw_images, aspect = traits.aspect](vk::CommandBuffer cmdbuf) {
+        const auto barriers = MakeInitBarriers(aspect, raw_images);
        cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eTopOfPipe,
                               vk::PipelineStageFlagBits::eTopOfPipe,
                               vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
@ -817,11 +815,10 @@ void Surface::Upload(const VideoCore::BufferTextureCopy& upload,

    scheduler->Record([buffer = runtime->upload_buffer.Handle(), format = traits.native, params,
                       staging, upload](vk::CommandBuffer cmdbuf) {
-        u32 num_copies = 1;
-        std::array<vk::BufferImageCopy, 2> buffer_image_copies;
+        boost::container::static_vector<vk::BufferImageCopy, 2> buffer_image_copies;

        const auto rect = upload.texture_rect;
-        buffer_image_copies[0] = vk::BufferImageCopy{
+        buffer_image_copies.emplace_back(vk::BufferImageCopy{
            .bufferOffset = upload.buffer_offset,
            .bufferRowLength = rect.GetWidth(),
            .bufferImageHeight = rect.GetHeight(),
@ -833,15 +830,16 @@ void Surface::Upload(const VideoCore::BufferTextureCopy& upload,
            },
            .imageOffset = {static_cast<s32>(rect.left), static_cast<s32>(rect.bottom), 0},
            .imageExtent = {rect.GetWidth(), rect.GetHeight(), 1},
-        };
+        });

        if (params.aspect & vk::ImageAspectFlagBits::eStencil) {
            buffer_image_copies[0].imageSubresource.aspectMask = vk::ImageAspectFlagBits::eDepth;
-            vk::BufferImageCopy& stencil_copy = buffer_image_copies[1];
+
+            vk::BufferImageCopy& stencil_copy =
+                buffer_image_copies.emplace_back(buffer_image_copies[0]);
            stencil_copy = buffer_image_copies[0];
            stencil_copy.bufferOffset += UnpackDepthStencil(staging, format);
            stencil_copy.imageSubresource.aspectMask = vk::ImageAspectFlagBits::eStencil;
-            num_copies++;
        }

        const vk::ImageMemoryBarrier read_barrier = {
@ -869,7 +867,7 @@ void Surface::Upload(const VideoCore::BufferTextureCopy& upload,
                               vk::DependencyFlagBits::eByRegion, {}, {}, read_barrier);

        cmdbuf.copyBufferToImage(buffer, params.src_image, vk::ImageLayout::eTransferDstOptimal,
-                                 num_copies, buffer_image_copies.data());
+                                 buffer_image_copies);

        cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eTransfer, params.pipeline_flags,
                               vk::DependencyFlagBits::eByRegion, {}, {}, write_barrier);
@ -1077,7 +1075,7 @@ void Surface::ScaleUp(u32 new_scale) {
    runtime->render_manager.EndRendering();
    scheduler->Record(
        [raw_images = std::array{Image()}, aspect = traits.aspect](vk::CommandBuffer cmdbuf) {
-            const auto barriers = MakeInitBarriers(aspect, raw_images, raw_images.size());
+            const auto barriers = MakeInitBarriers(aspect, raw_images);
            cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eTopOfPipe,
                                   vk::PipelineStageFlagBits::eTopOfPipe,
                                   vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
@ -1343,7 +1341,7 @@ vk::Framebuffer Surface::Framebuffer() noexcept {
        runtime->render_manager.GetRenderpass(color_format, depth_format, false);
    const auto attachments = std::array{ImageView()};
    framebuffers[index] = MakeFramebuffer(instance->GetDevice(), render_pass, GetScaledWidth(),
-                                          GetScaledHeight(), attachments, 1);
+                                          GetScaledHeight(), attachments);
    return framebuffers[index].get();
 }

@ -1473,17 +1471,16 @@ Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferPa
        image_views[index] = shadow_rendering ? surface->StorageView() : surface->FramebufferView();
    };

-    u32 num_attachments = 0;
-    std::array<vk::ImageView, 2> attachments;
+    boost::container::static_vector<vk::ImageView, 2> attachments;

    if (color) {
        prepare(0, color);
-        attachments[num_attachments++] = image_views[0];
+        attachments.emplace_back(image_views[0]);
    }

    if (depth) {
        prepare(1, depth);
-        attachments[num_attachments++] = image_views[1];
+        attachments.emplace_back(image_views[1]);
    }

    const vk::Device device = runtime.GetInstance().GetDevice();
@ -1491,11 +1488,10 @@ Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferPa
        render_pass =
            render_manager.GetRenderpass(PixelFormat::Invalid, PixelFormat::Invalid, false);
        framebuffer = MakeFramebuffer(device, render_pass, color->GetScaledWidth(),
-                                      color->GetScaledHeight(), {}, 0);
+                                      color->GetScaledHeight(), {});
    } else {
        render_pass = render_manager.GetRenderpass(formats[0], formats[1], false);
-        framebuffer =
-            MakeFramebuffer(device, render_pass, width, height, attachments, num_attachments);
+        framebuffer = MakeFramebuffer(device, render_pass, width, height, attachments);
    }
 }

--- a/tools/reset-submodules.sh
+++ b/tools/reset-submodules.sh
@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-License-Identifier: MIT
+
+git submodule sync
+git submodule foreach --recursive git reset --hard
+git submodule update --init --recursive
Author	SHA1	Message	Date
citrabot	d9969810e2	Canary #2798	2024-03-04 00:25:34 +00:00
citrabot	0e9250c2f0	Merge PR 7472	2024-03-04 00:25:34 +00:00
citrabot	5d53d8c891	Merge PR 7429	2024-03-04 00:25:34 +00:00
citrabot	a37426f23d	Merge PR 7420	2024-03-04 00:25:34 +00:00
citrabot	0ebc2068a0	Merge PR 7384	2024-03-04 00:25:34 +00:00
citrabot	ab626208c5	Merge PR 7372	2024-03-04 00:25:34 +00:00
Tobias	0ff3440232	tools: Add reset submodules script (#7465 ) Co-authored-by: merry <8682882+merryhime@users.noreply.github.com>	2024-03-03 13:39:55 +02:00
liushuyu	69e758d738	dedicated_room: properly initialize logging (#7468 )	2024-02-27 20:36:28 +05:30
Steveice10	f4768cd26c	video_core: Remove pre-compilation of Vulkan host-shaders. (#7461 )	2024-02-26 10:26:44 -08:00
Théo B	e0d2c1308e	log: fix SOC_U::Accept LOG_DEBUG call, and ensure such mistakes get picked up at compile time (#7463 ) * fix SOC_U::Accept invalid log function * make logging get checked at compile time - ensures log strings match the amount and type (if the format specifies an integer, for example) of the arguments - if at any later point a runtime-generated string is used as the log format, FmtLogMessage might require an overload taking a fmt::runtime_format_string<> as the format argument type, everything else being equal. wrap the generated string with fmt::runtime() before passing to the LOG_X function * formatting fix: aligning the arguments	2024-02-25 21:43:29 -08:00
Steveice10	4f9fc88bb3	apt: Improve accuracy of applet slot states on system applet launch. (#7456 )	2024-02-23 16:18:16 -08:00
GPUCode	d857743075	Downgrade blend factor crash to warning (#7459 ) * pica_to_vk: Downgrade assert to warning * pica_to_gl: Downgrade unreachable to warning	2024-02-22 15:43:44 -08:00
kylon	b5042a5257	Core: update kernel config memory to latest 11.17 (#7460 )	2024-02-22 15:43:33 -08:00
Wunk	e524542a40	vk_texture_runtime: Use boost-`static_vector` (#7455 ) * vk_texture_runtime: Use boost-`static_vector` for image init-barriers Uses `static_vector` rather than `std::array`+`u32` when passing input parameters into the initialization barriers. * vk_texture_runtime: Use boost-`static_vector` for framebuffer attachments * vk_texture_runtime: Use boost-`static_vector` for surface uploads	2024-02-22 02:35:57 +02:00
Steveice10	3a4ebb1413	file_util: Make sure portable user path is absolute. (#7448 )	2024-02-18 15:21:53 -08:00
Steveice10	cbe8987036	ci: Update action versions. (#7449 )	2024-02-18 08:23:15 -08:00
Charles Lombardo	da5aa70fc9	android: Port yuzu system info logging (#7431 )	2024-02-17 20:10:10 -08:00
Castor215	749a721aa2	externals: disable system cpp-httplib if it is a shared object (#7446 ) Co-authored-by: Castor216 <davidjamescastor215@proton.me>	2024-02-17 06:39:38 -08:00
SachinVin	bb003c2bd4	audio_core\hle\source.cpp: Improve accuracy of SourceStatus (#7432 )	2024-02-17 02:12:54 +01:00
Tobias	7638f87f74	Port several small multiplayer PRs from yuzu (#7419 ) * yuzu: Use displayed port on direct connect * Color player counts in the multiplayer public lobby list - Full lobbies have their player count displayed in red. - Lobbies with one slot left have their player count displayed in orange. - Empty lobbies have their player count grayed out. * Add hotkeys for multiplayer actions Default shortcuts were chosen as to be intuitive (use the first letter of the action, or the second word's first letter) and work on all types of keyboards. The hotkeys can be used while playing a game too, as they are application-wide. * Persist filters in multiplayer public lobby list After connecting to a room, the chosen filter text, "Games I Own", "Hide Empty Rooms" and "Hide Full Rooms" values are persisted to configuration so they are preserved across restarts. This makes it easier to rejoin a room if you regularly play the same game, or after a crash. * citra_qt/lobby: Fix multiplayer player count color in dark theme Co-Authored-By: Kevnkkm <56404895+kevnkkm@users.noreply.github.com> * Address review comments --------- Co-authored-by: Narr the Reg <juangerman-13@hotmail.com> Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro> Co-authored-by: Kevnkkm <56404895+kevnkkm@users.noreply.github.com>	2024-02-16 04:34:10 -08:00
Steveice10	aa6809e2a8	renderer_vulkan: Use no more than target supported version. (#7439 )	2024-02-15 19:38:32 -08:00
Steveice10	5e02be75a3	renderer_vulkan: Use getToolPropertiesEXT instead of getToolProperties (#7434 ) getToolProperties is not available until Vulkan 1.3; we need to use the EXT version.	2024-02-13 21:43:09 -08:00