Merge branch 'fix/linux-file-picker' into 'master'

Linux: Fix file picker not launching from disabling core dumps

See merge request [ryubing/ryujinx!249](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/249)

.github/workflows/canary.yml

@@ -1,4 +1,4 @@
-name: Canary release job
+name: Canary CI
 
 on:
   workflow_dispatch:
@@ -19,7 +19,6 @@ concurrency: release
 env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.3"
   RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
   RELEASE: 1
 
@@ -30,8 +29,8 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          #- { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
+          - { name: win-x64,     os: ubuntu-latest, zip_os_name: win_x64     }
+          #- { name: win-arm64,   os: ubuntu-latest, zip_os_name: win_arm64   }
           - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
@@ -44,11 +43,25 @@ jobs:
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.github/csc.json"
 
+      - name: Install 7zip
+        run: |
+          sudo apt install -y 7zip
+
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
@@ -69,33 +82,20 @@ jobs:
           dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
 
       - name: Packing Windows builds
-        if: matrix.platform.os == 'windows-latest'
+        if: contains(matrix.platform.name, 'win')
         run: |
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
-          
-          gh release download -R GreemDev/GLI -O gli.exe -p 'GitLabCli-win_x64.exe'
-          
-          ./gli.exe --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip"
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Install GitLabCli
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
-          chmod +x gli
-          mv gli $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Packing Linux builds
-        if: matrix.platform.os == 'ubuntu-latest'
+        if: contains(matrix.platform.name, 'linux')
         run: |
           pushd publish
           rm libarmeilleure-jitsupport.dylib
@@ -103,11 +103,11 @@ jobs:
           tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
           popd
 
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
         shell: bash
 
       - name: Build AppImage (Linux)
-        if: matrix.platform.os == 'ubuntu-latest'
+        if: contains(matrix.platform.name, 'linux')
         run: |
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
@@ -139,8 +139,8 @@ jobs:
           pushd publish_appimage
           mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
           popd
-
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
+          
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
         shell: bash
 
   macos_release:
@@ -159,10 +159,10 @@ jobs:
           chmod +x llvm.sh
           sudo ./llvm.sh 17
           
-      - name: Install GitLabCli
+      - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -183,9 +183,10 @@ jobs:
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Configure for release
         run: |
@@ -200,7 +201,7 @@ jobs:
       - name: Publish macOS Ryujinx
         run: |
           ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz"
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
 
   create_gitlab_release:
     name: Create GitLab Release
@@ -210,37 +211,41 @@ jobs:
       - release
     steps:
       - uses: actions/checkout@v4
-      
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Install GitLabCli
+        
+      - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
           
       - name: Create tag
         run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=CreateTag "Canary-${{ steps.version_info.outputs.build_version }}|${{ steps.version_info.outputs.git_short_hash }}"
+          gli create-tag -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Canary-${{ steps.version_info.outputs.build_version }} -r ${{ steps.version_info.outputs.git_short_hash }}
           
       - name: Create release
         run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=CreateReleaseFromGenericPackageFiles "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|main|Canary ${{ steps.version_info.outputs.build_version }}|**Full Changelog:** [${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})"
+          gli create-release-from-generic-package-files -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r main -t "Canary ${{ steps.version_info.outputs.build_version }}" -b "**Full Changelog:** [${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})"
 
       - name: Send notification webhook
         run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=SendUpdateMessage "${{ steps.version_info.outputs.build_version }}|FF4500|${{ secrets.CANARY_DISCORD_WEBHOOK }}|https://avatars.githubusercontent.com/u/192939710?s=200&v=4|false"
+          gli send-update-message -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -t ${{ steps.version_info.outputs.build_version }} -c FF4500 -w ${{ secrets.CANARY_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
 
       - name: Notify update server of new builds
         run: |
-          curl 'https://update.ryujinx.app/api/v1/admin/refresh_cache?rc=canary' -X PATCH -H 'accept: */*' -H 'Authorization: ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }}'
+          gli refresh-version-cache -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary
+          
+      - name: Advance to the next version
+        run: |
+          gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary

.github/workflows/debug_release.yml

@@ -1,224 +0,0 @@
-name: Release job (Debug)
-
-on:
-  workflow_dispatch:
-    inputs: {}
-
-concurrency: release
-
-env:
-  POWERSHELL_TELEMETRY_OPTOUT: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.3"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RELEASE: 1
-
-jobs:
-  release:
-    name: Release for ${{ matrix.platform.name }}
-    runs-on: ${{ matrix.platform.os }}
-    strategy:
-      matrix:
-        platform:
-          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          #- { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
-          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
-          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: global.json
-
-      - name: Overwrite csc problem matcher
-        run: echo "::add-matcher::.github/csc.json"
-
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} + 10))" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Configure for release
-        run: |
-          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-        shell: bash
-
-      - name: Create output dir
-        run: "mkdir release_output"
-
-      - name: Publish
-        run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
-
-      - name: Packing Windows builds
-        if: matrix.platform.os == 'windows-latest'
-        run: |
-          pushd publish
-          rm libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
-          popd
-          
-          gh release download -R GreemDev/GLI -O gli.exe -p 'GitLabCli-win_x64.exe'
-          
-          ./gli.exe --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip"
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install GitLabCli
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
-          chmod +x gli
-          mv gli $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Packing Linux builds
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          pushd publish
-          rm libarmeilleure-jitsupport.dylib
-          chmod +x Ryujinx.sh Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
-          popd
-          
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
-        shell: bash
-      
-      - name: Build AppImage (Linux)
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
-
-          sudo apt install -y zsync desktop-file-utils appstream
-
-          mkdir -p tools
-          export PATH="$PATH:$(readlink -f tools)"
-
-          # Setup appimagetool
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-          chmod +x tools/appimagetool
-          chmod +x distribution/linux/appimage/build-appimage.sh
-
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            ARCH_NAME=x64
-            export ARCH=x86_64
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-            ARCH_NAME=arm64
-            export ARCH=aarch64
-          else
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-            exit 1
-          fi
-
-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
-
-          pushd publish_appimage
-          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
-          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
-          popd
-          
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
-        shell: bash
-
-  macos_release:
-    name: Release MacOS universal
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: global.json
-
-      - name: Setup LLVM 17
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 17
-          
-      - name: Install GitLabCli
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
-          chmod +x gli
-          mv gli $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install rcodesign
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
-          tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
-          rm apple-codesign.tar.gz
-          mv rcodesign $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} + 10))" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-
-      - name: Configure for release
-        run: |
-          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-        shell: bash
-
-      - name: Publish macOS Ryujinx
-        run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz"
-
-  create_gitlab_release:
-    name: Create GitLab Release
-    runs-on: ubuntu-24.04
-    needs:
-      - macos_release
-      - release
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} + 10))" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Install GitLabCli
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
-          chmod +x gli
-          mv gli $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create release
-        run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=CreateReleaseFromGenericPackageFiles "Ryubing|${{ steps.version_info.outputs.build_version }}|${{ steps.version_info.outputs.git_short_hash }}|test|THIS IS NOT INTENDED FOR END USER USAGE"

.github/workflows/release.yml

@@ -1,15 +1,18 @@
-name: Release job
+name: Stable CI
 
 on:
   workflow_dispatch:
-    inputs: {}
+    inputs:
+      is_bugfix_release:
+        description: "Bug fix release: If checked, this will increment the third number for only Stable, and leave the Major version alone for both Stable and Canary."
+        required: true
+        type: boolean
 
 concurrency: release
 
 env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.3"
   RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
   RELEASE: 1
 
@@ -20,8 +23,8 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          #- { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
+          - { name: win-x64,     os: ubuntu-latest, zip_os_name: win_x64     }
+          #- { name: win-arm64,   os: ubuntu-latest, zip_os_name: win_arm64   }
           - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
@@ -33,12 +36,30 @@ jobs:
 
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.github/csc.json"
+        
+      - name: Install 7zip
+        run: |
+          sudo apt install -y 7zip
+          
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
+          else
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
+          fi
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
@@ -58,47 +79,34 @@ jobs:
           dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
 
       - name: Packing Windows builds
-        if: matrix.platform.os == 'windows-latest'
+        if: contains(matrix.platform.name, 'win')
         run: |
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
-          
-          gh release download -R GreemDev/GLI -O gli.exe -p 'GitLabCli-win_x64.exe'
-          
-          ./gli.exe --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip"
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install GitLabCli
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
-          chmod +x gli
-          mv gli $HOME/.bin/
-          echo "$HOME/.bin" >> $GITHUB_PATH
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Packing Linux builds
-        if: matrix.platform.os == 'ubuntu-latest'
+        if: contains(matrix.platform.name, 'linux')
         run: |
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
           popd
-          
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build AppImage (Linux)
-        if: matrix.platform.os == 'ubuntu-latest'
+        if: contains(matrix.platform.name, 'linux')
         run: |
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
@@ -131,7 +139,7 @@ jobs:
           mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
           popd
 
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
         shell: bash
 
   macos_release:
@@ -150,10 +158,10 @@ jobs:
           chmod +x llvm.sh
           sudo ./llvm.sh 17
           
-      - name: Install GitLabCli
+      - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -174,9 +182,14 @@ jobs:
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
+          else
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
+          fi
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Configure for release
         run: |
@@ -189,7 +202,8 @@ jobs:
       - name: Publish macOS Ryujinx
         run: |
           ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz"
+          
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
           
   create_gitlab_release:
     name: Create GitLab Release
@@ -200,32 +214,45 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Install GitLabCli
+      - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version info
+        id: version_info
+        run: |
+          if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
+          else
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
+          fi
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+          echo "commit_message=$(git log -1 --pretty=%B)" >> $GITHUB_OUTPUT
+        shell: bash
+
       - name: Create release
         run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=CreateReleaseFromGenericPackageFiles "Ryubing|${{ steps.version_info.outputs.build_version }}|${{ steps.version_info.outputs.git_short_hash }}|${{ steps.version_info.outputs.build_version }}|msd:${{ steps.version_info.outputs.build_version }}"
-          
+          gli create-release-from-generic-package-files -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r ${{ steps.version_info.outputs.git_short_hash }} -t "${{ steps.version_info.outputs.build_version }}" -b "msd:${{ steps.version_info.outputs.build_version }}"
+
       - name: Send notification webhook
         run: |
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=SendUpdateMessage "${{ steps.version_info.outputs.build_version }}|32cd32|${{ secrets.STABLE_DISCORD_WEBHOOK }}|https://avatars.githubusercontent.com/u/192939710?s=200&v=4|false"
-          
+          gli send-update-message -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -t ${{ steps.version_info.outputs.build_version }} -c 32cd32 -w ${{ secrets.STABLE_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
+
       - name: Notify update server of new builds
         run: |
-          curl 'https://update.ryujinx.app/api/v1/admin/refresh_cache?rc=stable' -X PATCH -H 'accept: */*' -H 'Authorization: ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }}'
+          gli refresh-version-cache -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Stable
+
+      - name: Advance to the next version
+        run: |
+          if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
+            gli advance-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }}
+          else
+            gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Stable
+          fi

Ryujinx.sln

@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.GAL", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.OpenGL", "src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj", "{9558FB96-075D-4219-8FFF-401979DC0B69}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.RenderDoc", "src\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj", "{D58FA894-27D5-4EAA-9042-AD422AD82931}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture", "src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj", "{E1B1AD28-289D-47B7-A106-326972240207}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
@@ -45,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vic", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Video", "src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj", "{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.Apple", "src\Ryujinx.Audio.Backends.Apple\Ryujinx.Audio.Backends.Apple.csproj", "{AC26EFF0-8593-4184-9A09-98E37EFFB32E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL3", "src\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj", "{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.OpenAL", "src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj", "{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}"
@@ -555,6 +559,20 @@ Global
 		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x64.Build.0 = Release|Any CPU
 		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.ActiveCfg = Release|Any CPU
 		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.Build.0 = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x64.Build.0 = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x86.Build.0 = Debug|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x64.ActiveCfg = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x64.Build.0 = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.ActiveCfg = Release|Any CPU
+		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.Build.0 = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

assets/Languages.json

@@ -0,0 +1,24 @@
+{
+  "Languages": {
+    "ar_SA": "اَلْعَرَبِيَّةُ",
+    "de_DE": "Deutsch",
+    "el_GR": "Ελληνικά",
+    "en_US": "English (US)",
+    "es_ES": "Español (ES)",
+    "fr_FR": "Français (FR)",
+    "he_IL": "עִברִית",
+    "it_IT": "Italiano",
+    "ja_JP": "日本語",
+    "ko_KR": "한국어",
+    "no_NO": "Norsk",
+    "pl_PL": "Polski",
+    "pt_BR": "Português (BR)",
+    "ru_RU": "Русский",
+    "sv_SE": "Svenska",
+    "th_TH": "ภาษาไทย",
+    "tr_TR": "Türkçe",
+    "uk_UA": "Українська",
+    "zh_CN": "简体中文",
+    "zh_TW": "繁體中文 (台灣)"
+  }
+}

assets/Locales.md

@@ -0,0 +1,60 @@
+
+# Ryubing Locales
+
+Ryubing Locales uses a custom format, which uses a file for defining the supported languages and a folder of json files for the locales themselves.
+Each json file holds the locales for a specific part of the emulator, e.g. the Setup Wizard locales are in `SetupWizard.json`, and each locale entry in the file includes all the supported languages in the same place.
+
+## Languages
+in the `/assets/` folder you will find the `Languages.json` file, which defines all the languages supported by the emulator. 
+The file includes a table of the langauge codes and their langauge names.
+
+    #Example of the format for Languages.json	
+    {
+      "Languages": {
+        "ar_SA": "اَلْعَرَبِيَّةُ",
+        "en_US": "English (US)",
+        ...
+        "zh_TW": "繁體中文 (台灣)"
+      }
+    }
+
+## Locales
+in the `/assets/Locales/` folder you will find the json files, which define all the locales supported by the emulator. 
+Each json file holds locales for a specific part of the emulator in a large array of locale objects.
+Each locale is made up an ID used for lookup and a list of the languages and their matching translations.
+Any empty string or null value will automatically use the English translation instead in the emulator.
+
+### Format
+When adding a new locale, you just need to add the ID and the en_US language translation, then the validation system will add default values for the rest of languages automatically, when rebuilding the project.
+If you want to signal that a translation is supposed to match the English translation, you just have to replace the empty string with `null`.
+When you want to check what translations are missing for a language just search for `"<lang_code>": ""`, e.g: `"en_US": ""` (but with any other language, as English will never be missing translations).
+
+### Legacy file (Root.json)
+Currently all older locales are stored in `Root.json`, but they are slowly being moved into newer, more descriptive json files, to make the locale system more accessible.
+Do **not** add new locales to `Root.json`.
+If no json file exists for the specific part of the emulator you're working on, you should instead add a new json file for that part.
+
+    #Example of the format for Root.json	
+    {
+      "Locales": [
+        {
+          "ID": "MenuBarActionsOpenMiiEditor",
+          "Translations": {
+            "ar_SA": "",
+            "en_US": "Mii Editor",
+            ...
+            "zh_TW": "Mii 編輯器"
+          }
+        },
+        {
+          "ID": "KeyNumber9",
+          "Translations": {
+            "ar_SA": "٩",
+            "en_US": "9",
+            ...
+            "zh_TW": null
+          }
+        }
+      ]
+    }
+   

assets/Locales/RenderDoc.json

@@ -0,0 +1,104 @@
+{
+  "Locales": [
+    {
+      "ID": "MenuBarActions_StartCapture",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Start RenderDoc Frame Capture",
+        "es_ES": "Iniciar una captura de fotograma de RenderDoc",
+        "fr_FR": "Démarrer une capture de trame RenderDoc",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "RenderDoc 프레임 캡처 시작",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "启动 RenderDoc 帧捕获",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "MenuBarActions_EndCapture",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "End RenderDoc Frame Capture",
+        "es_ES": "Detener la captura de fotograma de RenderDoc",
+        "fr_FR": "Arrêter la capture de trame RenderDoc",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "RenderDoc 프레임 캡처 종료",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "结束 RenderDoc 帧捕获",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "MenuBarActions_DiscardCapture",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Discard RenderDoc Frame Capture",
+        "es_ES": "Descartar la captura de fotograma de RenderDoc",
+        "fr_FR": "Supprimer la capture de trame RenderDoc",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "RenderDoc 프레임 캡처 폐기",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "丢弃 RenderDoc 帧捕获",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "MenuBarActions_DiscardCapture_ToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.",
+        "es_ES": "Finaliza la captura de fotograma de RenderDoc actualmente activa y descarta inmediatamente su resultado.",
+        "fr_FR": "Met fin à la capture de trame RenderDoc en cours, en supprimant immédiatement son résultat.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "현재 활성화된 RenderDoc 프레임 캡처를 종료하고 결과를 즉시 폐기합니다.",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "结束当前正在进行的 RenderDoc 帧捕获，并立即丢弃其结果。",
+        "zh_TW": ""
+      }
+    }
+  ]
+}

assets/Locales/Root.json

@@ -1,72 +1,5 @@
 {
-  "Info": {
-    "Format1": "The Locale file uses a custom Unified format.",
-    "Format2": "The file starts with a list of all the supported languages.",
-    "Format3": "Each locale is made up an ID used for lookup and a list",
-    "Format4": "of the languages and their matching translations.",
-    "Format5": "When adding a new locale you just need to add the ID and",
-    "Format6": "the en_US language translation, then the validation system",
-    "Format7": "will add the rest of the languages automatically on rebuild.",
-    "Format8": "By default the languages will be added with an empty string.",
-    "Format9": "Any empty string or null value will automatically match the",
-    "Format10": "English translation.",
-    "Format11": "If you want to signal that a translation is supposed to",
-    "Format12": "match the English translation, you just have to replace the",
-    "Format13": "empty string with null.",
-    "Format14": "Translators who want to check what translations are missing",
-    "Format15": "for their language just need to search for:",
-    "Format16": "{'lang_code': ''} with double quotes instead of single",
-    "Format17": "e.g: {'en_US': ''} (but with any other language as English",
-    "Format18": "will never be missing translations)."
-  },
-  "Languages": [
-    "ar_SA",
-    "de_DE",
-    "el_GR",
-    "en_US",
-    "es_ES",
-    "fr_FR",
-    "he_IL",
-    "it_IT",
-    "ja_JP",
-    "ko_KR",
-    "no_NO",
-    "pl_PL",
-    "pt_BR",
-    "ru_RU",
-    "sv_SE",
-    "th_TH",
-    "tr_TR",
-    "uk_UA",
-    "zh_CN",
-    "zh_TW"
-  ],
   "Locales": [
-    {
-      "ID": "Language",
-      "Translations": {
-        "ar_SA": "اَلْعَرَبِيَّةُ",
-        "de_DE": "Deutsch",
-        "el_GR": "Ελληνικά",
-        "en_US": "English (US)",
-        "es_ES": "Español (ES)",
-        "fr_FR": "Français (FR)",
-        "he_IL": "עִברִית",
-        "it_IT": "Italiano",
-        "ja_JP": "日本語",
-        "ko_KR": "한국어",
-        "no_NO": "Norsk",
-        "pl_PL": "Polski",
-        "pt_BR": "Português (BR)",
-        "ru_RU": "Русский",
-        "sv_SE": "Svenska",
-        "th_TH": "ภาษาไทย",
-        "tr_TR": "Türkçe",
-        "uk_UA": "Українська",
-        "zh_CN": "简体中文",
-        "zh_TW": "繁體中文 (台灣)"
-      }
-    },
     {
       "ID": "MenuBarActionsOpenMiiEditor",
       "Translations": {
@@ -3800,7 +3733,7 @@
         "el_GR": "DLC/Ενημερώσεις για αρχεία/παιχνίδια που λείπουν θα αποφορτωθούν αυτόματα",
         "en_US": "DLC/Updates Referring To Missing Files/Games Will Unload Automatically",
         "es_ES": "DLC/Actualizaciones que hacen referencia a archivos/juegos ausentes se descargarán automáticamente",
-        "fr_FR": "DLC/Mises à jour concernant des fichiers/jeux manquants seront déchargées automatiquement",
+        "fr_FR": "DLC/Mises à Jour Concernant des Fichiers/Jeux Manquants Seront Déchargées Automatiquement",
         "he_IL": "DLC/עדכונים המתייחסים לקבצים/משחקים חסרים יוסרו אוטומטית",
         "it_IT": "DLC/Aggiornamenti relativi a file/gioco mancanti verranno disabilitati automaticamente",
         "ja_JP": "DLC/欠損ファイル/ゲームを参照するアップデートは自動的にアンロードされます",
@@ -4917,6 +4850,31 @@
         "zh_TW": null
       }
     },
+    {
+      "ID": "SettingsTabSystemAudioBackendAudioToolbox",
+      "Translations": {
+        "ar_SA": null,
+        "de_DE": null,
+        "el_GR": null,
+        "en_US": "Apple Audio (macOS only)",
+        "es_ES": null,
+        "fr_FR": null,
+        "he_IL": null,
+        "it_IT": null,
+        "ja_JP": null,
+        "ko_KR": null,
+        "no_NO": null,
+        "pl_PL": null,
+        "pt_BR": null,
+        "ru_RU": null,
+        "sv_SE": null,
+        "th_TH": null,
+        "tr_TR": null,
+        "uk_UA": null,
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
     {
       "ID": "SettingsTabSystemHacks",
       "Translations": {
@@ -13975,7 +13933,7 @@
         "el_GR": "\n\nΑυτό θα αντικαταστήσει την τρέχουσα έκδοση συστήματος {0}.",
         "en_US": "\n\nThis will replace the current system version {0}.",
         "es_ES": "\n\nEsto reemplazará la versión de sistema actual, {0}.",
-        "fr_FR": "\n\nCela remplacera la version actuelle du système {0}.",
+        "fr_FR": "\n\nCeci remplacera la version actuelle du système {0}.",
         "he_IL": "\n\nזה יחליף את גרסת המערכת הנוכחית {0}.",
         "it_IT": "\n\nQuesta sostituirà l'attuale versione del sistema ({0}).",
         "ja_JP": "\n\n現在のシステムバージョン {0} を置き換えます.",
@@ -14150,7 +14108,7 @@
         "el_GR": "",
         "en_US": "\n\nThis may replace some of the current installed Keys.",
         "es_ES": "\n\nEsto puede reemplazar algunas de las Keys actualmente instaladas.",
-        "fr_FR": "\n\nCela peut remplacer certaines des Clés actuellement installées.",
+        "fr_FR": "\n\nCeci peut remplacer certaines des Clés actuellement installées.",
         "he_IL": "",
         "it_IT": "\n\nAlcune delle chiavi già installate potrebbero essere sovrascritte.",
         "ja_JP": "",
@@ -16625,7 +16583,7 @@
         "el_GR": "Ενεργοποίηση Πολυνηματικής Επεξεργασίας Γραφικών",
         "en_US": "Executes graphics backend commands on a second thread.\n\nSpeeds up shader compilation, reduces stuttering, and improves performance on GPU drivers without multithreading support of their own. Slightly better performance on drivers with multithreading.\n\nSet to AUTO if unsure.",
         "es_ES": "Ejecuta los comandos del motor gráfico en un segundo hilo. Acelera la compilación de sombreadores, reduce los tirones, y mejora el rendimiento en controladores gráficos que no realicen su propio procesamiento con múltiples hilos. Rendimiento ligeramente superior en controladores gráficos que soporten múltiples hilos.\n\nSelecciona \"Auto\" si no sabes qué hacer.",
-        "fr_FR": "Exécute des commandes du backend graphiques sur un second thread.\n\nAccélère la compilation des shaders, réduit les crashs et les lags, améliore la performance sur les pilotes GPU sans support natif du multithreading. Offre une légère amélioration des performances sur les pilotes multithreadés.\n\nRéglez sur AUTO si vous n’êtes pas sûr.",
+        "fr_FR": "Exécute des commandes du backend graphiques sur un second thread.\n\nAccélère la compilation des shaders, réduit les crashs et les lags, améliore la performance sur les pilotes GPU sans support natif du multithreading. Offre une légère amélioration des performances sur les pilotes multithreadés.\n\nSéléctionnez Auto si vous n’êtes pas sûr.",
         "he_IL": "מריץ פקודות גראפיקה בתהליך שני נפרד.\n\nמאיץ עיבוד הצללות, מפחית תקיעות ומשפר ביצועים של דרייבר כרטיסי מסך אשר לא תומכים בהרצה רב-תהליכית.\n\nמוטב להשאיר על אוטומטי אם לא בטוחים.",
         "it_IT": "Esegue i comandi del backend grafico su un secondo thread.\n\nVelocizza la compilazione degli shader, riduce lo stuttering e migliora le prestazioni sui driver grafici senza il supporto integrato al multithreading. Migliora leggermente le prestazioni sui driver che supportano il multithreading.\n\nNel dubbio, imposta l'opzione su Automatico.",
         "ja_JP": "グラフィックスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
@@ -16650,7 +16608,7 @@
         "el_GR": "Εκτελεί εντολές γραφικών σε ένα δεύτερο νήμα. Επιτρέπει την πολυνηματική μεταγλώττιση Shader σε χρόνο εκτέλεσης, μειώνει το τρεμόπαιγμα και βελτιώνει την απόδοση των προγραμμάτων οδήγησης χωρίς τη δική τους υποστήριξη πολλαπλών νημάτων. Ποικίλες κορυφαίες επιδόσεις σε προγράμματα οδήγησης με multithreading. Μπορεί να χρειαστεί επανεκκίνηση του Ryujinx για να απενεργοποιήσετε σωστά την ενσωματωμένη λειτουργία πολλαπλών νημάτων του προγράμματος οδήγησης ή ίσως χρειαστεί να το κάνετε χειροκίνητα για να έχετε την καλύτερη απόδοση.",
         "en_US": "Executes graphics backend commands on a second thread.\n\nSpeeds up shader compilation, reduces stuttering, and improves performance on GPU drivers without multithreading support of their own. Slightly better performance on drivers with multithreading.\n\nSet to AUTO if unsure.",
         "es_ES": "Ejecuta los comandos del motor gráfico en un segundo hilo. Acelera la compilación de sombreadores, reduce los tirones, y mejora el rendimiento en controladores gráficos que no realicen su propio procesamiento con múltiples hilos. Rendimiento ligeramente superior en controladores gráficos que soporten múltiples hilos.\n\nSelecciona \"Auto\" si no sabes qué hacer.",
-        "fr_FR": "Exécute des commandes du backend graphiques sur un second thread.\n\nAccélère la compilation des shaders, réduit les crashs et les lags, améliore la performance sur les pilotes GPU sans support de multithreading. Légère augementation des performances sur les pilotes avec multithreading intégrer.\n\nRéglez sur Auto en cas d'incertitude.",
+        "fr_FR": "Exécute des commandes du backend graphiques sur un second thread.\n\nAccélère la compilation des shaders, réduit les crashs et les lags, améliore la performance sur les pilotes GPU sans support de multithreading. Légère augementation des performances sur les pilotes avec multithreading intégrer.\n\nSéléctionnez Auto en cas d'incertitude.",
         "he_IL": "מריץ פקודות גראפיקה בתהליך שני נפרד.\n\nמאיץ עיבוד הצללות, מפחית תקיעות ומשפר ביצועים של דרייבר כרטיסי מסך אשר לא תומכים בהרצה רב-תהליכית.\n\nמוטב להשאיר על אוטומטי אם לא בטוחים.",
         "it_IT": "Esegue i comandi del backend grafico su un secondo thread.\n\nVelocizza la compilazione degli shader, riduce lo stuttering e migliora le prestazioni sui driver grafici senza il supporto integrato al multithreading. Migliora leggermente le prestazioni sui driver che supportano il multithreading.\n\nNel dubbio, imposta l'opzione su Automatico.",
         "ja_JP": "グラフィックスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
@@ -16750,7 +16708,7 @@
         "el_GR": "",
         "en_US": "Level of Anisotropic Filtering. Set to Auto to use the value requested by the game.",
         "es_ES": "Nivel de filtrado anisotrópico. Setear en Auto para utilizar el valor solicitado por el juego.",
-        "fr_FR": "Niveau de filtrage anisotrope. Réglez sur Auto pour utiliser la valeur demandée par le jeu.",
+        "fr_FR": "Niveau de filtrage anisotrope. Séléctionnez Auto pour utiliser la valeur demandée par le jeu.",
         "he_IL": "",
         "it_IT": "Livello del filtro anisotropico. Imposta su Automatico per usare il valore richiesto dal gioco.",
         "ja_JP": "異方性フィルタリングのレベルです. ゲームが要求する値を使用する場合は｢自動｣を設定してください.",
@@ -16775,7 +16733,7 @@
         "el_GR": "",
         "en_US": "Aspect Ratio applied to the renderer window.\n\nOnly change this if you're using an aspect ratio mod for your game, otherwise the graphics will be stretched.\n\nLeave on 16:9 if unsure.",
         "es_ES": "Relación de aspecto aplicada a la ventana del renderizador.\n\nSolamente modificar esto si estás utilizando un mod de relación de aspecto para su juego, en cualquier otro caso los gráficos se estirarán.\n\nDejar en 16:9 si no sabe que hacer.",
-        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
+        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez celui-ci uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
         "he_IL": "",
         "it_IT": "Proporzioni dello schermo applicate alla finestra di renderizzazione.\n\nCambialo solo se stai usando una mod di proporzioni per il tuo gioco, altrimenti la grafica verrà allungata.\n\nLasciare il 16:9 se incerto.",
         "ja_JP": "レンダリングウインドウに適用するアスペクト比です.\n\nゲームにアスペクト比を変更する mod を使用している場合のみ変更してください.\n\nわからない場合は16:9のままにしておいてください.\n",
@@ -21997,23 +21955,23 @@
       "Translations": {
         "ar_SA": "اختر فلتر التكبير الذي سيتم تطبيقه عند استخدام مقياس الدقة.\n\nيعمل Bilinear بشكل جيد مع الألعاب ثلاثية الأبعاد وهو خيار افتراضي آمن.\n\nيوصى باستخدام Nearest لألعاب البكسل الفنية.\n\nFSR 1.0 هو مجرد مرشح توضيحي، ولا ينصح باستخدامه مع FXAA أو SMAA.\n\nيمكن تغيير هذا الخيار أثناء تشغيل اللعبة بالنقر فوق \"تطبيق\" أدناه؛ يمكنك ببساطة تحريك نافذة الإعدادات جانبا والتجربة حتى تجد المظهر المفضل للعبة.\n\nاتركه على Bilinear إذا لم تكن متأكدا.",
         "de_DE": "Wählen Sie den Skalierungsfilter, der bei der Auflösungsskalierung angewendet werden soll.\n\nBilinear eignet sich gut für 3D-Spiele und ist eine sichere Standardoption.\n\nNearest wird für Pixel-Art-Spiele empfohlen.\n\nFSR 1.0 ist lediglich ein Schärfungsfilter und wird nicht für die Verwendung mit FXAA oder SMAA empfohlen.\n\nDiese Option kann geändert werden, während ein Spiel läuft, indem Sie unten auf \"Anwenden\" klicken; Sie können das Einstellungsfenster einfach zur Seite schieben und experimentieren, bis Sie Ihr bevorzugtes Aussehen für ein Spiel gefunden haben.\n\nBleiben Sie auf BILINEAR, wenn Sie unsicher sind.",
-        "el_GR": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
+        "el_GR": "",
         "en_US": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nArea scaling is recommended when downscaling resolutions that are larger than the output window. It can be used to achieve a supersampled anti-aliasing effect when downscaling by more than 2x.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
         "es_ES": "Elija el filtro de escala que se aplicará al utilizar la escala de resolución.\n\nBilinear funciona bien para juegos 3D y es una opción predeterminada segura.\n\nSe recomienda el bilinear para juegos de pixel art.\n\nFSR 1.0 es simplemente un filtro de afilado, no se recomienda su uso con FXAA o SMAA.\n\nEsta opción se puede cambiar mientras se ejecuta un juego haciendo clic en \"Aplicar\" a continuación; simplemente puedes mover la ventana de configuración a un lado y experimentar hasta que encuentres tu estilo preferido para un juego.\n\nDéjelo en BILINEAR si no está seguro.",
-        "fr_FR": "Choisis le filtre de mise à l'échelle qui sera appliqué lors de l'utilisation de la mise à l'échelle de la résolution.\n\nLe filtre bilinéaire fonctionne bien pour les jeux en 3D et constitue une option par défaut sûre.\n\nLe filtre le plus proche est recommandé pour les jeux de pixel art.\n\nFSR 1.0 est simplement un filtre de netteté, non recommandé pour une utilisation avec FXAA ou SMAA.\n\nCette option peut être modifiée pendant qu'un jeu est en cours d'exécution en cliquant sur \"Appliquer\" ci-dessous ; vous pouvez simplement déplacer la fenêtre des paramètres de côté et expérimenter jusqu'à ce que vous trouviez l'aspect souhaité pour un jeu.\n\nLaissez sur BILINÉAIRE si vous n'êtes pas sûr.",
-        "he_IL": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
+        "fr_FR": "Choisit le filtre de mise à l'échelle qui sera appliqué lors de l'utilisation de la mise à l'échelle de la résolution.\n\nLe filtre bilinéaire fonctionne le mieux pour les jeux en 3D et constitue une option par défaut fiable.\n\nLe filtre le plus proche est recommandé pour les jeux de pixel art.\n\nFSR 1.0 est simplement un filtre de netteté, non recommandé pour une utilisation avec FXAA ou SMAA.\n\nCette option peut être modifiée pendant qu'un jeu est en cours d'exécution en cliquant sur \"Appliquer\" ci-dessous ; vous pouvez simplement déplacer la fenêtre des paramètres de côté et expérimenter jusqu'à ce que vous trouviez l'aspect souhaité pour un jeu.\n\nLaissez sur BILINÉAIRE si vous n'êtes pas sûr.",
+        "he_IL": "",
         "it_IT": "Scegli il filtro di scaling che verrà applicato quando si utilizza lo scaling della risoluzione.\n\nBilineare funziona bene per i giochi 3D ed è un'opzione predefinita affidabile.\n\nNearest è consigliato per i giochi in pixel art.\n\nFSR 1.0 è solo un filtro di nitidezza, sconsigliato per l'uso con FXAA o SMAA.\n\nLo scaling ad area è consigliato quando si riducono delle risoluzioni che sono più grandi della finestra di output. Può essere usato per ottenere un effetto di anti-aliasing supercampionato quando si riduce di più di 2x.\n\nQuesta opzione può essere modificata mentre un gioco è in esecuzione facendo clic su \"Applica\" qui sotto; puoi semplicemente spostare la finestra delle impostazioni da parte e sperimentare fino a quando non trovi il tuo look preferito per un gioco.\n\nNel dubbio, lascia su Bilineare.",
         "ja_JP": "解像度変更時に適用されるスケーリングフィルタを選択します.\n\nBilinearは3Dゲームに適しており, 安全なデフォルトオプションです.\n\nピクセルアートゲームにはNearestを推奨します.\n\nFSR 1.0は単なるシャープニングフィルタであり, FXAAやSMAAとの併用は推奨されません.\n\nこのオプションは, ゲーム実行中に下の「適用」をクリックすることで変更できます. 設定ウィンドウを脇に移動し, ゲームが好みの表示になるように試してみてください.\n\n不明な場合はBilinearのままにしておいてください.",
         "ko_KR": "해상도 스케일을 사용할 때 적용될 스케일링 필터를 선택합니다.\n\n쌍선형은 3D 게임에 적합하며 안전한 기본 옵션입니다.\n\nNearest는 픽셀 아트 게임에 권장됩니다.\n\nFSR 1.0은 단순히 선명도 필터일 뿐이며 FXAA 또는 SMAA와 함께 사용하는 것은 권장되지 않습니다.\n\nArea 스케일링은 출력 창보다 큰 해상도를 다운스케일링할 때 권장됩니다. 2배 이상 다운스케일링할 때 슈퍼샘플링된 앤티앨리어싱 효과를 얻는 데 사용할 수 있습니다.\n\n이 옵션은 아래의 \"적용\"을 클릭하여 게임을 실행하는 동안 변경할 수 있습니다. 설정 창을 옆으로 옮겨 원하는 게임 모양을 찾을 때까지 실험하면 됩니다.\n\n모르면 쌍선형을 그대로 두세요.",
         "no_NO": "Velg det skaleringsfilteret som skal brukes når du bruker oppløsningsskalaen.\n\nBilinear fungerer godt for 3D-spill og er et trygt standardalternativ.\n\nNærmeste anbefales for pixel kunst-spill.\n\nFSR 1.0 er bare et skarpere filter, ikke anbefalt for bruk med FXAA eller SMAA.\n\nOmrådeskalering anbefales når nedskalering er større enn utgangsvinduet. Den kan brukes til å oppnå en superprøvetaket anti-aliasingseffekt når en nedskalerer med mer enn 2x.\n\nDette valget kan endres mens et spill kjører ved å klikke \"Apply\" nedenfor; du kan bare flytte innstillingsvinduet til du finner det foretrukne utseendet til et spill.\n\nLa være på BILINEAR hvis usikker.",
-        "pl_PL": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
+        "pl_PL": "",
         "pt_BR": "Escolha o filtro de escala que será aplicado ao usar a escala de resolução.\n\nBilinear funciona bem para jogos 3D e é uma opção padrão segura.\n\nNearest é recomendado para jogos em pixel art.\n\nFSR 1.0 é apenas um filtro de nitidez, não recomendado para uso com FXAA ou SMAA.\n\nEssa opção pode ser alterada enquanto o jogo está em execução, clicando em \"Aplicar\" abaixo; basta mover a janela de configurações para o lado e experimentar até encontrar o visual preferido para o jogo.\n\nMantenha em BILINEAR se estiver em dúvida.",
-        "ru_RU": "Фильтрация текстур, которая будет применяться при масштабировании.\n\nБилинейная хорошо работает для 3D-игр и является настройкой по умолчанию.\n\nСтупенчатая рекомендуется для пиксельных игр.\n\nFSR это фильтр резкости, который не рекомендуется использовать с FXAA или SMAA.\n\nЗональная рекомендуется в случае использования разрешения больше разрешения окна. Можно использовать для достижения эффекта суперсемплига (SSAA) при даунскейле более чем в 2 раза.\n\nЭта опция может быть изменена во время игры по нажатию кнопки «Применить» ниже; \nВы можете просто переместить окно настроек в сторону и поэкспериментировать, пока не подберете подходящие настройки для конкретной игры.\n\nРекомендуется использовать «Билинейная».",
+        "ru_RU": "Фильтрация текстур, которая будет применяться при масштабировании.\n\nБилинейная хорошо работает для 3D-игр и является настройкой по умолчанию.\n\nСтупенчатая рекомендуется для пиксельных игр.\n\nFSR 1.0 это фильтр резкости, который не рекомендуется использовать с FXAA или SMAA.\n\nЗональная рекомендуется в случае использования разрешения больше разрешения окна. Можно использовать для достижения эффекта суперсемплига (SSAA) при даунскейле более чем в 2 раза.\n\nЭта опция может быть изменена во время игры по нажатию кнопки «Применить» ниже; \nВы можете просто переместить окно настроек в сторону и поэкспериментировать, пока не подберете подходящие настройки для конкретной игры.\n\nРекомендуется использовать «Билинейная».",
         "sv_SE": "Välj det skalfilter som ska tillämpas vid användning av upplösningsskala.\n\nBilinjär fungerar bra för 3D-spel och är ett säkert standardalternativ.\n\nNärmast rekommenderas för pixel art-spel.\n\nFSR 1.0 är bara ett skarpningsfilter, rekommenderas inte för FXAA eller SMAA.\n\nOmrådesskalning rekommenderas vid nedskalning av upplösning som är större än utdatafönstret. Det kan användas för att uppnå en supersamplad anti-alias-effekt vid nedskalning med mer än 2x.\n\nDetta alternativ kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som BILINJÄR om du är osäker.",
         "th_TH": "เลือกตัวกรองสเกลที่จะใช้เมื่อใช้สเกลความละเอียด\n\nBilinear ทำงานได้ดีกับเกม 3D และเป็นตัวเลือกเริ่มต้นที่ปลอดภัย\n\nแนะนำให้ใช้เกมภาพพิกเซลที่ใกล้เคียงที่สุด\n\nFSR 1.0 เป็นเพียงตัวกรองความคมชัด ไม่แนะนำให้ใช้กับ FXAA หรือ SMAA\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม",
-        "tr_TR": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
+        "tr_TR": "",
         "uk_UA": "Оберіть фільтр масштабування, який буде використовуватися при збільшенні роздільної здатності.\n\n\"Білінійний (Bilinear)\" добре виглядає в 3D іграх та є хорошим варіантом за замовчуванням.\n\n\"Найближчий (Nearest)\" рекомендується для піксельних ігор.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна міняти під час гри натисканням \"Застосувати\" в цьому вікні; щоб знайти найкращий варіант, просто відсуньте вікно налаштувань і поекспериментуйте.\n\nЗалиште \"Білінійний\", якщо не впевнені.",
-        "zh_CN": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。",
+        "zh_CN": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR 1.0（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。",
         "zh_TW": "選擇使用解析度縮放時套用的縮放過濾器。\n\n雙線性 (Bilinear) 濾鏡適用於 3D 遊戲，是一個安全的預設選項。\n\n建議像素美術遊戲使用近鄰性 (Nearest) 濾鏡。\n\nFSR 1.0 只是一個銳化濾鏡，不建議與 FXAA 或 SMAA 一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請保持雙線性 (Bilinear) 狀態。"
       }
     },
@@ -22073,7 +22031,7 @@
         "ar_SA": null,
         "de_DE": null,
         "el_GR": null,
-        "en_US": "FSR",
+        "en_US": "FSR 1.0",
         "es_ES": null,
         "fr_FR": null,
         "he_IL": null,
@@ -22150,7 +22108,7 @@
         "el_GR": "",
         "en_US": "Set FSR 1.0 sharpening level. Higher is sharper.",
         "es_ES": "Ajuste el nivel de nitidez FSR 1.0. Mayor es más nítido.",
-        "fr_FR": "Définis le niveau de netteté FSR 1.0. Plus la valeur est élevée, plus l'image est nette.",
+        "fr_FR": "Définit le niveau de netteté FSR 1.0. Plus la valeur est élevée, plus l'image est nette.",
         "he_IL": "",
         "it_IT": "Imposta il livello di nitidezza di FSR 1.0. Valori più alti comportano una maggiore nitidezza.",
         "ja_JP": "FSR 1.0のシャープ化レベルを設定します. 高い値ほどシャープになります.",
@@ -24843,4 +24801,4 @@
       }
     }
   ]
-}
+}

docs/compatibility.csv

@@ -2050,7 +2050,9 @@
 010003C00B868000,"Ninjin: Clash of Carrots",online-broken,playable,2024-07-10 05:12:26
 0100746010E4C000,"NinNinDays",,playable,2022-11-20 15:17:29
 0100C9A00ECE6000,"Nintendo 64™ – Nintendo Switch Online",gpu;vulkan,ingame,2024-04-23 20:21:07
+010057D00ECE4000,"Nintendo 64™ – Nintendo Switch Online",gpu;vulkan,ingame,2024-04-23 20:21:07
 0100e0601c632000,"Nintendo 64™ – Nintendo Switch Online: MATURE 17+",,ingame,2025-02-03 22:27:00
+010037A0170D2000,"NINTENDO 64™ – Nintendo Switch Online 18+",,ingame,2025-02-03 22:27:00
 0100D870045B6000,"Nintendo Entertainment System™ - Nintendo Switch Online",online,playable,2022-07-01 15:45:06
 0100C4B0034B2000,"Nintendo Labo Toy-Con 01 Variety Kit",gpu,ingame,2022-08-07 12:56:07
 01001E9003502000,"Nintendo Labo Toy-Con 03 Vehicle Kit",services;crash,menus,2022-08-03 17:20:11
@@ -2638,6 +2640,7 @@
 0100B16009C10000,"SINNER: Sacrifice for Redemption",nvdec;UE4;vulkan-backend-bug,playable,2022-08-12 20:37:33
 0100E9201410E000,"Sir Lovelot",,playable,2021-04-05 16:21:46
 0100134011E32000,"Skate City",,playable,2022-11-04 11:37:39
+0100a8501b66e000,"Skateboard Drifting with Maxwell Cat: The Game Simulator",,playable,2026-02-17 19:05:00
 0100B2F008BD8000,"Skee-Ball",,playable,2020-11-16 04:44:07
 01001A900F862000,"Skelattack",,playable,2021-06-09 15:26:26
 01008E700F952000,"Skelittle: A Giant Party!",,playable,2021-06-09 19:08:34
@@ -3307,6 +3310,7 @@
 0100AFA011068000,"Voxel Pirates",,playable,2022-09-28 22:55:02
 0100BFB00D1F4000,"Voxel Sword",,playable,2022-08-30 14:57:27
 01004E90028A2000,"Vroom in the night sky",Needs Update;vulkan-backend-bug,playable,2023-02-20 02:32:29
+0100BFC01D976000,"Virtual Boy – Nintendo Classics",services,nothing,2026-02-17 11:26:59
 0100C7C00AE6C000,"VSR: Void Space Racing",,playable,2021-01-27 14:08:59
 0100B130119D0000,"Waifu Uncovered",crash,ingame,2023-02-27 01:17:46
 0100E29010A4A000,"Wanba Warriors",,playable,2020-10-04 17:56:22

src/ARMeilleure/Common/EntryTable.cs

@@ -168,7 +168,7 @@ namespace ARMeilleure.Common
             {
                 _allocated.Dispose();
 
-                foreach (IntPtr page in _pages.Values)
+                foreach (nint page in _pages.Values)
                 {
                     NativeAllocator.Instance.Free((void*)page);
                 }

src/Ryujinx.Audio.Backends.Apple/AppleAudioBuffer.cs

@@ -0,0 +1,16 @@
+namespace Ryujinx.Audio.Backends.Apple
+{
+    class AppleAudioBuffer
+    {
+        public readonly ulong DriverIdentifier;
+        public readonly ulong SampleCount;
+        public ulong SamplePlayed;
+
+        public AppleAudioBuffer(ulong driverIdentifier, ulong sampleCount)
+        {
+            DriverIdentifier = driverIdentifier;
+            SampleCount = sampleCount;
+            SamplePlayed = 0;
+        }
+    }
+}

src/Ryujinx.Audio.Backends.Apple/AppleHardwareDeviceDriver.cs

@@ -0,0 +1,196 @@
+using Ryujinx.Audio.Common;
+using Ryujinx.Audio.Integration;
+using Ryujinx.Common.Logging;
+using Ryujinx.Memory;
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Runtime.Versioning;
+using Ryujinx.Audio.Backends.Apple.Native;
+using static Ryujinx.Audio.Backends.Apple.Native.AudioToolbox;
+using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
+
+namespace Ryujinx.Audio.Backends.Apple
+{
+    [SupportedOSPlatform("macos")]
+    [SupportedOSPlatform("ios")]
+    public sealed class AppleHardwareDeviceDriver : IHardwareDeviceDriver
+    {
+        private readonly ManualResetEvent _updateRequiredEvent;
+        private readonly ManualResetEvent _pauseEvent;
+        private readonly ConcurrentDictionary<AppleHardwareDeviceSession, byte> _sessions;
+        private readonly bool _supportSurroundConfiguration;
+
+        public float Volume { get; set; }
+
+        public AppleHardwareDeviceDriver()
+        {
+            _updateRequiredEvent = new ManualResetEvent(false);
+            _pauseEvent = new ManualResetEvent(true);
+            _sessions = new ConcurrentDictionary<AppleHardwareDeviceSession, byte>();
+
+            _supportSurroundConfiguration = TestSurroundSupport();
+
+            Volume = 1f;
+        }
+
+        private bool TestSurroundSupport()
+        {
+            try
+            {
+                AudioStreamBasicDescription format =
+                    GetAudioFormat(SampleFormat.PcmFloat, Constants.TargetSampleRate, 6);
+
+                int result = AudioQueueNewOutput(
+                    ref format,
+                    nint.Zero,
+                    nint.Zero,
+                    nint.Zero,
+                    nint.Zero,
+                    0,
+                    out nint testQueue);
+
+                if (result == 0)
+                {
+                    AudioChannelLayout layout = new AudioChannelLayout
+                    {
+                        AudioChannelLayoutTag = kAudioChannelLayoutTag_MPEG_5_1_A,
+                        AudioChannelBitmap = 0,
+                        NumberChannelDescriptions = 0
+                    };
+
+                    int layoutResult = AudioQueueSetProperty(
+                        testQueue,
+                        kAudioQueueProperty_ChannelLayout,
+                        ref layout,
+                        (uint)Marshal.SizeOf<AudioChannelLayout>());
+
+                    if (layoutResult == 0)
+                    {
+                        AudioQueueDispose(testQueue, true);
+                        return true;
+                    }
+
+                    AudioQueueDispose(testQueue, true);
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public static bool IsSupported => OperatingSystem.IsMacOSVersionAtLeast(10, 5);
+
+        public ManualResetEvent GetUpdateRequiredEvent()
+            => _updateRequiredEvent;
+
+        public ManualResetEvent GetPauseEvent()
+            => _pauseEvent;
+
+        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager,
+            SampleFormat sampleFormat, uint sampleRate, uint channelCount)
+        {
+            if (channelCount == 0)
+            {
+                channelCount = 2;
+            }
+
+            if (sampleRate == 0)
+            {
+                sampleRate = Constants.TargetSampleRate;
+            }
+
+            if (direction != Direction.Output)
+            {
+                throw new NotImplementedException("Input direction is currently not implemented on Apple backend!");
+            }
+
+            AppleHardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount);
+
+            _sessions.TryAdd(session, 0);
+
+            return session;
+        }
+
+        internal bool Unregister(AppleHardwareDeviceSession session)
+            => _sessions.TryRemove(session, out _);
+
+        internal static AudioStreamBasicDescription GetAudioFormat(SampleFormat sampleFormat, uint sampleRate,
+            uint channelCount)
+        {
+            uint formatFlags;
+            uint bitsPerChannel;
+
+            switch (sampleFormat)
+            {
+                case SampleFormat.PcmInt8:
+                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
+                    bitsPerChannel = 8;
+                    break;
+                case SampleFormat.PcmInt16:
+                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
+                    bitsPerChannel = 16;
+                    break;
+                case SampleFormat.PcmInt32:
+                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
+                    bitsPerChannel = 32;
+                    break;
+                case SampleFormat.PcmFloat:
+                    formatFlags = kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked;
+                    bitsPerChannel = 32;
+                    break;
+                default:
+                    throw new ArgumentException($"Unsupported sample format {sampleFormat}");
+            }
+
+            uint bytesPerFrame = (bitsPerChannel / 8) * channelCount;
+
+            return new AudioStreamBasicDescription
+            {
+                SampleRate = sampleRate,
+                FormatID = kAudioFormatLinearPCM,
+                FormatFlags = formatFlags,
+                BytesPerPacket = bytesPerFrame,
+                FramesPerPacket = 1,
+                BytesPerFrame = bytesPerFrame,
+                ChannelsPerFrame = channelCount,
+                BitsPerChannel = bitsPerChannel,
+                Reserved = 0
+            };
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                foreach (AppleHardwareDeviceSession session in _sessions.Keys)
+                {
+                    session.Dispose();
+                }
+
+                _pauseEvent.Dispose();
+            }
+        }
+
+        public bool SupportsDirection(Direction direction)
+            => direction != Direction.Input;
+
+        public bool SupportsSampleRate(uint sampleRate) => true;
+
+        public bool SupportsSampleFormat(SampleFormat sampleFormat)
+            => sampleFormat != SampleFormat.PcmInt24;
+
+        public bool SupportsChannelCount(uint channelCount)
+            => channelCount != 6 || _supportSurroundConfiguration;
+    }
+}

src/Ryujinx.Audio.Backends.Apple/AppleHardwareDeviceSession.cs

@@ -0,0 +1,285 @@
+using Ryujinx.Audio.Backends.Common;
+using Ryujinx.Audio.Common;
+using Ryujinx.Memory;
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Runtime.Versioning;
+using static Ryujinx.Audio.Backends.Apple.Native.AudioToolbox;
+
+namespace Ryujinx.Audio.Backends.Apple
+{
+    [SupportedOSPlatform("macos")]
+    [SupportedOSPlatform("ios")]
+    class AppleHardwareDeviceSession : HardwareDeviceSessionOutputBase
+    {
+        private const int NumBuffers = 3;
+
+        private readonly AppleHardwareDeviceDriver _driver;
+        private readonly ConcurrentQueue<AppleAudioBuffer> _queuedBuffers = new();
+        private readonly DynamicRingBuffer _ringBuffer = new();
+        private readonly ManualResetEvent _updateRequiredEvent;
+
+        private readonly AudioQueueOutputCallback _callbackDelegate;
+        private readonly GCHandle _gcHandle;
+
+        private nint _audioQueue;
+        private readonly nint[] _audioQueueBuffers = new nint[NumBuffers];
+        private readonly int[] _bufferBytesFilled = new int[NumBuffers];
+
+        private readonly int _bytesPerFrame;
+
+        private ulong _playedSampleCount;
+        private bool _started;
+        private float _volume = 1f;
+
+        private readonly object _lock = new();
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate void AudioQueueOutputCallback(
+            nint userData,
+            nint audioQueue,
+            nint buffer);
+
+        public AppleHardwareDeviceSession(
+            AppleHardwareDeviceDriver driver,
+            IVirtualMemoryManager memoryManager,
+            SampleFormat requestedSampleFormat,
+            uint requestedSampleRate,
+            uint requestedChannelCount)
+            : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
+        {
+            _driver = driver;
+            _updateRequiredEvent = driver.GetUpdateRequiredEvent();
+            _callbackDelegate = OutputCallback;
+            _bytesPerFrame = BackendHelper.GetSampleSize(requestedSampleFormat) * (int)requestedChannelCount;
+
+            _gcHandle = GCHandle.Alloc(this, GCHandleType.Normal);
+
+            SetupAudioQueue();
+        }
+
+        private void SetupAudioQueue()
+        {
+            lock (_lock)
+            {
+                AudioStreamBasicDescription format = AppleHardwareDeviceDriver.GetAudioFormat(
+                    RequestedSampleFormat,
+                    RequestedSampleRate,
+                    RequestedChannelCount);
+
+                nint callbackPtr = Marshal.GetFunctionPointerForDelegate(_callbackDelegate);
+                nint userData = GCHandle.ToIntPtr(_gcHandle);
+
+                int result = AudioQueueNewOutput(
+                    ref format,
+                    callbackPtr,
+                    userData,
+                    nint.Zero,
+                    nint.Zero,
+                    0,
+                    out _audioQueue);
+
+                if (result != 0)
+                {
+                    throw new InvalidOperationException($"AudioQueueNewOutput failed: {result}");
+                }
+
+                uint framesPerBuffer = RequestedSampleRate / 100;
+                uint bufferSize = framesPerBuffer * (uint)_bytesPerFrame;
+
+                for (int i = 0; i < NumBuffers; i++)
+                {
+                    AudioQueueAllocateBuffer(_audioQueue, bufferSize, out _audioQueueBuffers[i]);
+                    _bufferBytesFilled[i] = 0;
+
+                    PrimeBuffer(_audioQueueBuffers[i], i);
+                }
+            }
+        }
+
+        private unsafe void PrimeBuffer(nint bufferPtr, int bufferIndex)
+        {
+            AudioQueueBuffer* buffer = (AudioQueueBuffer*)bufferPtr;
+
+            int capacityBytes = (int)buffer->AudioDataBytesCapacity;
+            int framesPerBuffer = capacityBytes / _bytesPerFrame;
+
+            int availableFrames = _ringBuffer.Length / _bytesPerFrame;
+            int framesToRead = Math.Min(availableFrames, framesPerBuffer);
+            int bytesToRead = framesToRead * _bytesPerFrame;
+
+            Span<byte> dst = new((void*)buffer->AudioData, capacityBytes);
+            dst.Clear();
+
+            if (bytesToRead > 0)
+            {
+                Span<byte> audio = dst.Slice(0, bytesToRead);
+                _ringBuffer.Read(audio, 0, bytesToRead);
+                ApplyVolume(buffer->AudioData, bytesToRead);
+            }
+
+            buffer->AudioDataByteSize = (uint)capacityBytes;
+            _bufferBytesFilled[bufferIndex] = bytesToRead;
+
+            AudioQueueEnqueueBuffer(_audioQueue, bufferPtr, 0, nint.Zero);
+        }
+
+        private void OutputCallback(nint userData, nint audioQueue, nint bufferPtr)
+        {
+            if (!_started || bufferPtr == nint.Zero)
+                return;
+
+            int bufferIndex = Array.IndexOf(_audioQueueBuffers, bufferPtr);
+            if (bufferIndex < 0)
+                return;
+
+            int bytesPlayed = _bufferBytesFilled[bufferIndex];
+            if (bytesPlayed > 0)
+            {
+                ProcessPlayedSamples(bytesPlayed);
+            }
+
+            PrimeBuffer(bufferPtr, bufferIndex);
+        }
+
+        private void ProcessPlayedSamples(int bytesPlayed)
+        {
+            ulong samplesPlayed = GetSampleCount(bytesPlayed);
+            ulong remaining = samplesPlayed;
+            bool needUpdate = false;
+
+            while (remaining > 0 && _queuedBuffers.TryPeek(out AppleAudioBuffer buffer))
+            {
+                ulong needed = buffer.SampleCount - Interlocked.Read(ref buffer.SamplePlayed);
+                ulong take = Math.Min(needed, remaining);
+
+                ulong played = Interlocked.Add(ref buffer.SamplePlayed, take);
+                remaining -= take;
+
+                if (played == buffer.SampleCount)
+                {
+                    _queuedBuffers.TryDequeue(out _);
+                    needUpdate = true;
+                }
+
+                Interlocked.Add(ref _playedSampleCount, take);
+            }
+
+            if (needUpdate)
+            {
+                _updateRequiredEvent.Set();
+            }
+        }
+
+        private unsafe void ApplyVolume(nint dataPtr, int byteSize)
+        {
+            float volume = Math.Clamp(_volume * _driver.Volume, 0f, 1f);
+            if (volume >= 0.999f)
+                return;
+
+            int sampleCount = byteSize / BackendHelper.GetSampleSize(RequestedSampleFormat);
+
+            switch (RequestedSampleFormat)
+            {
+                case SampleFormat.PcmInt16:
+                    short* s16 = (short*)dataPtr;
+                    for (int i = 0; i < sampleCount; i++)
+                        s16[i] = (short)(s16[i] * volume);
+                    break;
+
+                case SampleFormat.PcmFloat:
+                    float* f32 = (float*)dataPtr;
+                    for (int i = 0; i < sampleCount; i++)
+                        f32[i] *= volume;
+                    break;
+
+                case SampleFormat.PcmInt32:
+                    int* s32 = (int*)dataPtr;
+                    for (int i = 0; i < sampleCount; i++)
+                        s32[i] = (int)(s32[i] * volume);
+                    break;
+
+                case SampleFormat.PcmInt8:
+                    sbyte* s8 = (sbyte*)dataPtr;
+                    for (int i = 0; i < sampleCount; i++)
+                        s8[i] = (sbyte)(s8[i] * volume);
+                    break;
+            }
+        }
+
+        public override void QueueBuffer(AudioBuffer buffer)
+        {
+            _ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
+            _queuedBuffers.Enqueue(new AppleAudioBuffer(buffer.DataPointer, GetSampleCount(buffer)));
+        }
+
+        public override void Start()
+        {
+            lock (_lock)
+            {
+                if (_started)
+                    return;
+
+                _started = true;
+                AudioQueueStart(_audioQueue, nint.Zero);
+            }
+        }
+
+        public override void Stop()
+        {
+            lock (_lock)
+            {
+                if (!_started)
+                    return;
+
+                _started = false;
+                AudioQueuePause(_audioQueue);
+            }
+        }
+
+        public override ulong GetPlayedSampleCount()
+            => Interlocked.Read(ref _playedSampleCount);
+
+        public override float GetVolume() => _volume;
+        public override void SetVolume(float volume) => _volume = volume;
+
+        public override bool WasBufferFullyConsumed(AudioBuffer buffer)
+        {
+            if (!_queuedBuffers.TryPeek(out AppleAudioBuffer driverBuffer))
+                return true;
+
+            return driverBuffer.DriverIdentifier != buffer.DataPointer;
+        }
+
+        public override void PrepareToClose() { }
+        public override void UnregisterBuffer(AudioBuffer buffer) { }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                Stop();
+
+                if (_audioQueue != nint.Zero)
+                {
+                    AudioQueueStop(_audioQueue, true);
+                    AudioQueueDispose(_audioQueue, true);
+                    _audioQueue = nint.Zero;
+                }
+
+                if (_gcHandle.IsAllocated)
+                {
+                    _gcHandle.Free();
+                }
+            }
+        }
+
+        public override void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}

src/Ryujinx.Audio.Backends.Apple/Native/AudioToolbox.cs

@@ -0,0 +1,102 @@
+using System.Runtime.InteropServices;
+// ReSharper disable InconsistentNaming
+
+namespace Ryujinx.Audio.Backends.Apple.Native
+{
+    public static partial class AudioToolbox
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct AudioStreamBasicDescription
+        {
+            public double SampleRate;
+            public uint FormatID;
+            public uint FormatFlags;
+            public uint BytesPerPacket;
+            public uint FramesPerPacket;
+            public uint BytesPerFrame;
+            public uint ChannelsPerFrame;
+            public uint BitsPerChannel;
+            public uint Reserved;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct AudioChannelLayout
+        {
+            public uint AudioChannelLayoutTag;
+            public uint AudioChannelBitmap;
+            public uint NumberChannelDescriptions;
+        }
+
+        internal const uint kAudioFormatLinearPCM = 0x6C70636D;
+        internal const uint kAudioQueueProperty_ChannelLayout = 0x6171636c;
+        internal const uint kAudioChannelLayoutTag_MPEG_5_1_A = 0x650006;
+        internal const uint kAudioFormatFlagIsFloat = (1 << 0);
+        internal const uint kAudioFormatFlagIsSignedInteger = (1 << 2);
+        internal const uint kAudioFormatFlagIsPacked = (1 << 3);
+        internal const uint kAudioFormatFlagIsBigEndian = (1 << 1);
+        internal const uint kAudioFormatFlagIsAlignedHigh = (1 << 4);
+        internal const uint kAudioFormatFlagIsNonInterleaved = (1 << 5);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueNewOutput(
+            ref AudioStreamBasicDescription format,
+            nint callback,
+            nint userData,
+            nint callbackRunLoop,
+            nint callbackRunLoopMode,
+            uint flags,
+            out nint audioQueue);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueSetProperty(
+            nint audioQueue,
+            uint propertyID,
+            ref AudioChannelLayout layout,
+            uint layoutSize);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueDispose(nint audioQueue, [MarshalAs(UnmanagedType.I1)] bool immediate);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueAllocateBuffer(
+            nint audioQueue,
+            uint bufferByteSize,
+            out nint buffer);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueStart(nint audioQueue, nint startTime);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueuePause(nint audioQueue);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueStop(nint audioQueue, [MarshalAs(UnmanagedType.I1)] bool immediate);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueSetParameter(
+            nint audioQueue,
+            uint parameterID,
+            float value);
+
+        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
+        internal static partial int AudioQueueEnqueueBuffer(
+            nint audioQueue,
+            nint buffer,
+            uint numPacketDescs,
+            nint packetDescs);
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct AudioQueueBuffer
+        {
+            public uint AudioDataBytesCapacity;
+            public nint AudioData;
+            public uint AudioDataByteSize;
+            public nint UserData;
+            public uint PacketDescriptionCapacity;
+            public nint PacketDescriptions;
+            public uint PacketDescriptionCount;
+        }
+
+        internal const uint kAudioQueueParam_Volume = 1;
+    }
+}

src/Ryujinx.Audio.Backends.Apple/Ryujinx.Audio.Backends.Apple.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
+    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+  </ItemGroup>
+
+</Project>

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs

@@ -10,7 +10,8 @@ using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 
 namespace Ryujinx.Audio.Backends.OpenAL
 {
-    public class OpenALHardwareDeviceDriver : IHardwareDeviceDriver
+    // ReSharper disable once InconsistentNaming
+    public sealed class OpenALHardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly ALDevice _device;
         private readonly ALContext _context;
@@ -148,7 +149,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
             Dispose(true);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs

@@ -9,7 +9,8 @@ using System.Threading;
 
 namespace Ryujinx.Audio.Backends.OpenAL
 {
-    class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
+    // ReSharper disable once InconsistentNaming
+    sealed class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly OpenALHardwareDeviceDriver _driver;
         private readonly int _sourceId;
@@ -190,7 +191,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
             }
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceDriver.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Backends.SDL3
 
     using unsafe SDL_AudioStreamCallbackPointer = delegate* unmanaged[Cdecl]<nint, SDL_AudioStream*, int, int, void>;
 
-    public class SDL3HardwareDeviceDriver : IHardwareDeviceDriver
+    public sealed class SDL3HardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly ManualResetEvent _updateRequiredEvent;
         private readonly ManualResetEvent _pauseEvent;
@@ -162,7 +162,7 @@ namespace Ryujinx.Audio.Backends.SDL3
             Dispose(true);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceSession.cs

@@ -12,10 +12,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Backends.SDL3
 {
-
-
-
-    unsafe class SDL3HardwareDeviceSession : HardwareDeviceSessionOutputBase
+    sealed unsafe class SDL3HardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly SDL3HardwareDeviceDriver _driver;
         private readonly ConcurrentQueue<SDL3AudioBuffer> _queuedBuffers;
@@ -226,7 +223,7 @@ namespace Ryujinx.Audio.Backends.SDL3
             return driverBuffer.DriverIdentifier != buffer.DataPointer;
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs

@@ -130,7 +130,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
             unsafe
             {
                 int* frameCountPtr = &nativeFrameCount;
-                IntPtr* arenasPtr = &arenas;
+                nint* arenasPtr = &arenas;
                 CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));
 
                 frameCount = *frameCountPtr;

src/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs

@@ -10,7 +10,7 @@ using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 
 namespace Ryujinx.Audio.Backends.SoundIo
 {
-    public class SoundIoHardwareDeviceDriver : IHardwareDeviceDriver
+    public sealed class SoundIoHardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly SoundIoContext _audioContext;
         private readonly SoundIoDeviceContext _audioDevice;
@@ -227,7 +227,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
             }
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceSession.cs

@@ -11,7 +11,7 @@ using static Ryujinx.Audio.Backends.SoundIo.Native.SoundIo;
 
 namespace Ryujinx.Audio.Backends.SoundIo
 {
-    class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
+    sealed class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly SoundIoHardwareDeviceDriver _driver;
         private readonly ConcurrentQueue<SoundIoAudioBuffer> _queuedBuffers;
@@ -428,7 +428,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
             }
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Renderer.Common
         public uint MixesSize;
         public uint SinksSize;
         public uint PerformanceBufferSize;
-        public uint Unknown24;
+        public uint SplitterSize;
         public uint RenderInfoSize;
 
 #pragma warning disable IDE0051, CS0169 // Remove unused field

src/Ryujinx.Audio/Renderer/Server/StateUpdater.cs

@@ -433,8 +433,12 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public ResultCode UpdateSplitter(SplitterContext context)
         {
+            long initialInputConsumed = _inputReader.Consumed;
+
             if (context.Update(ref _inputReader))
             {
+                _inputReader.SetConsumed(initialInputConsumed + _inputHeader.SplitterSize);
+
                 return ResultCode.Success;
             }
 

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -11,9 +11,7 @@ namespace Ryujinx.BuildValidationTasks
     {
         static readonly JsonSerializerOptions _jsonOptions = new()
         {
-            WriteIndented = true,
-            NewLine = "\n",
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            WriteIndented = true, NewLine = "\n", Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
         };
 
         public LocalesValidationTask() { }
@@ -22,77 +20,116 @@ namespace Ryujinx.BuildValidationTasks
         {
             Console.WriteLine("Running Locale Validation Task...");
 
-            string path = projectPath + "assets/locales.json";
+            bool encounteredIssue = false;
+            string langPath = projectPath + "assets/Languages.json";
             string data;
 
-            using (StreamReader sr = new(path))
+            using (StreamReader sr = new(langPath))
             {
                 data = sr.ReadToEnd();
             }
 
-            LocalesJson json;
-
             if (isGitRunner && data.Contains("\r\n"))
-                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, rebuild locally to fix...");
+                throw new FormatException("Languages.json is using CRLF line endings! It should be using LF line endings, rebuild locally to fix...");
+
+            LanguagesJson langJson;
 
             try
             {
-                json = JsonSerializer.Deserialize<LocalesJson>(data);
-
+                langJson = JsonSerializer.Deserialize<LanguagesJson>(data);
             }
             catch (JsonException e)
             {
                 throw new JsonException(e.Message); //shorter and easier stacktrace
             }
 
-            bool encounteredIssue = false;
-
-            for (int i = 0; i < json.Locales.Count; i++)
+            foreach ((string code, string lang) in langJson.Languages)
             {
-                LocalesEntry locale = json.Locales[i];
-
-                foreach (string langCode in json.Languages.Where(lang => !locale.Translations.ContainsKey(lang)))
+                if (string.IsNullOrEmpty(lang))
                 {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations.Add(langCode, string.Empty);
-                        Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
-                    }
+                    throw new JsonException($"{code} language name missing!");
                 }
-
-                foreach (string langCode in json.Languages.Where(lang => locale.Translations.ContainsKey(lang) && lang != "en_US" && locale.Translations[lang] == locale.Translations["en_US"]))
-                {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations[langCode] = string.Empty;
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
-                    }
-                }
-
-                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-                json.Locales[i] = locale;
             }
 
-            if (isGitRunner && encounteredIssue)
-                throw new JsonException("1 or more locales are invalid! Rebuild locally to fix...");
+            string folderPath = projectPath + "assets/Locales/";
 
-            string jsonString = JsonSerializer.Serialize(json, _jsonOptions);
+            string[] paths = Directory.GetFiles(folderPath, "*.json", SearchOption.AllDirectories);
 
-            using (StreamWriter sw = new(path))
+            foreach (string path in paths)
             {
-                sw.Write(jsonString);
+                using (StreamReader sr = new(path))
+                {
+                    data = sr.ReadToEnd();
+                }
+
+                if (isGitRunner && data.Contains("\r\n"))
+                    throw new FormatException($"{Path.GetFileName(path)} is using CRLF line endings! It should be using LF line endings, rebuild locally to fix...");
+
+                LocalesJson json;
+
+                try
+                {
+                    json = JsonSerializer.Deserialize<LocalesJson>(data);
+                }
+                catch (JsonException e)
+                {
+                    throw new JsonException(e.Message); //shorter and easier stacktrace
+                }
+
+
+                for (int i = 0; i < json.Locales.Count; i++)
+                {
+                    LocalesEntry locale = json.Locales[i];
+
+                    foreach (string langCode in
+                             langJson.Languages.Keys.Where(lang => !locale.Translations.ContainsKey(lang)))
+                    {
+                        encounteredIssue = true;
+
+                        if (!isGitRunner)
+                        {
+                            locale.Translations.Add(langCode, string.Empty);
+                            Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
+                        }
+                        else
+                        {
+                            Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
+                        }
+                    }
+
+                    foreach (string langCode in langJson.Languages.Keys.Where(lang =>
+                                 locale.Translations.ContainsKey(lang) && lang != "en_US" &&
+                                 locale.Translations[lang] == locale.Translations["en_US"]))
+                    {
+                        encounteredIssue = true;
+
+                        if (!isGitRunner)
+                        {
+                            locale.Translations[langCode] = string.Empty;
+                            Console.WriteLine(
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
+                        }
+                        else
+                        {
+                            Console.WriteLine(
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
+                        }
+                    }
+
+                    locale.Translations = locale.Translations.OrderBy(pair => pair.Key)
+                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                    json.Locales[i] = locale;
+                }
+
+                if (isGitRunner && encounteredIssue)
+                    throw new JsonException("1 or more locales are invalid! Rebuild locally to fix...");
+
+                string jsonString = JsonSerializer.Serialize(json, _jsonOptions);
+
+                using (StreamWriter sw = new(path))
+                {
+                    sw.Write(jsonString);
+                }
             }
 
             Console.WriteLine("Finished Locale Validation Task!");
@@ -100,10 +137,13 @@ namespace Ryujinx.BuildValidationTasks
             return true;
         }
 
+        struct LanguagesJson
+        {
+            public Dictionary<string, string> Languages { get; set; }
+        }
+
         struct LocalesJson
         {
-            public Dictionary<string, string> Info { get; set; }
-            public List<string> Languages { get; set; }
             public List<LocalesEntry> Locales { get; set; }
         }
 

src/Ryujinx.Common/Configuration/AntiAliasing.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AntiAliasing>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AntiAliasing>))]
     public enum AntiAliasing
     {
         None,

src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AspectRatio>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AspectRatio>))]
     public enum AspectRatio
     {
         Fixed4x3,

src/Ryujinx.Common/Configuration/BackendThreading.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<BackendThreading>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<BackendThreading>))]
     public enum BackendThreading
     {
         Auto,

src/Ryujinx.Common/Configuration/GraphicsBackend.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GraphicsBackend>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GraphicsBackend>))]
     public enum GraphicsBackend
     {
         Vulkan,

src/Ryujinx.Common/Configuration/GraphicsDebugLevel.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GraphicsDebugLevel>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GraphicsDebugLevel>))]
     public enum GraphicsDebugLevel
     {
         None,

src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GamepadInputId>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GamepadInputId>))]
     public enum GamepadInputId : byte
     {
         Unbound,

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<MotionInputBackendType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<MotionInputBackendType>))]
     public enum MotionInputBackendType : byte
     {
         Invalid,

src/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs

@@ -1,15 +1,14 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<StickInputId>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<StickInputId>))]
     public enum StickInputId : byte
     {
         Unbound,
         Left,
         Right,
-
+        
         Count,
     }
 }

src/Ryujinx.Common/Configuration/Hid/ControllerType.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Utilities;
 using System;
 using System.Text.Json.Serialization;
 
@@ -6,7 +5,7 @@ namespace Ryujinx.Common.Configuration.Hid
 {
     // This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
     [Flags]
-    [JsonConverter(typeof(TypedStringEnumConverter<ControllerType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<ControllerType>))]
     public enum ControllerType
     {
         None,

src/Ryujinx.Common/Configuration/Hid/InputBackendType.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<InputBackendType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<InputBackendType>))]
     public enum InputBackendType
     {
         Invalid,

src/Ryujinx.Common/Configuration/Hid/Key.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Key>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Key>))]
     public enum Key
     {
         Unknown,

src/Ryujinx.Common/Configuration/Hid/PlayerIndex.cs

@@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration.Hid
 {
     // This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
-    [JsonConverter(typeof(TypedStringEnumConverter<PlayerIndex>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<PlayerIndex>))]
     public enum PlayerIndex
     {
         Player1 = 0,

src/Ryujinx.Common/Configuration/MemoryManagerMode.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<MemoryManagerMode>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<MemoryManagerMode>))]
     public enum MemoryManagerMode : byte
     {
         SoftwarePageTable,

src/Ryujinx.Common/Configuration/ScalingFilter.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<ScalingFilter>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<ScalingFilter>))]
     public enum ScalingFilter
     {
         Bilinear,

src/Ryujinx.Common/Logging/LogClass.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Logging
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<LogClass>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<LogClass>))]
     public enum LogClass
     {
         Application,

src/Ryujinx.Common/Logging/LogLevel.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Common.Logging
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<LogLevel>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<LogLevel>))]
     public enum LogLevel
     {
         Debug,

src/Ryujinx.Common/Utilities/EmbeddedResources.cs

@@ -127,7 +127,7 @@ namespace Ryujinx.Common
         public static string[] GetAllAvailableResources(string path, string ext = "")
         {
             return ResolveManifestPath(path).Item1.GetManifestResourceNames()
-                .Where(r => r.EndsWith(ext))
+                .Where(r => r.StartsWith(path.Replace('/', '.')) && r.EndsWith(ext))
                 .ToArray();
         }
 

src/Ryujinx.Common/Utilities/OsUtils.cs

@@ -22,10 +22,11 @@ namespace Ryujinx.Common.Utilities
         }
 
         // "dumpable" attribute of the calling process
+        private const int PR_GET_DUMPABLE = 3;
         private const int PR_SET_DUMPABLE = 4;
 
-        [DllImport("libc", SetLastError = true)]
-        private static extern int prctl(int option, int arg2);
+        [LibraryImport("libc", SetLastError = true)]
+        private static partial int prctl(int option, int arg2);
 
         public static void SetCoreDumpable(bool dumpable)
         {
@@ -36,5 +37,13 @@ namespace Ryujinx.Common.Utilities
                 Debug.Assert(result == 0);
             }
         }
+
+        // Use the below line to display dumpable status in the console:
+        // Console.WriteLine($"{OsUtils.IsCoreDumpable()}");
+        public static bool IsCoreDumpable()
+        {
+            int result = prctl(PR_GET_DUMPABLE, 0);
+            return result == 1;
+        }
     }
 }

src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs

@@ -1,37 +0,0 @@
-#nullable enable
-using Ryujinx.Common.Logging;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Utilities
-{
-    /// <summary>
-    /// Specifies that value of <see cref="TEnum"/> will be serialized as string in JSONs
-    /// </summary>
-    /// <remarks>
-    /// Trimming friendly alternative to <see cref="JsonStringEnumConverter"/>.
-    /// Get rid of this converter if dotnet supports similar functionality out of the box.
-    /// </remarks>
-    /// <typeparam name="TEnum">Type of enum to serialize</typeparam>
-    public sealed class TypedStringEnumConverter<TEnum> : JsonConverter<TEnum> where TEnum : struct, Enum
-    {
-        public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            string? enumValue = reader.GetString();
-
-            if (Enum.TryParse(enumValue, out TEnum value))
-            {
-                return value;
-            }
-
-            Logger.Warning?.Print(LogClass.Configuration, $"Failed to parse enum value \"{enumValue}\" for {typeof(TEnum)}, using default \"{default(TEnum)}\"");
-            return default;
-        }
-
-        public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.ToString());
-        }
-    }
-}

src/Ryujinx.Cpu/AddressTable.cs

@@ -30,9 +30,9 @@ namespace ARMeilleure.Common
             /// <summary>
             /// Base address for the page.
             /// </summary>
-            public readonly IntPtr Address;
+            public readonly nint Address;
 
-            public AddressTablePage(bool isSparse, IntPtr address)
+            public AddressTablePage(bool isSparse, nint address)
             {
                 IsSparse = isSparse;
                 Address = address;
@@ -47,20 +47,20 @@ namespace ARMeilleure.Common
             public readonly SparseMemoryBlock Block;
             private readonly TrackingEventDelegate _trackingEvent;
 
-            public TableSparseBlock(ulong size, Action<IntPtr> ensureMapped, PageInitDelegate pageInit)
+            public TableSparseBlock(ulong size, Action<nint> ensureMapped, PageInitDelegate pageInit)
             {
                 SparseMemoryBlock block = new(size, pageInit, null);
 
                 _trackingEvent = (address, size, write) =>
                 {
                     ulong pointer = (ulong)block.Block.Pointer + address;
-                    ensureMapped((IntPtr)pointer);
+                    ensureMapped((nint)pointer);
                     return pointer;
                 };
 
                 bool added = NativeSignalHandler.AddTrackedRegion(
                     (nuint)block.Block.Pointer,
-                    (nuint)(block.Block.Pointer + (IntPtr)block.Block.Size),
+                    (nuint)(block.Block.Pointer + (nint)block.Block.Size),
                     Marshal.GetFunctionPointerForDelegate(_trackingEvent));
 
                 if (!added)
@@ -116,7 +116,7 @@ namespace ARMeilleure.Common
         }
 
         /// <inheritdoc/>
-        public IntPtr Base
+        public nint Base
         {
             get
             {
@@ -124,7 +124,7 @@ namespace ARMeilleure.Common
 
                 lock (_pages)
                 {
-                    return (IntPtr)GetRootPage();
+                    return (nint)GetRootPage();
                 }
             }
         }
@@ -240,7 +240,7 @@ namespace ARMeilleure.Common
 
                 long index = Levels[^1].GetValue(address);
 
-                EnsureMapped((IntPtr)(page + index));
+                EnsureMapped((nint)(page + index));
 
                 return ref page[index];
             }
@@ -284,7 +284,7 @@ namespace ARMeilleure.Common
         /// Ensure the given pointer is mapped in any overlapping sparse reservations.
         /// </summary>
         /// <param name="ptr">Pointer to be mapped</param>
-        private void EnsureMapped(IntPtr ptr)
+        private void EnsureMapped(nint ptr)
         {
             if (Sparse)
             {
@@ -299,7 +299,7 @@ namespace ARMeilleure.Common
                     {
                         SparseMemoryBlock sparse = reserved.Block;
 
-                        if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (IntPtr)sparse.Block.Size)
+                        if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (nint)sparse.Block.Size)
                         {
                             sparse.EnsureMapped((ulong)(ptr - sparse.Block.Pointer));
 
@@ -319,15 +319,15 @@ namespace ARMeilleure.Common
         /// </summary>
         /// <param name="level">Level to get the fill value for</param>
         /// <returns>The fill value</returns>
-        private IntPtr GetFillValue(int level)
+        private nint GetFillValue(int level)
         {
             if (_fillBottomLevel != null && level == Levels.Length - 2)
             {
-                return (IntPtr)_fillBottomLevelPtr;
+                return (nint)_fillBottomLevelPtr;
             }
             else
             {
-                return IntPtr.Zero;
+                return nint.Zero;
             }
         }
 
@@ -379,7 +379,7 @@ namespace ARMeilleure.Common
         /// <param name="fill">Fill value</param>
         /// <param name="leaf"><see langword="true"/> if leaf; otherwise <see langword="false"/></param>
         /// <returns>Allocated block</returns>
-        private IntPtr Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
+        private nint Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
         {
             int size = sizeof(T) * length;
 
@@ -405,7 +405,7 @@ namespace ARMeilleure.Common
                     }
                 }
 
-                page = new AddressTablePage(true, block.Block.Pointer + (IntPtr)_sparseReservedOffset);
+                page = new AddressTablePage(true, block.Block.Pointer + (nint)_sparseReservedOffset);
 
                 _sparseReservedOffset += (ulong)size;
 
@@ -413,7 +413,7 @@ namespace ARMeilleure.Common
             }
             else
             {
-                IntPtr address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
+                nint address = (nint)NativeAllocator.Instance.Allocate((uint)size);
                 page = new AddressTablePage(false, address);
 
                 Span<T> span = new((void*)page.Address, length);

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -658,7 +658,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 bool canImport = Storage.Info.IsLinear && Storage.Info.Stride >= Storage.Info.Width * Storage.Info.FormatInfo.BytesPerPixel;
 
-                IntPtr hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
+                nint hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
 
                 if (hostPointer != 0 && _context.Renderer.PrepareHostMapping(hostPointer, Storage.Size))
                 {

src/Ryujinx.Graphics.RenderDocApi/Capture.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    public readonly record struct Capture(int Index, string FileName, DateTime Timestamp)
+    {
+        public void SetComments(string comments)
+        {
+            RenderDoc.SetCaptureFileComments(FileName, comments);
+        }
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs

@@ -0,0 +1,100 @@
+// ReSharper disable UnusedMember.Global
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    public enum CaptureOption
+    {
+        /// <summary>
+        /// specifies whether the application is allowed to enable vsync. Default is on.
+        /// </summary>
+        AllowVsync = 0,
+        /// <summary>
+        /// specifies whether the application is allowed to enter exclusive fullscreen. Default is on.
+        /// </summary>
+        AllowFullscreen = 1,
+        /// <summary>
+        /// specifies whether (where possible) API-specific debugging is enabled. Default is off.
+        /// </summary>
+        ApiValidation = 2,
+        /// <summary>
+        /// specifies whether each API call should save a callstack. Default is off.
+        /// </summary>
+        CaptureCallstacks = 3,
+        /// <summary>
+        /// specifies whether, if <see cref="CaptureCallstacks"/> is enabled, callstacks are only saved on actions. Default is off.
+        /// </summary>
+        CaptureCallstacksOnlyDraws = 4,
+        /// <summary>
+        /// specifies a delay in seconds after launching a process to pause, to allow debuggers to attach. <br/>
+        /// This will only apply to child processes since the delay happens at process startup. Default is 0.
+        /// </summary>
+        DelayForDebugger = 5,
+        /// <summary>
+        /// specifies whether any mapped memory updates should be bounds-checked for overruns,
+        /// and uninitialised buffers are initialized to <code>0xDDDDDDDD</code> to catch use of uninitialised data.
+        /// Only supported on D3D11 and OpenGL. Default is off.
+        /// </summary>
+        /// <remarks>
+        /// This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
+        /// not do the same kind of interception &amp; checking, and undefined contents are really undefined.
+        /// </remarks>
+        VerifyBufferAccess = 6,
+        /// <summary>
+        /// Hooks any system API calls that create child processes, and injects
+        /// RenderDoc into them recursively with the same options.
+        /// </summary>
+        HookIntoChildren = 7,
+        /// <summary>
+        /// specifies whether all live resources at the time of capture should be included in the capture,
+        /// even if they are not referenced by the frame. Default is off.
+        /// </summary>
+        RefAllSources = 8,
+        /// <summary>
+        /// By default, RenderDoc skips saving initial states for resources where the
+        /// previous contents don't appear to be used, assuming that writes before
+        /// reads indicate previous contents aren't used.
+        /// </summary>
+        /// <remarks>
+        /// **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
+        /// getting it will be ignored, to allow compatibility with older versions.
+        /// In v1.1 the option acts as if it's always enabled.
+        /// </remarks>
+        SaveAllInitials = 9,
+        /// <summary>
+        /// In APIs that allow for the recording of command lists to be replayed later,
+        /// RenderDoc may choose to not capture command lists before a frame capture is
+        /// triggered, to reduce overheads. This means any command lists recorded once
+        /// and replayed many times will not be available and may cause a failure to
+        /// capture.
+        /// </summary>
+        /// <remarks>
+        /// NOTE: This is only true for APIs where multithreading is difficult or
+        /// discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
+        /// and always capture all command lists since the API is heavily oriented
+        /// around it and the overheads have been reduced by API design.
+        /// </remarks>
+        CaptureAllCmdLists = 10,
+        /// <summary>
+        /// Mute API debugging output when the <see cref="ApiValidation"/> option is enabled.
+        /// </summary>
+        DebugOutputMute = 11,
+        /// <summary>
+        /// Allow vendor extensions to be used even when they may be
+        /// incompatible with RenderDoc and cause corrupted replays or crashes.
+        /// </summary>
+        AllowUnsupportedVendorExtensions = 12,
+        /// <summary>
+        /// Define a soft memory limit which some APIs may aim to keep overhead under where
+        /// possible. Anything above this limit will where possible be saved directly to disk during
+        /// capture.<br/>
+        /// This will cause increased disk space use (which may cause a capture to fail if disk space is
+        /// exhausted) as well as slower capture times.
+        /// <br/><br/>
+        /// Not all memory allocations may be deferred like this so it is not a guarantee of a memory
+        /// limit.
+        /// <br/><br/>
+        /// Units are in MBs, suggested values would range from 200MB to 1000MB.
+        /// </summary>
+        SoftMemoryLimit = 13,
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/InputButton.cs

@@ -0,0 +1,83 @@
+
+// ReSharper disable UnusedMember.Global
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    public enum InputButton
+    {
+        // '0' - '9' matches ASCII values
+        Key0 = 0x30,
+        Key1 = 0x31,
+        Key2 = 0x32,
+        Key3 = 0x33,
+        Key4 = 0x34,
+        Key5 = 0x35,
+        Key6 = 0x36,
+        Key7 = 0x37,
+        Key8 = 0x38,
+        Key9 = 0x39,
+
+        // 'A' - 'Z' matches ASCII values
+        A = 0x41,
+        B = 0x42,
+        C = 0x43,
+        D = 0x44,
+        E = 0x45,
+        F = 0x46,
+        G = 0x47,
+        H = 0x48,
+        I = 0x49,
+        J = 0x4A,
+        K = 0x4B,
+        L = 0x4C,
+        M = 0x4D,
+        N = 0x4E,
+        O = 0x4F,
+        P = 0x50,
+        Q = 0x51,
+        R = 0x52,
+        S = 0x53,
+        T = 0x54,
+        U = 0x55,
+        V = 0x56,
+        W = 0x57,
+        X = 0x58,
+        Y = 0x59,
+        Z = 0x5A,
+
+        // leave the rest of the ASCII range free
+        // in case we want to use it later
+        NonPrintable = 0x100,
+
+        Divide,
+        Multiply,
+        Subtract,
+        Plus,
+
+        F1,
+        F2,
+        F3,
+        F4,
+        F5,
+        F6,
+        F7,
+        F8,
+        F9,
+        F10,
+        F11,
+        F12,
+
+        Home,
+        End,
+        Insert,
+        Delete,
+        PageUp,
+        PageDn,
+
+        Backspace,
+        Tab,
+        PrtScrn,
+        Pause,
+
+        Max,
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs

@@ -0,0 +1,39 @@
+// ReSharper disable UnusedMember.Global
+
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    [Flags]
+    public enum OverlayBits
+    {
+        /// <summary>
+        /// This single bit controls whether the overlay is enabled or disabled globally
+        /// </summary>
+        Enabled = 1 << 0,
+        /// <summary>
+        /// Show the average framerate over several seconds as well as min/max
+        /// </summary>
+        FrameRate = 1 << 1,
+        /// <summary>
+        /// Show the current frame number
+        /// </summary>
+        FrameNumber = 1 << 2,
+        /// <summary>
+        /// Show a list of recent captures, and how many captures have been made
+        /// </summary>
+        CaptureList = 1 << 3,
+        /// <summary>
+        /// Default values for the overlay mask
+        /// </summary>
+        Default = Enabled | FrameRate | FrameNumber | CaptureList,
+        /// <summary>
+        /// Enable all bits
+        /// </summary>
+        All = ~0,
+        /// <summary>
+        /// Disable all bits
+        /// </summary>
+        None = 0
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/README.md

@@ -0,0 +1,5 @@
+# Ryujinx.Graphics.RenderDocApi
+
+This is a C# binding for RenderDoc's application API.
+This is a source-inclusion of https://github.com/utkumaden/RenderdocSharp. 
+I didn't use the NuGet package as I had a few minor changes I wanted to make, and I want to learn from it as well via hands-on experience.

src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs

@@ -0,0 +1,639 @@
+using System;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    public static unsafe partial class RenderDoc
+    {
+        /// <summary>
+        /// True if the API is available.
+        /// </summary>
+        public static bool IsAvailable => Api != null;
+
+        /// <summary>
+        /// Set the minimum version of the API you require.
+        /// </summary>
+        /// <remarks>Set this before you do anything else with the RenderDoc API, including <see cref="IsAvailable"/>.</remarks>
+        public static RenderDocVersion MinimumRequired { get; set; } = RenderDocVersion.Version_1_0_0;
+
+        /// <summary>
+        /// Set to true to assert versions.
+        /// </summary>
+        public static bool AssertVersionEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Version of the API available.
+        /// </summary>
+        [MemberNotNullWhen(true, nameof(IsAvailable))]
+        public static Version? Version
+        {
+            get
+            {
+                if (!IsAvailable)
+                    return null;
+
+                int major, minor, build;
+                Api->GetApiVersion(&major, &minor, &build);
+                return new Version(major, minor, build);
+            }
+        }
+
+        /// <summary>
+        /// The current mask which determines what sections of the overlay render on each window.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static OverlayBits OverlayBits
+        {
+            get => Api->GetOverlayBits();
+            set
+            {
+                Api->MaskOverlayBits(~value, value);
+            }
+        }
+
+        /// <summary>
+        /// The template for new captures.<br/>
+        /// The template can either be a relative or absolute path, which determines where captures will be saved and how they will be named.
+        /// If the path template is 'my_captures/example', then captures saved will be e.g.
+        /// 'my_captures/example_frame123.rdc' and 'my_captures/example_frame456.rdc'.<br/>
+        /// Relative paths will be saved relative to the process’s current working directory.<br/>
+        /// </summary>
+        /// <remarks>The default template is in a folder controlled by the UI - initially the system temporary folder, and the filename is the executable’s filename.</remarks>
+        [RenderDocApiVersion(1, 0)]
+        public static string CaptureFilePathTemplate
+        {
+            get
+            {
+                byte* ptr = Api->GetCaptureFilePathTemplate();
+                return Marshal.PtrToStringUTF8((nint)ptr)!;
+            }
+            set
+            {
+                fixed (byte* ptr = value.ToNullTerminatedByteArray())
+                {
+                    Api->SetCaptureFilePathTemplate(ptr);
+                }
+            }
+        }
+
+        /// <summary>
+        /// The amount of frame captures that have been made.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static int CaptureCount => Api->GetNumCaptures();
+
+        /// <summary>
+        /// Checks if the RenderDoc UI is currently connected to this process.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static bool IsTargetControlConnected => Api is not null && Api->IsTargetControlConnected() != 0;
+
+        /// <summary>
+        /// Checks if the current frame is capturing.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static bool IsFrameCapturing => Api is not null && Api->IsFrameCapturing() != 0;
+
+        /// <summary>
+        ///     Set one of the options for tweaking some behaviors of capturing.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be set.</param>
+        /// <param name="integer">the unsigned integer value to set for the option.</param>
+        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
+        /// <returns>
+        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
+        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool SetCaptureOption(CaptureOption option, uint integer)
+        {
+            return Api is not null && Api->SetCaptureOptionU32(option, integer) != 0;
+        }
+
+        /// <summary>
+        /// Set one of the options for tweaking some behaviors of capturing.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be set.</param>
+        /// <param name="boolean">the value to set for the option, converted to a 0 or 1 before setting.</param>
+        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
+        /// <returns>
+        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
+        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool SetCaptureOption(CaptureOption option, bool boolean)
+            => SetCaptureOption(option, boolean ? 1 : 0);
+
+        /// <summary>
+        /// Set one of the options for tweaking some behaviors of capturing.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be set.</param>
+        /// <param name="single">the floating point value to set for the option.</param>
+        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
+        /// <returns>
+        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
+        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool SetCaptureOption(CaptureOption option, float single)
+        {
+            return Api is not null && Api->SetCaptureOptionF32(option, single) != 0;
+        }
+
+        /// <summary>
+        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be retrieved.</param>
+        /// <param name="integer">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, <see cref="int.MaxValue"/>.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void GetCaptureOption(CaptureOption option, out uint integer)
+        {
+            integer = Api->GetCaptureOptionU32(option);
+        }
+
+        /// <summary>
+        ///     Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be retrieved.</param>
+        /// <param name="single">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, -<see cref="float.MaxValue"/>.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void GetCaptureOption(CaptureOption option, out float single)
+        {
+            single = Api->GetCaptureOptionF32(option);
+        }
+
+        /// <summary>
+        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>,
+        /// converted to a boolean.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be retrieved.</param>
+        /// <returns>
+        /// the value of the capture option, converted to bool, if the option is a valid <see cref="CaptureOption"/> enum.
+        /// Otherwise, returns null.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool? GetCaptureOptionBool(CaptureOption option)
+        {
+            if (Api is null) return false;
+
+            uint returnVal = GetCaptureOptionU32(option);
+            if (returnVal == uint.MaxValue)
+                return null;
+
+            return returnVal is not 0;
+        }
+
+        /// <summary>
+        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be retrieved.</param>
+        /// <returns>
+        /// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
+        /// Otherwise, returns <see cref="int.MaxValue"/>.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static uint GetCaptureOptionU32(CaptureOption option) => Api->GetCaptureOptionU32(option);
+
+        /// <summary>
+        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
+        /// </summary>
+        /// <param name="option">specifies which capture option should be retrieved.</param>
+        /// <returns>
+        /// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
+        /// Otherwise, returns -<see cref="float.MaxValue"/>.
+        /// </returns>
+        [RenderDocApiVersion(1, 0)]
+        public static float GetCaptureOptionF32(CaptureOption option) => Api->GetCaptureOptionF32(option);
+
+        /// <summary>
+        /// Changes the key bindings in-application for changing the focussed window.
+        /// </summary>
+        /// <param name="buttons">lists the keys to bind.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void SetFocusToggleKeys(ReadOnlySpan<InputButton> buttons)
+        {
+            if (Api is null) return;
+
+            fixed (InputButton* ptr = buttons)
+            {
+                Api->SetFocusToggleKeys(ptr, buttons.Length);
+            }
+        }
+
+        /// <summary>
+        /// Changes the key bindings in-application for triggering a capture on the current window.
+        /// </summary>
+        /// <param name="buttons">lists the keys to bind.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void SetCaptureKeys(ReadOnlySpan<InputButton> buttons)
+        {
+            if (Api is null) return;
+
+            fixed (InputButton* ptr = buttons)
+            {
+                Api->SetCaptureKeys(ptr, buttons.Length);
+            }
+        }
+
+        /// <summary>
+        /// Attempts to remove RenderDoc and its hooks from the target process.<br/>
+        /// It must be called as early as possible in the process, and will have undefined results
+        /// if any graphics API functions have been called.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static void RemoveHooks()
+        {
+            if (Api is null) return;
+
+            Api->RemoveHooks();
+        }
+
+        /// <summary>
+        /// Remove RenderDoc’s crash handler from the target process.<br/>
+        /// If you have your own crash handler that you want to handle any exceptions,
+        /// RenderDoc’s handler could interfere; so it can be disabled.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static void UnloadCrashHandler()
+        {
+            if (Api is null) return;
+
+            Api->UnloadCrashHandler();
+        }
+
+        /// <summary>
+        /// Trigger a capture as if the user had pressed one of the capture hotkeys.<br/>
+        /// The capture will be taken from the next frame presented to whichever window is considered current.
+        /// </summary>
+        [RenderDocApiVersion(1, 0)]
+        public static void TriggerCapture()
+        {
+            if (Api is null) return;
+
+            Api->TriggerCapture();
+        }
+
+
+        /// <summary>
+        /// Gets the details of all frame capture in the current session.
+        /// This simply calls <see cref="GetCapture"/> for each index available as specified by <see cref="CaptureCount"/>.
+        /// </summary>
+        /// <returns>An immutable array of structs representing RenderDoc Captures.</returns>
+        public static ImmutableArray<Capture> GetCaptures()
+        {
+            if (Api is null) return [];
+            int captureCount = CaptureCount;
+            if (captureCount is 0) return [];
+
+            ImmutableArray<Capture>.Builder captures = ImmutableArray.CreateBuilder<Capture>(captureCount);
+
+            for (int captureIndex = 0; captureIndex < captureCount; captureIndex++)
+            {
+                if (GetCapture(captureIndex) is { } capture)
+                    captures.Add(capture);
+            }
+
+            return captures.DrainToImmutable();
+        }
+
+        /// <summary>
+        /// Gets the details of a particular frame capture, as specified by an index from 0 to <see cref="CaptureCount"/> - 1.
+        /// </summary>
+        /// <param name="index">specifies which capture to return the details of. Must be less than the value returned by <see cref="CaptureCount"/>.</param>
+        /// <returns>A struct representing a RenderDoc Capture.</returns>
+        [RenderDocApiVersion(1, 0)]
+        public static Capture? GetCapture(int index)
+        {
+            if (Api is null) return null;
+
+            int length = 0;
+            if (Api->GetCapture(index, null, &length, null) == 0)
+            {
+                return null;
+            }
+
+            Span<byte> bytes = stackalloc byte[length + 1];
+            long timestamp;
+
+            fixed (byte* ptr = bytes)
+                Api->GetCapture(index, ptr, &length, &timestamp);
+
+            string fileName = Encoding.UTF8.GetString(bytes[length..]);
+            return new Capture(index, fileName, DateTimeOffset.FromUnixTimeSeconds(timestamp).DateTime);
+        }
+
+        /// <summary>
+        /// Determine the closest matching replay UI executable for the current RenderDoc module, and launch it.
+        /// </summary>
+        /// <param name="connectTargetControl">if the UI should immediately connect to the application.</param>
+        /// <param name="commandLine">string to be appended to the command line, e.g. a capture filename. If this parameter is null, the command line will be unmodified.</param>
+        /// <returns>true if the UI was successfully launched; false otherwise.</returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool LaunchReplayUI(bool connectTargetControl, string? commandLine = null)
+        {
+            if (Api is null) return false;
+
+            if (commandLine == null)
+            {
+                return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, null) != 0;
+            }
+
+            fixed (byte* ptr = commandLine.ToNullTerminatedByteArray())
+            {
+                return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, ptr) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Explicitly sets which window is considered active.<br/>
+        /// The active window is the one that will be captured when the keybind to trigger a capture is pressed.
+        /// </summary>
+        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. Must be valid.</param>
+        /// <param name="hWindow">a handle to the platform window handle that will be set active. Must be valid.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void SetActiveWindow(nint hDevice, nint hWindow)
+        {
+            if (Api is null) return;
+
+            Api->SetActiveWindow((void*)hDevice, (void*)hWindow);
+        }
+
+        /// <summary>
+        /// Immediately begin a capture for the specified device/window combination.
+        /// </summary>
+        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        [RenderDocApiVersion(1, 0)]
+        public static void StartFrameCapture(nint hDevice, nint hWindow)
+        {
+            if (Api is null) return;
+
+            Api->StartFrameCapture((void*)hDevice, (void*)hWindow);
+        }
+
+        /// <summary>
+        /// Immediately end an active capture for the specified device/window combination.
+        /// </summary>
+        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        /// <returns>true if the capture succeeded; false otherwise.</returns>
+        [RenderDocApiVersion(1, 0)]
+        public static bool EndFrameCapture(nint hDevice, nint hWindow)
+        {
+            if (Api is null) return false;
+
+            return Api->EndFrameCapture((void*)hDevice, (void*)hWindow) != 0;
+        }
+
+        /// <summary>
+        /// Trigger multiple sequential frame captures as if the user had pressed one of the capture hotkeys before each frame.<br/>
+        /// The captures will be taken from the next frames presented to whichever window is considered current.<br/>
+        /// Each capture will be taken independently and saved to a separate file, with no reference to the other frames.
+        /// </summary>
+        /// <param name="numFrames">the number of frames to capture.</param>
+        /// <remarks>Requires RenderDoc API version 1.1</remarks>
+        [RenderDocApiVersion(1, 1)]
+        public static void TriggerMultiFrameCapture(uint numFrames)
+        {
+            if (Api is null) return;
+
+            AssertAtLeast(1, 1);
+            Api->TriggerMultiFrameCapture(numFrames);
+        }
+
+        /// <summary>
+        /// Adds an arbitrary comments field to the most recent capture,
+        /// which will then be displayed in the UI to anyone opening the capture.
+        /// <br/><br/>
+        /// This is equivalent to calling <see cref="SetCaptureFileComments"/> with a null first (fileName) parameter.
+        /// </summary>
+        /// <param name="comments">the comments to set in the capture file.</param>
+        /// <remarks>Requires RenderDoc API version 1.2</remarks>
+        public static void SetMostRecentCaptureFileComments(string comments)
+        {
+            if (Api is null) return;
+
+            AssertAtLeast(1, 2);
+
+            byte[] commentBytes = comments.ToNullTerminatedByteArray();
+
+            fixed (byte* pcomment = commentBytes)
+            {
+                Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
+            }
+        }
+
+        /// <summary>
+        /// Adds an arbitrary comments field to an existing capture on disk,
+        /// which will then be displayed in the UI to anyone opening the capture.
+        /// </summary>
+        /// <param name="fileName">the path to the capture file to set comments in. If this path is null or an empty string, the most recent capture file that has been created will be used.</param>
+        /// <param name="comments">the comments to set in the capture file.</param>
+        /// <remarks>Requires RenderDoc API version 1.2</remarks>
+        [RenderDocApiVersion(1, 2)]
+        public static void SetCaptureFileComments(string? fileName, string comments)
+        {
+            if (Api is null) return;
+
+            AssertAtLeast(1, 2);
+
+            byte[] commentBytes = comments.ToNullTerminatedByteArray();
+
+            fixed (byte* pcomment = commentBytes)
+            {
+                if (fileName is null)
+                {
+                    Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
+                }
+                else
+                {
+                    byte[] fileBytes = fileName.ToNullTerminatedByteArray();
+
+                    fixed (byte* pfile = fileBytes)
+                    {
+                        Api->SetCaptureFileComments(pfile, pcomment);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Similar to <see cref="EndFrameCapture"/>, but the capture contents will be discarded immediately, and not processed and written to disk.<br/>
+        /// This will be more efficient than <see cref="EndFrameCapture"/> if the frame capture is not needed.
+        /// </summary>
+        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
+        /// <returns>true if the capture was discarded; false if there was an error or no capture was in progress.</returns>
+        /// <remarks>Requires RenderDoc API version 1.4</remarks>
+        [RenderDocApiVersion(1, 4)]
+        public static bool DiscardFrameCapture(nint hDevice, nint hWindow)
+        {
+            if (Api is null) return false;
+
+            AssertAtLeast(1, 4);
+            return Api->DiscardFrameCapture((void*)hDevice, (void*)hWindow) != 0;
+        }
+
+
+        /// <summary>
+        /// Requests that the currently connected replay UI raise its window to the top.<br/>
+        /// This is only possible if an instance of the replay UI is currently connected, otherwise this method does nothing.<br/>
+        /// This can be used in conjunction with <see cref="IsTargetControlConnected"/> and <see cref="LaunchReplayUI"/>,<br/> to intelligently handle showing the UI after making a capture.<br/><br/>
+        /// Given OS differences, it is not guaranteed that the UI will be successfully raised even if the request is passed on.<br/>
+        /// On some systems it may only be highlighted or otherwise indicated to the user.
+        /// </summary>
+        /// <returns>true if the request was passed onto the UI successfully; false if there is no UI connected or some other error occurred.</returns>
+        /// <remarks>Requires RenderDoc API version 1.5</remarks>
+        [RenderDocApiVersion(1, 5)]
+        public static bool ShowReplayUI()
+        {
+            if (Api is null) return false;
+
+            AssertAtLeast(1, 5);
+            return Api->ShowReplayUI() != 0;
+        }
+
+        /// <summary>
+        /// Sets a given title for the currently in-progress capture, which will be displayed in the UI.<br/>
+        /// This can be used either with a user-defined capture using a manual start and end,
+        /// or an automatic capture triggered by <see cref="TriggerCapture"/> or a keypress.<br/>
+        /// If multiple captures are ongoing at once, the title will be applied to the first capture to end only.<br/>
+        /// Any subsequent captures will not get any title unless the function is called again.
+        /// This function can only be called while a capture is in-progress,
+        /// after <see cref="StartFrameCapture"/> and before <see cref="EndFrameCapture"/>.<br/>
+        /// If it is called elsewhere it will have no effect.
+        /// If it is called multiple times within a capture, only the last title will have any effect.
+        /// </summary>
+        /// <param name="title">The title to set for the in-progress capture.</param>
+        /// <remarks>Requires RenderDoc API version 1.6</remarks>
+        [RenderDocApiVersion(1, 6)]
+        public static void SetCaptureTitle(string title)
+        {
+            if (Api is null) return;
+
+            AssertAtLeast(1, 6);
+            fixed (byte* ptr = title.ToNullTerminatedByteArray())
+                Api->SetCaptureTitle(ptr);
+        }
+
+        #region Dynamic Library loading
+
+        /// <summary>
+        /// Reload the internal RenderDoc API structure. Useful for manually refreshing <see cref="Api"/> while using process injection.
+        /// </summary>
+        /// <param name="ignoreAlreadyLoaded">Ignores the existing API function structure and overwrites it with a re-request.</param>
+        /// <param name="requiredVersion">The version of the RenderDoc API required by your application.</param>
+        public static void ReloadApi(bool ignoreAlreadyLoaded = false, RenderDocVersion? requiredVersion = null)
+        {
+            if (_loaded && !ignoreAlreadyLoaded)
+                return;
+
+            lock (typeof(RenderDoc))
+            {
+                // Prevent double loads.
+                if (_loaded && !ignoreAlreadyLoaded)
+                    return;
+
+                if (requiredVersion.HasValue)
+                    MinimumRequired = requiredVersion.Value;
+
+                _loaded = true;
+                _api = GetApi(MinimumRequired);
+
+                if (_api != null)
+                    AssertAtLeast(MinimumRequired);
+            }
+        }
+
+        private static RenderDocApi* _api = null;
+        private static bool _loaded;
+
+        private static RenderDocApi* Api
+        {
+            get
+            {
+                ReloadApi();
+                return _api;
+            }
+        }
+
+        private static readonly Regex _dynamicLibraryPattern = RenderDocApiDynamicLibraryRegex();
+
+        private static RenderDocApi* GetApi(RenderDocVersion minimumRequired = RenderDocVersion.Version_1_0_0)
+        {
+            foreach (ProcessModule module in Process.GetCurrentProcess().Modules)
+            {
+                string moduleName = module.FileName ?? string.Empty;
+
+                if (!_dynamicLibraryPattern.IsMatch(moduleName))
+                    continue;
+
+                if (!NativeLibrary.TryLoad(moduleName, out nint moduleHandle))
+                    return null;
+
+                if (!NativeLibrary.TryGetExport(moduleHandle, "RENDERDOC_GetAPI", out nint procAddress))
+                    return null;
+
+                var RENDERDOC_GetApi = (delegate* unmanaged[Cdecl]<RenderDocVersion, RenderDocApi**, int>)procAddress;
+
+                RenderDocApi* api;
+                return RENDERDOC_GetApi(minimumRequired, &api) != 0 ? api : null;
+            }
+
+            return null;
+        }
+
+        private static void AssertAtLeast(RenderDocVersion rdv, [CallerMemberName] string callee = "")
+        {
+            Version ver = rdv.SystemVersion;
+            AssertAtLeast(ver.Major, ver.Minor, ver.Build, callee);
+        }
+
+        private static void AssertAtLeast(int major, int minor, int patch = 0, [CallerMemberName] string callee = "")
+        {
+            if (!AssertVersionEnabled)
+                return;
+
+            if (Version!.Major < major)
+                goto fail;
+
+            if (Version.Major > major)
+                goto success;
+            if (Version.Minor < minor)
+                goto fail;
+            if (Version.Minor > minor)
+                goto success;
+            if (Version.Build < patch)
+                goto fail;
+
+            success:
+            return;
+
+            fail:
+            Version minVersion =
+                typeof(RenderDoc).GetMethod(callee)!.GetCustomAttribute<RenderDocApiVersionAttribute>()!.MinVersion;
+            throw new NotSupportedException(
+                $"This API was introduced in RenderDoc API {minVersion}. Current API version is {Version}.");
+        }
+
+        private static byte[] ToNullTerminatedByteArray(this string str, Encoding? encoding = null)
+        {
+            encoding ??= Encoding.UTF8;
+
+            return encoding.GetBytes(str + '\0');
+        }
+
+        [GeneratedRegex(@"(lib)?renderdoc(\.dll|\.so|\.dylib)(\.\d+)?",
+            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+        private static partial Regex RenderDocApiDynamicLibraryRegex();
+
+        #endregion
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs

@@ -0,0 +1,51 @@
+namespace Ryujinx.Graphics.RenderDocApi
+{
+#pragma warning disable CS0649
+    internal unsafe struct RenderDocApi
+    {
+        public delegate* unmanaged[Cdecl]<int*, int*, int*, void> GetApiVersion;
+
+        public delegate* unmanaged[Cdecl]<CaptureOption, uint, int> SetCaptureOptionU32;
+        public delegate* unmanaged[Cdecl]<CaptureOption, float, int> SetCaptureOptionF32;
+        public delegate* unmanaged[Cdecl]<CaptureOption, uint> GetCaptureOptionU32;
+        public delegate* unmanaged[Cdecl]<CaptureOption, float> GetCaptureOptionF32;
+
+        public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetFocusToggleKeys;
+        public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetCaptureKeys;
+
+        public delegate* unmanaged[Cdecl]<OverlayBits> GetOverlayBits;
+        public delegate* unmanaged[Cdecl]<OverlayBits, OverlayBits, void> MaskOverlayBits;
+
+        public delegate* unmanaged[Cdecl]<void> RemoveHooks;
+        public delegate* unmanaged[Cdecl]<void> UnloadCrashHandler;
+        public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureFilePathTemplate;
+        public delegate* unmanaged[Cdecl]<byte*> GetCaptureFilePathTemplate;
+
+        public delegate* unmanaged[Cdecl]<int> GetNumCaptures;
+        public delegate* unmanaged[Cdecl]<int, byte*, int*, long*, uint> GetCapture;
+        public delegate* unmanaged[Cdecl]<void> TriggerCapture;
+        public delegate* unmanaged[Cdecl]<uint> IsTargetControlConnected;
+        public delegate* unmanaged[Cdecl]<uint, byte*, uint> LaunchReplayUI;
+
+        public delegate* unmanaged[Cdecl]<void*, void*, void> SetActiveWindow;
+        public delegate* unmanaged[Cdecl]<void*, void*, void> StartFrameCapture;
+        public delegate* unmanaged[Cdecl]<uint> IsFrameCapturing;
+        public delegate* unmanaged[Cdecl]<void*, void*, uint> EndFrameCapture;
+
+        // 1.1
+        public delegate* unmanaged[Cdecl]<uint, void> TriggerMultiFrameCapture;
+
+        // 1.2
+        public delegate* unmanaged[Cdecl]<byte*, byte*, void> SetCaptureFileComments;
+
+        // 1.3
+        public delegate* unmanaged[Cdecl]<void*, void*, uint> DiscardFrameCapture;
+
+        // 1.5
+        public delegate* unmanaged[Cdecl]<uint> ShowReplayUI;
+
+        // 1.6
+        public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureTitle;
+    }
+#pragma warning restore CS0649
+}

src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs

@@ -0,0 +1,16 @@
+
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property)]
+    public sealed class RenderDocApiVersionAttribute : Attribute
+    {
+        public Version MinVersion { get; }
+
+        public RenderDocApiVersionAttribute(int major, int minor, int patch = 0)
+        {
+            MinVersion = new Version(major, minor, patch);
+        }
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs

@@ -0,0 +1,47 @@
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+    public enum RenderDocVersion
+    {
+        Version_1_0_0 = 10000,
+        Version_1_0_1 = 10001,
+        Version_1_0_2 = 10002,
+        Version_1_1_0 = 10100,
+        Version_1_1_1 = 10101,
+        Version_1_1_2 = 10102,
+        Version_1_2_0 = 10200,
+        Version_1_3_0 = 10300,
+        Version_1_4_0 = 10400,
+        Version_1_4_1 = 10401,
+        Version_1_4_2 = 10402,
+        Version_1_5_0 = 10500,
+        Version_1_6_0 = 10600,
+    }
+    
+    public static partial class Helpers
+    {
+        extension(RenderDocVersion rdv)
+        {
+            public Version SystemVersion
+            {
+                get
+                {
+                    int i = (int)rdv;
+                    return new (i / 10000, (i % 10000) / 100, i % 100);
+                }
+            }
+        }
+
+        extension(Version sv)
+        {
+            public RenderDocVersion RenderDocVersion
+            {
+                get
+                {
+                    return (RenderDocVersion)(sv.Major * 10000 + sv.Minor * 100 + sv.Build);
+                }
+            }
+        }
+    }
+}

src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>disable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
+</Project>

src/Ryujinx.Graphics.Vulkan/Helpers.cs

@@ -0,0 +1,32 @@
+using Silk.NET.Vulkan;
+using System.Runtime.CompilerServices;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+    public static class Helpers
+    {
+        extension(Vk api)
+        {
+            /// <summary>
+            ///     C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
+            /// </summary>
+            /// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Vk"/>'s <see cref="Instance"/> pointer.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public unsafe void* GetRenderDocDevicePointer() =>
+                api.CurrentInstance is not null
+                    ? api.CurrentInstance.Value.GetRenderDocDevicePointer()
+                    : null;
+        }
+
+        extension(Instance instance)
+        {
+            /// <summary>
+            ///     C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
+            /// </summary>
+            /// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Instance"/>'s pointer.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public unsafe void* GetRenderDocDevicePointer()
+                => (*((void**)(instance.Handle)));
+        }
+    }
+}

src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
 
         public static void Initialize()
         {
-            IntPtr configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
+            nint configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
 
             vkGetMoltenVKConfigurationMVK(nint.Zero, out MVKConfiguration config, configSize);
 

src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -86,7 +86,7 @@ namespace Ryujinx.Graphics.Vulkan
                 enabledExtensions = enabledExtensions.Append(ExtDebugUtils.ExtensionName).ToArray();
             }
 
-            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
+            nint appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {
@@ -166,7 +166,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         internal static DeviceInfo[] GetSuitablePhysicalDevices(Vk api)
         {
-            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
+            nint appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {

src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs

@@ -1,43 +1,91 @@
 using Gommon;
 using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Kernel.Memory;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text;
 
 namespace Ryujinx.HLE.Debugger
 {
     public partial class Debugger
     {
+        private sealed record RcmdEntry(string[] Names, Func<Debugger, string, string> Handler, string[] HelpLines);
+
+        // Atmosphere/libraries/libmesosphere/source/kern_k_memory_block_manager.cpp
+        private static readonly string[] _memoryStateNames =
+        {
+            "----- Free -----",
+            "Io              ",
+            "Static          ",
+            "Code            ",
+            "CodeData        ",
+            "Normal          ",
+            "Shared          ",
+            "Alias           ",
+            "AliasCode       ",
+            "AliasCodeData   ",
+            "Ipc             ",
+            "Stack           ",
+            "ThreadLocal     ",
+            "Transfered      ",
+            "SharedTransfered",
+            "SharedCode      ",
+            "Inaccessible    ",
+            "NonSecureIpc    ",
+            "NonDeviceIpc    ",
+            "Kernel          ",
+            "GeneratedCode   ",
+            "CodeOut         ",
+            "Coverage        ",
+        };
+
         static Debugger()
         {
-            _rcmdDelegates.Add(["help"], 
-                _ => _rcmdDelegates.Keys
-                    .Where(x => !x[0].Equals("help"))
-                    .Select(x => x.JoinToString('\n'))
-                    .JoinToString('\n') + '\n'
-                );
-            _rcmdDelegates.Add(["get info"], dbgr => dbgr.GetProcessInfo());
-            _rcmdDelegates.Add(["backtrace", "bt"], dbgr => dbgr.GetStackTrace());
-            _rcmdDelegates.Add(["registers", "reg"], dbgr => dbgr.GetRegisters());
-            _rcmdDelegates.Add(["minidump"], dbgr => dbgr.GetMinidump());
+            _rcmdDelegates.Add(new RcmdEntry(
+                ["help"],
+                (dbgr, _) => _rcmdDelegates
+                    .Where(entry => entry.HelpLines.Length > 0)
+                    .SelectMany(entry => entry.HelpLines)
+                    .JoinToString('\n') + '\n',
+                Array.Empty<string>()));
+
+            _rcmdDelegates.Add(new RcmdEntry(["get info"], (dbgr, _) => dbgr.GetProcessInfo(), ["get info"]));
+            _rcmdDelegates.Add(new RcmdEntry(["backtrace", "bt"], (dbgr, _) => dbgr.GetStackTrace(), ["backtrace", "bt"]));
+            _rcmdDelegates.Add(new RcmdEntry(["registers", "reg"], (dbgr, _) => dbgr.GetRegisters(), ["registers", "reg"]));
+            _rcmdDelegates.Add(new RcmdEntry(["minidump"], (dbgr, _) => dbgr.GetMinidump(), ["minidump"]));
+            _rcmdDelegates.Add(new RcmdEntry(["get mappings"], (dbgr, args) => dbgr.GetMemoryMappings(args), ["get mappings", "get mappings {address}"]));
+            _rcmdDelegates.Add(new RcmdEntry(["get mapping"], (dbgr, args) => dbgr.GetMemoryMapping(args), ["get mapping {address}"]));
         }
 
-        private static readonly Dictionary<string[], Func<Debugger, string>> _rcmdDelegates = new();
+        private static readonly List<RcmdEntry> _rcmdDelegates = [];
 
-        public static Func<Debugger, string> FindRcmdDelegate(string command)
+        public static string CallRcmdDelegate(Debugger debugger, string command)
         {
-            Func<Debugger, string> searchResult = _ => $"Unknown command: {command}\n";
+            string originalCommand = command ?? string.Empty;
+            string trimmedCommand = originalCommand.Trim();
 
-            foreach ((string[] names, Func<Debugger, string> dlg) in _rcmdDelegates)
+            foreach (RcmdEntry entry in _rcmdDelegates)
             {
-                if (names.ContainsIgnoreCase(command.Trim()))
+                foreach (string name in entry.Names)
                 {
-                    searchResult = dlg;
-                    break;
+                    if (trimmedCommand.Equals(name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return entry.Handler(debugger, string.Empty);
+                    }
+
+                    if (trimmedCommand.Length > name.Length &&
+                        trimmedCommand.StartsWith(name, StringComparison.OrdinalIgnoreCase) &&
+                        char.IsWhiteSpace(trimmedCommand[name.Length]))
+                    {
+                        string arguments = trimmedCommand[name.Length..].TrimStart();
+                        return entry.Handler(debugger, arguments);
+                    }
                 }
             }
 
-            return searchResult;
+            return $"Unknown command: {originalCommand}\n";
         }
 
         public string GetStackTrace()
@@ -86,5 +134,181 @@ namespace Ryujinx.HLE.Debugger
                 return $"Error getting process info: {e.Message}\n";
             }
         }
+
+        public string GetMemoryMappings(string arguments)
+        {
+            if (Process?.MemoryManager is not { } memoryManager)
+            {
+                return "No application process found\n";
+            }
+
+            string trimmedArgs = arguments?.Trim() ?? string.Empty;
+
+            ulong startAddress = 0;
+            if (!string.IsNullOrEmpty(trimmedArgs))
+            {
+                if (!TryParseAddressArgument(trimmedArgs, out startAddress))
+                {
+                    return $"Invalid address: {trimmedArgs}\n";
+                }
+            }
+
+            ulong requestedAddress = startAddress;
+            ulong currentAddress = Math.Max(requestedAddress, memoryManager.AddrSpaceStart);
+            StringBuilder sb = new();
+            sb.AppendLine($"Mappings (starting from 0x{requestedAddress:x10}):");
+
+            if (currentAddress >= memoryManager.AddrSpaceEnd)
+            {
+                return sb.ToString();
+            }
+
+            while (currentAddress < memoryManager.AddrSpaceEnd)
+            {
+                KMemoryInfo info = memoryManager.QueryMemory(currentAddress);
+
+                try
+                {
+                    if (info.Size == 0 || info.Address >= memoryManager.AddrSpaceEnd)
+                    {
+                        break;
+                    }
+
+                    sb.AppendLine(FormatMapping(info, indent: true));
+
+                    if (info.Address > ulong.MaxValue - info.Size)
+                    {
+                        break;
+                    }
+
+                    ulong nextAddress = info.Address + info.Size;
+                    if (nextAddress <= currentAddress)
+                    {
+                        break;
+                    }
+
+                    currentAddress = nextAddress;
+                }
+                finally
+                {
+                    KMemoryInfo.Pool.Release(info);
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        public string GetMemoryMapping(string arguments)
+        {
+            if (Process?.MemoryManager is not { } memoryManager)
+            {
+                return "No application process found\n";
+            }
+
+            string trimmedArgs = arguments?.Trim() ?? string.Empty;
+
+            if (string.IsNullOrEmpty(trimmedArgs))
+            {
+                return "Missing address argument for `get mapping`\n";
+            }
+
+            if (!TryParseAddressArgument(trimmedArgs, out ulong address))
+            {
+                return $"Invalid address: {trimmedArgs}\n";
+            }
+
+            KMemoryInfo info = memoryManager.QueryMemory(address);
+
+            try
+            {
+                return FormatMapping(info, indent: false) + '\n';
+            }
+            finally
+            {
+                KMemoryInfo.Pool.Release(info);
+            }
+        }
+
+        private static string FormatMapping(KMemoryInfo info, bool indent)
+        {
+            ulong endAddress;
+
+            if (info.Size == 0)
+            {
+                endAddress = info.Address;
+            }
+            else if (info.Address > ulong.MaxValue - (info.Size - 1))
+            {
+                endAddress = ulong.MaxValue;
+            }
+            else
+            {
+                endAddress = info.Address + info.Size - 1;
+            }
+
+            string prefix = indent ? "  " : string.Empty;
+            return $"{prefix}0x{info.Address:x10} - 0x{endAddress:x10} {GetPermissionString(info)} {GetMemoryStateName(info.State)} {GetAttributeFlags(info)} [{info.IpcRefCount}, {info.DeviceRefCount}]";
+        }
+
+        private static string GetPermissionString(KMemoryInfo info)
+        {
+            if ((info.State & MemoryState.UserMask) == MemoryState.Unmapped)
+            {
+                return "   ";
+            }
+
+            return info.Permission switch
+            {
+                KMemoryPermission.ReadAndExecute => "r-x",
+                KMemoryPermission.Read => "r--",
+                KMemoryPermission.ReadAndWrite => "rw-",
+                _ => "---"
+            };
+        }
+
+        private static string GetMemoryStateName(MemoryState state)
+        {
+            int stateIndex = (int)(state & MemoryState.UserMask);
+            if ((uint)stateIndex < _memoryStateNames.Length)
+            {
+                return _memoryStateNames[stateIndex];
+            }
+
+            return "Unknown         ";
+        }
+
+        private static bool TryParseAddressArgument(string text, out ulong value)
+        {
+            value = 0;
+
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return false;
+            }
+
+            string trimmed = text.Trim();
+
+            if (trimmed.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+            {
+                trimmed = trimmed[2..];
+            }
+
+            if (trimmed.Length == 0)
+            {
+                return false;
+            }
+
+            return ulong.TryParse(trimmed, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out value);
+        }
+
+        private static string GetAttributeFlags(KMemoryInfo info)
+        {
+            char locked = info.Attribute.HasFlag(MemoryAttribute.Borrowed) ? 'L' : '-';
+            char ipc = info.Attribute.HasFlag(MemoryAttribute.IpcMapped) ? 'I' : '-';
+            char device = info.Attribute.HasFlag(MemoryAttribute.DeviceMapped) ? 'D' : '-';
+            char uncached = info.Attribute.HasFlag(MemoryAttribute.Uncached) ? 'U' : '-';
+
+            return $"{locked}{ipc}{device}{uncached}";
+        }
     }
 }

src/Ryujinx.HLE/Debugger/Gdb/Commands.cs

@@ -404,9 +404,8 @@ namespace Ryujinx.HLE.Debugger.Gdb
                 string command = Helpers.FromHex(hexCommand);
                 Logger.Debug?.Print(LogClass.GdbStub, $"Received Rcmd: {command}");
 
-                Func<Debugger, string> rcmd = Debugger.FindRcmdDelegate(command);
-
-                Processor.ReplyHex(rcmd(Debugger));
+                string response = Debugger.CallRcmdDelegate(Debugger, command);
+                Processor.ReplyHex(response);
             }
             catch (Exception e)
             {

src/Ryujinx.HLE/HOS/Services/Account/Acc/Types/AccountState.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.HLE.HOS.Services.Account.Acc
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AccountState>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AccountState>))]
     public enum AccountState
     {
         Closed,

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -5,6 +5,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Cpu;
+using Ryujinx.HLE.Exceptions;
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.HLE.HOS.Services.Ldn.Types;
@@ -14,6 +15,7 @@ using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.Types;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Memory;
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Net;
 using System.Net.NetworkInformation;
@@ -487,6 +489,23 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             return ResultCode.Success;
         }
 
+        [CommandCmif(106)] // 20.0.0+
+        // SetProtocol
+        public ResultCode SetProtocol(ServiceCtx context)
+        {
+            uint protocolValue =  context.RequestData.ReadUInt32();
+
+            // On NX only input value 1 or 3 is allowed, with an error being thrown otherwise.
+
+            if (protocolValue != 1 && protocolValue != 3)
+            {
+                throw new ArgumentException($"{GetType().FullName}: Protocol value is not 1 or 3!! Protocol value: {protocolValue}");
+            }
+            
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn, $"Protocol value:  {protocolValue}");
+            return ResultCode.Success;
+        }
+
         [CommandCmif(200)]
         // OpenAccessPoint()
         public ResultCode OpenAccessPoint(ServiceCtx context)

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public bool Blocking { get => Socket.Blocking; set => Socket.Blocking = value; }
 
-        public nint Handle => IntPtr.Zero;
+        public nint Handle => nint.Zero;
 
         public IPEndPoint RemoteEndPoint => Socket.RemoteEndPoint as IPEndPoint;
 

src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs

@@ -33,7 +33,20 @@ namespace Ryujinx.Horizon.Prepo.Ipc
         [CmifCommand(10100)] // 1.0.0-5.1.0
         [CmifCommand(10102)] // 6.0.0-9.2.0
         [CmifCommand(10104)] // 10.0.0+
-        public Result SaveReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
+        public Result SaveReportOld([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
+        {
+            if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
+            {
+                return PrepoResult.PermissionDenied;
+            }
+
+            ProcessPlayReport(PlayReportKind.Normal, gameRoomBuffer, reportBuffer, pid, Uid.Null);
+
+            return Result.Success;
+        }
+
+        [CmifCommand(10106)] // 21.0.0+
+        public Result SaveReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid, bool optInCheckEnabled)
         {
             if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
             {
@@ -48,7 +61,20 @@ namespace Ryujinx.Horizon.Prepo.Ipc
         [CmifCommand(10101)] // 1.0.0-5.1.0
         [CmifCommand(10103)] // 6.0.0-9.2.0
         [CmifCommand(10105)] // 10.0.0+
-        public Result SaveReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
+        public Result SaveReportWithUserOld(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
+        {
+            if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
+            {
+                return PrepoResult.PermissionDenied;
+            }
+
+            ProcessPlayReport(PlayReportKind.Normal, gameRoomBuffer, reportBuffer, pid, userId, true);
+
+            return Result.Success;
+        }
+
+        [CmifCommand(10107)] // 21.0.0+
+        public Result SaveReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid, bool optInCheckEnabled)
         {
             if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
             {

src/Ryujinx.Horizon/Sdk/Prepo/IPrepoService.cs

@@ -8,8 +8,10 @@ namespace Ryujinx.Horizon.Sdk.Prepo
 {
     interface IPrepoService : IServiceObject
     {
-        Result SaveReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
-        Result SaveReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
+        Result SaveReportOld(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
+        Result SaveReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid, bool optInCheckEnabled);
+        Result SaveReportWithUserOld(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
+        Result SaveReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid, bool optInCheckEnabled);
         Result RequestImmediateTransmission();
         Result GetTransmissionStatus(out int status);
         Result GetSystemSessionId(out ulong systemSessionId);

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -9,10 +9,20 @@ using static SDL.SDL3;
 
 namespace Ryujinx.Input.SDL3
 {
+    
+    
     public unsafe class SDL3GamepadDriver : IGamepadDriver
     {
         private readonly Dictionary<SDL_JoystickID, string> _gamepadsInstanceIdsMapping;
         private readonly Dictionary<SDL_JoystickID, string> _gamepadsIds;
+        /// <summary>
+        /// Unlinked joy-cons
+        /// </summary>
+        private readonly Dictionary<SDL_JoystickID, string> _joyConsIds;
+        /// <summary>
+        /// Linked joy-cons, remove dual joy-con from <c>_gamepadsIds</c> when a linked joy-con is removed
+        /// </summary>
+        private readonly Dictionary<SDL_JoystickID,string> _linkedJoyConsIds;
         private readonly Lock _lock = new();
 
         public ReadOnlySpan<string> GamepadsIds
@@ -21,7 +31,11 @@ namespace Ryujinx.Input.SDL3
             {
                 lock (_lock)
                 {
-                    return _gamepadsIds.Values.ToArray();
+                    List<string> temp = [];
+                    temp.AddRange(_gamepadsIds.Values);
+                    temp.AddRange(_joyConsIds.Values);
+                    temp.AddRange(_linkedJoyConsIds.Values);
+                    return temp.ToArray();
                 }
             }
         }
@@ -35,6 +49,8 @@ namespace Ryujinx.Input.SDL3
         {
             _gamepadsInstanceIdsMapping = new Dictionary<SDL_JoystickID, string>();
             _gamepadsIds = [];
+            _joyConsIds = [];
+            _linkedJoyConsIds = [];
 
             SDL3Driver.Instance.Initialize();
             SDL3Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
@@ -92,7 +108,7 @@ namespace Ryujinx.Input.SDL3
                 int guidIndex = 0;
                 id = guidIndex + "-" + guidString;
 
-                while (_gamepadsIds.ContainsValue(id))
+                while (_gamepadsIds.ContainsValue(id) || _joyConsIds.ContainsValue(id) || _linkedJoyConsIds.ContainsValue(id))
                 {
                     id = (++guidIndex) + "-" + guidString;
                 }
@@ -104,16 +120,47 @@ namespace Ryujinx.Input.SDL3
         private void HandleJoyStickDisconnected(SDL_JoystickID joystickInstanceId)
         {
             bool joyConPairDisconnected = false;
+            string fakeId = null;
 
             if (!_gamepadsInstanceIdsMapping.Remove(joystickInstanceId, out string id))
                 return;
 
             lock (_lock)
             {
-                _gamepadsIds.Remove(joystickInstanceId);
-                if (!SDL3JoyConPair.IsCombinable(_gamepadsIds))
+                if (!_linkedJoyConsIds.ContainsKey(joystickInstanceId))
                 {
-                    _gamepadsIds.Remove(GetInstanceIdFromId(SDL3JoyConPair.Id));
+                    if (!_joyConsIds.Remove(joystickInstanceId))
+                    {
+                        _gamepadsIds.Remove(joystickInstanceId);
+                    }
+                }
+                else
+                {
+                    foreach (string matchId in _gamepadsIds.Values)
+                    {
+                        if (matchId.Contains(id))
+                        {
+                            fakeId = matchId;
+                            break;
+                        }
+                    }
+                        
+                    string leftId = fakeId!.Split('_')[0];
+                    string rightId = fakeId!.Split('_')[1];
+
+                    if (leftId == id)
+                    {
+                        _linkedJoyConsIds.Remove(GetInstanceIdFromId(rightId));
+                        _joyConsIds.Add(GetInstanceIdFromId(rightId), rightId);
+                    }
+                    else
+                    {
+                        _linkedJoyConsIds.Remove(GetInstanceIdFromId(leftId));
+                        _joyConsIds.Add(GetInstanceIdFromId(leftId), leftId);
+                    }
+                        
+                    _linkedJoyConsIds.Remove(joystickInstanceId);
+                    _gamepadsIds.Remove(GetInstanceIdFromId(fakeId));
                     joyConPairDisconnected = true;
                 }
             }
@@ -121,13 +168,14 @@ namespace Ryujinx.Input.SDL3
             OnGamepadDisconnected?.Invoke(id);
             if (joyConPairDisconnected)
             {
-                OnGamepadDisconnected?.Invoke(SDL3JoyConPair.Id);
+                OnGamepadDisconnected?.Invoke(fakeId);
             }
         }
 
         private void HandleJoyStickConnected(SDL_JoystickID joystickInstanceId)
         {
             bool joyConPairConnected = false;
+            string fakeId = null;
 
             if (SDL_IsGamepad(joystickInstanceId))
             {
@@ -149,27 +197,40 @@ namespace Ryujinx.Input.SDL3
                 {
                     lock (_lock)
                     {
-
-                        _gamepadsIds.Add(joystickInstanceId, id);
-
-                        if (SDL3JoyConPair.IsCombinable(_gamepadsIds))
+                        if (!SDL3JoyCon.IsJoyCon(joystickInstanceId))
                         {
-                            // TODO - It appears that you can only have one joy con pair connected at a time?
-                            // This was also the behavior before SDL3
-                            _gamepadsIds.Remove(GetInstanceIdFromId(SDL3JoyConPair.Id));
-                            uint fakeInstanceID = uint.MaxValue;
-                            while (!_gamepadsIds.TryAdd((SDL_JoystickID)fakeInstanceID, SDL3JoyConPair.Id))
+                            _gamepadsIds.Add(joystickInstanceId, id);
+                        }
+                        else
+                        {
+                            if (SDL3JoyConPair.IsCombinable(joystickInstanceId, _joyConsIds, out SDL_JoystickID match))
                             {
-                                fakeInstanceID--;
+                                _joyConsIds.Remove(match, out string matchId);
+                                _linkedJoyConsIds.Add(joystickInstanceId, id);
+                                _linkedJoyConsIds.Add(match, matchId);
+                                
+                                uint fakeInstanceId = uint.MaxValue;
+                                fakeId = SDL3JoyCon.IsLeftJoyCon(joystickInstanceId)
+                                    ? $"{id}_{matchId}"
+                                    : $"{matchId}_{id}";
+                                while (!_gamepadsIds.TryAdd((SDL_JoystickID)fakeInstanceId, fakeId))
+                                {
+                                    fakeInstanceId--;
+                                }
+                                _gamepadsInstanceIdsMapping.Add((SDL_JoystickID)fakeInstanceId, fakeId);
+                                joyConPairConnected = true;
+                            }
+                            else
+                            {
+                                _joyConsIds.Add(joystickInstanceId, id);
                             }
-                            joyConPairConnected = true;
                         }
                     }
 
                     OnGamepadConnected?.Invoke(id);
                     if (joyConPairConnected)
                     {
-                        OnGamepadConnected?.Invoke(SDL3JoyConPair.Id);
+                        OnGamepadConnected?.Invoke(fakeId);
                     }
                 }
             }
@@ -193,10 +254,22 @@ namespace Ryujinx.Input.SDL3
                 {
                     OnGamepadDisconnected?.Invoke(gamepad.Value);
                 }
+                
+                foreach (var gamepad in _joyConsIds)
+                {
+                    OnGamepadDisconnected?.Invoke(gamepad.Value);
+                }
+                
+                foreach (var gamepad in _linkedJoyConsIds)
+                {
+                    OnGamepadDisconnected?.Invoke(gamepad.Value);
+                }
 
                 lock (_lock)
                 {
                     _gamepadsIds.Clear();
+                    _joyConsIds.Clear();
+                    _linkedJoyConsIds.Clear();
                 }
 
                 SDL3Driver.Instance.Dispose();
@@ -215,11 +288,27 @@ namespace Ryujinx.Input.SDL3
 
         public IGamepad GetGamepad(string id)
         {
-            if (id == SDL3JoyConPair.Id)
+            // joy-con pair ids is the combined ids of its parts which are split using a '_'
+            if (id.Contains('_'))
             {
                 lock (_lock)
                 {
-                    return SDL3JoyConPair.GetGamepad(_gamepadsIds);
+                    string leftId = id.Split('_')[0];
+                    string rightId = id.Split('_')[1];
+                    
+                    SDL_JoystickID leftInstanceId = GetInstanceIdFromId(leftId);
+                    SDL_JoystickID rightInstanceId = GetInstanceIdFromId(rightId);
+
+                    SDL_Gamepad* leftGamepadHandle = SDL_OpenGamepad(leftInstanceId);
+                    SDL_Gamepad* rightGamepadHandle = SDL_OpenGamepad(rightInstanceId);
+
+                    if (leftGamepadHandle == null || rightGamepadHandle == null)
+                    {
+                        return null;
+                    }
+
+                    return new SDL3JoyConPair(new SDL3JoyCon(leftGamepadHandle, leftId),
+                        new SDL3JoyCon(rightGamepadHandle, rightId));
                 }
             }
 
@@ -232,7 +321,7 @@ namespace Ryujinx.Input.SDL3
                 return null;
             }
 
-            if (SDL_GetGamepadName(gamepadHandle).StartsWith(SDL3JoyCon.Prefix))
+            if (SDL3JoyCon.IsJoyCon(instanceId))
             {
                 return new SDL3JoyCon(gamepadHandle, id);
             }
@@ -249,6 +338,22 @@ namespace Ryujinx.Input.SDL3
                     yield return GetGamepad(gamepad.Value);
                 }
             }
+
+            lock (_joyConsIds)
+            {
+                foreach (var gamepad in _joyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
+            }
+            
+            lock (_linkedJoyConsIds)
+            {
+                foreach (var gamepad in _linkedJoyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
+            }
         }
     }
 }

src/Ryujinx.Input.SDL3/SDL3JoyCon.cs

@@ -24,10 +24,10 @@ namespace Ryujinx.Input.SDL3
         private readonly Dictionary<GamepadButtonInputId, SDL_GamepadButton> _leftButtonsDriverMapping = new()
         {
              {GamepadButtonInputId.LeftStick, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_STICK},
-             {GamepadButtonInputId.DpadUp, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
-             {GamepadButtonInputId.DpadDown, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
-             {GamepadButtonInputId.DpadLeft, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
-             {GamepadButtonInputId.DpadRight, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
+             {GamepadButtonInputId.DpadUp, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
+             {GamepadButtonInputId.DpadDown, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
+             {GamepadButtonInputId.DpadLeft, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
+             {GamepadButtonInputId.DpadRight, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
              {GamepadButtonInputId.Minus, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_START},
              {GamepadButtonInputId.LeftShoulder, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_PADDLE1},
              {GamepadButtonInputId.LeftTrigger, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_PADDLE2},
@@ -37,10 +37,10 @@ namespace Ryujinx.Input.SDL3
         private readonly Dictionary<GamepadButtonInputId, SDL_GamepadButton> _rightButtonsDriverMapping = new()
         {
              {GamepadButtonInputId.RightStick, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_STICK},
-             {GamepadButtonInputId.A, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
-             {GamepadButtonInputId.B, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
-             {GamepadButtonInputId.X, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
-             {GamepadButtonInputId.Y, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
+             {GamepadButtonInputId.A, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
+             {GamepadButtonInputId.B, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
+             {GamepadButtonInputId.X, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
+             {GamepadButtonInputId.Y, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
              {GamepadButtonInputId.Plus, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_START},
              {GamepadButtonInputId.RightShoulder, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1},
              {GamepadButtonInputId.RightTrigger, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2},
@@ -398,5 +398,15 @@ namespace Ryujinx.Input.SDL3
 
             return SDL_GetGamepadButton(_gamepadHandle, button);
         }
+        
+        public static bool IsJoyCon(SDL_JoystickID gamepadsId)
+        {
+            return SDL_GetGamepadNameForID(gamepadsId) is LeftName or RightName;
+        }
+        
+        public static bool IsLeftJoyCon(SDL_JoystickID gamepadsId)
+        {
+            return SDL_GetGamepadNameForID(gamepadsId) is LeftName;
+        }
     }
 }

src/Ryujinx.Input.SDL3/SDL3JoyConPair.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Input.SDL3
         public const string Id = "JoyConPair";
         string IGamepad.Id => Id;
 
-        public string Name => "* Nintendo Switch Joy-Con (L/R)";
+        public string Name => "Nintendo Switch Dual Joy-Con (L/R)";
         public bool IsConnected => left is { IsConnected: true } && right is { IsConnected: true };
 
         public void Dispose()
@@ -96,44 +96,23 @@ namespace Ryujinx.Input.SDL3
             right.SetTriggerThreshold(triggerThreshold);
         }
 
-        public static bool IsCombinable(Dictionary<SDL_JoystickID, string> gamepadsIds)
+        public static bool IsCombinable(SDL_JoystickID joyCon1, Dictionary<SDL_JoystickID, string> joyConIds, out SDL_JoystickID match)
         {
-            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
-            return leftIndex >= 0 && rightIndex >= 0;
-        }
+            bool isLeft = SDL3JoyCon.IsLeftJoyCon(joyCon1);
+            string matchName = isLeft ? SDL3JoyCon.RightName : SDL3JoyCon.LeftName;
+            match = 0;
 
-        private static (int leftIndex, int rightIndex) DetectJoyConPair(Dictionary<SDL_JoystickID, string> gamepadsIds)
-        {
-            Dictionary<string, SDL_JoystickID> gamepadNames = gamepadsIds
-                .Where(gamepadId => gamepadId.Value != Id && SDL_GetGamepadNameForID(gamepadId.Key) is SDL3JoyCon.LeftName or SDL3JoyCon.RightName)
-                .Select(gamepad => (SDL_GetGamepadNameForID(gamepad.Key), gamepad.Key))
-                .ToDictionary();
-            SDL_JoystickID idx;
-            int leftIndex = gamepadNames.TryGetValue(SDL3JoyCon.LeftName, out idx) ? (int)idx : -1;
-            int rightIndex = gamepadNames.TryGetValue(SDL3JoyCon.RightName, out idx) ? (int)idx : -1;
-
-            return (leftIndex, rightIndex);
-        }
-
-        public unsafe static IGamepad GetGamepad(Dictionary<SDL_JoystickID, string> gamepadsIds)
-        {
-            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
-
-            if (leftIndex <= 0 || rightIndex <= 0)
+            foreach (var joyConId in joyConIds.Keys)
             {
-                return null;
+                if (SDL_GetGamepadNameForID(joyConId) == matchName)
+                {
+                    match = joyConId;
+                    
+                    return true;
+                }
             }
-
-            SDL_Gamepad* leftGamepadHandle = SDL_OpenGamepad((SDL_JoystickID)leftIndex);
-            SDL_Gamepad* rightGamepadHandle = SDL_OpenGamepad((SDL_JoystickID)rightIndex);
-
-            if (leftGamepadHandle == null || rightGamepadHandle == null)
-            {
-                return null;
-            }
-
-            return new SDL3JoyConPair(new SDL3JoyCon(leftGamepadHandle, gamepadsIds[(SDL_JoystickID)leftIndex]),
-                new SDL3JoyCon(rightGamepadHandle, gamepadsIds[(SDL_JoystickID)rightIndex]));
+            
+            return false;
         }
     }
 }

src/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs

@@ -159,7 +159,7 @@ namespace Ryujinx.Memory.WindowsShared
         {
             SplitForMap((ulong)location, (ulong)size, srcOffset);
 
-            IntPtr ptr = WindowsApi.MapViewOfFile3(
+            nint ptr = WindowsApi.MapViewOfFile3(
                 sharedMemory,
                 WindowsApi.CurrentProcessHandle,
                 location,

src/Ryujinx.Tests/Memory/PartialUnmaps.cs

@@ -227,7 +227,7 @@ namespace Ryujinx.Tests.Memory
 
             // Create some info to be used for managing the native writing loop.
             int stateSize = Unsafe.SizeOf<NativeWriteLoopState>();
-            IntPtr statePtr = Marshal.AllocHGlobal(stateSize);
+            nint statePtr = Marshal.AllocHGlobal(stateSize);
             Unsafe.InitBlockUnaligned((void*)statePtr, 0, (uint)stateSize);
 
             ref NativeWriteLoopState writeLoopState = ref Unsafe.AsRef<NativeWriteLoopState>((void*)statePtr);

src/Ryujinx.UI.LocaleGenerator/LocaleGenerator.cs

@@ -1,5 +1,7 @@
 using Microsoft.CodeAnalysis;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 using System.Text;
 
@@ -10,23 +12,34 @@ namespace Ryujinx.UI.LocaleGenerator
     {
         public void Initialize(IncrementalGeneratorInitializationContext context)
         {
-            IncrementalValuesProvider<AdditionalText> localeFile = context.AdditionalTextsProvider.Where(static x => x.Path.EndsWith("locales.json"));
+            IncrementalValuesProvider<AdditionalText> localeFiles = context.AdditionalTextsProvider.Where(static x => Path.GetDirectoryName(x.Path)?.Replace('\\', '/').EndsWith("assets/Locales") ?? false);
 
-            IncrementalValuesProvider<string> contents = localeFile.Select((text, cancellationToken) => text.GetText(cancellationToken)!.ToString());
+            IncrementalValueProvider<ImmutableArray<(string, string)>> collectedContents = localeFiles.Select((text, cancellationToken) => (text.GetText(cancellationToken)!.ToString(), Path.GetFileName(text.Path))).Collect();
 
-            context.RegisterSourceOutput(contents, (spc, content) =>
+            context.RegisterSourceOutput(collectedContents, (spc, contents) =>
             {
-                IEnumerable<string> lines = content.Split('\n').Where(x => x.Trim().StartsWith("\"ID\":")).Select(x => x.Split(':')[1].Trim().Replace("\"", string.Empty).Replace(",", string.Empty));
-
                 StringBuilder enumSourceBuilder = new();
                 enumSourceBuilder.AppendLine("namespace Ryujinx.Ava.Common.Locale;");
                 enumSourceBuilder.AppendLine("public enum LocaleKeys");
                 enumSourceBuilder.AppendLine("{");
-                foreach (string? line in lines)
+                
+                foreach ((string, string) content in contents)
                 {
-                    enumSourceBuilder.AppendLine($"    {line},");
+                    IEnumerable<string> lines = content.Item1.Split('\n').Where(x => x.Trim().StartsWith("\"ID\":")).Select(x => x.Split(':')[1].Trim().Replace("\"", string.Empty).Replace(",", string.Empty));
+                    
+                    foreach (string? line in lines)
+                    {
+                        if (content.Item2 == "Root.json")
+                        {
+                            enumSourceBuilder.AppendLine($"    {line},");
+                        }
+                        else
+                        {
+                            enumSourceBuilder.AppendLine($"    {content.Item2.Split('.')[0]}_{line},");
+                        }
+                    }
                 }
-
+                
                 enumSourceBuilder.AppendLine("}");
 
                 spc.AddSource("LocaleKeys", enumSourceBuilder.ToString());

src/Ryujinx/Common/ApplicationHelper.cs

@@ -18,6 +18,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -410,6 +411,8 @@ namespace Ryujinx.Ava.Common
 
         public static async Task ExtractAoc(IStorageProvider storageProvider, string updateFilePath, string updateName)
         {
+            OsUtils.SetCoreDumpable(true);
+
             Gommon.Optional<IStorageFolder> result = await storageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle]
@@ -419,10 +422,17 @@ namespace Ryujinx.Ava.Common
                 return;
 
             ExtractAoc(result.Value.Path.LocalPath, updateFilePath, updateName);
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public static async Task ExtractSection(IStorageProvider storageProvider, NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
         {
+            OsUtils.SetCoreDumpable(true);
+
             Gommon.Optional<IStorageFolder> result = await storageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle]
@@ -432,6 +442,11 @@ namespace Ryujinx.Ava.Common
                 return;
 
             ExtractSection(result.Value.Path.LocalPath, ncaSectionType, titleFilePath, titleName, programIndex);
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public static (Result? result, bool canceled) CopyDirectory(FileSystemClient fs, string sourcePath, string destPath, CancellationToken token)

src/Ryujinx/Common/LocaleManager.cs

@@ -8,6 +8,8 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
+using System.Linq;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Common.Locale
@@ -158,52 +160,86 @@ namespace Ryujinx.Ava.Common.Locale
             LocaleChanged?.Invoke();
         }
 
-        private static LocalesJson? _localeData;
+        private static LocalesData? _localeData;
 
         private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
         {
             Dictionary<LocaleKeys, string> localeStrings = new();
 
-            _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/Locale.json")
-                .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
-
-            foreach (LocalesEntry locale in _localeData.Value.Locales)
+            if (_localeData is null)
             {
-                if (locale.Translations.Count < _localeData.Value.Languages.Count)
+                Dictionary<string, LocalesJson> locales = [];
+
+                foreach (string uri in EmbeddedResources.GetAllAvailableResources("Ryujinx/Assets/Locales", ".json"))
                 {
-                    throw new Exception(
-                        $"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
+                    string path = uri[..^".json".Length];
+                    path = path.Replace('.', '/');
+                    path = path.Append(".json");
+                    
+                    locales.TryAdd(Path.GetFileName(path), EmbeddedResources.ReadAllText(path)
+                            .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson)));
                 }
-
-                if (locale.Translations.Count > _localeData.Value.Languages.Count)
+                
+                _localeData = new LocalesData
                 {
-                    throw new Exception(
-                        $"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
-                }
+                    Languages = EmbeddedResources.ReadAllText("Ryujinx/Assets/Languages.json")
+                        .Into(it => JsonHelper.Deserialize(it, LanguagesJsonContext.Default.LanguagesJson)).Languages.Keys.ToList(),
+                    LocalesFiles = locales
+                };
+                
 
-                if (!Enum.TryParse<LocaleKeys>(locale.ID, out LocaleKeys localeKey))
-                    continue;
+            }
 
-                string str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
-                    ? val
-                    : locale.Translations[DefaultLanguageCode];
-
-                if (string.IsNullOrEmpty(str))
+            foreach ((string fileName, LocalesJson file) in _localeData.Value.LocalesFiles)
+            {
+                foreach (LocalesEntry locale in file.Locales)
                 {
-                    throw new Exception(
-                        $"Locale key '{locale.ID}' has no valid translations for desired language {languageCode}! {DefaultLanguageCode} is an empty string or null");
-                }
+                    if (locale.Translations.Count < _localeData.Value.Languages.Count)
+                    {
+                        throw new Exception(
+                            $"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
+                    }
 
-                localeStrings[localeKey] = str;
+                    if (locale.Translations.Count > _localeData.Value.Languages.Count)
+                    {
+                        throw new Exception(
+                            $"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
+                    }
+
+                    if (!Enum.TryParse<LocaleKeys>(fileName == "Root.json" ? locale.ID : $"{fileName[..^".json".Length]}_{locale.ID}" , out LocaleKeys localeKey))
+                        continue;
+
+                    string str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
+                        ? val
+                        : locale.Translations[DefaultLanguageCode];
+
+                    if (string.IsNullOrEmpty(str))
+                    {
+                        throw new Exception(
+                            $"Locale key '{locale.ID}' has no valid translations for desired language {languageCode}! {DefaultLanguageCode} is an empty string or null");
+                    }
+
+                    localeStrings[localeKey] = str;
+                }
             }
 
             return localeStrings;
         }
     }
 
-    public struct LocalesJson
+    public struct LocalesData
     {
         public List<string> Languages { get; set; }
+        public Dictionary<string, LocalesJson> LocalesFiles { get; set; }
+    }
+
+    public struct LanguagesJson
+    {
+        public Dictionary<string, string> Languages { get; set; }
+    }
+
+    public struct LocalesJson
+    {
         public List<LocalesEntry> Locales { get; set; }
     }
 
@@ -216,4 +252,8 @@ namespace Ryujinx.Ava.Common.Locale
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(LocalesJson))]
     internal partial class LocalesJsonContext : JsonSerializerContext;
+    
+    [JsonSourceGenerationOptions(WriteIndented = true)]
+    [JsonSerializable(typeof(LanguagesJson))]
+    internal partial class LanguagesJsonContext : JsonSerializerContext;
 }

src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs

@@ -141,7 +141,7 @@ namespace Ryujinx.Ava.Input
             AvaKey.OemComma,
             AvaKey.OemPeriod,
             AvaKey.OemQuestion,
-            AvaKey.OemBackslash,
+            AvaKey.OemPipe,
 
             // NOTE: invalid
             AvaKey.None

src/Ryujinx/Program.cs

@@ -18,6 +18,7 @@ using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.Utilities;
+using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL3.Common;
@@ -41,6 +42,7 @@ namespace Ryujinx.Ava
         public static bool PreviewerDetached { get; private set; }
         public static bool UseHardwareAcceleration { get; private set; }
         public static string BackendThreadingArg { get; private set; }
+        public static bool CoreDumpArg { get; private set; }
 
         private const uint MbIconwarning = 0x30;
 
@@ -80,6 +82,8 @@ namespace Ryujinx.Ava
             bool noGuiArg = ConsumeCommandLineArgument(ref args, "--no-gui") || ConsumeCommandLineArgument(ref args, "nogui");
             bool coreDumpArg = ConsumeCommandLineArgument(ref args, "--core-dumps");
 
+            CoreDumpArg = coreDumpArg;
+
             // TODO: Ryujinx causes core dumps on Linux when it exits "uncleanly", eg. through an unhandled exception.
             //       This is undesirable and causes very odd behavior during development (the process stops responding, 
             //       the .NET debugger freezes or suddenly detaches, /tmp/ gets filled etc.), unless explicitly requested by the user.

src/Ryujinx/Ryujinx.csproj

@@ -77,16 +77,18 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
+    <ProjectReference Include="..\Ryujinx.Audio.Backends.Apple\Ryujinx.Audio.Backends.Apple.csproj" />
+    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
     <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
     <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
     <ProjectReference Include="..\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
@@ -134,7 +136,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Assets\locales.json" />
+    <None Remove="Assets\**\*.json" />
     <None Remove="Assets\Styles\Styles.xaml" />
     <None Remove="Assets\Styles\Themes.xaml" />
     <None Remove="Assets\Icons\Controller_JoyConLeft.svg" />
@@ -156,8 +158,8 @@
     <EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList">
       <Link>Assets\RyujinxGameCompatibility.csv</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\..\assets\locales.json">
-      <Link>Assets\Locale.json</Link>
+    <EmbeddedResource Include="..\..\assets\**\*.json">
+      <LinkBase>Assets</LinkBase>
     </EmbeddedResource>
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />
@@ -178,6 +180,6 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="..\..\assets\locales.json" />
+    <AdditionalFiles Include="..\..\assets\Locales\*.json" />
   </ItemGroup>
 </Project>

src/Ryujinx/Systems/AppHost.cs

@@ -6,6 +6,7 @@ using Avalonia.Threading;
 using DiscordRPC;
 using LibHac.Common;
 using LibHac.Ns;
+using Ryujinx.Audio.Backends.Apple;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL3;
@@ -949,6 +950,9 @@ namespace Ryujinx.Ava.Systems
                 AudioBackend.Dummy
             ];
 
+            if (OperatingSystem.IsMacOS())
+                availableBackends.Insert(0, AudioBackend.AudioToolbox);
+
             AudioBackend preferredBackend = ConfigurationState.Instance.System.AudioBackend.Value;
 
             if (preferredBackend is AudioBackend.SDL2)
@@ -985,6 +989,9 @@ namespace Ryujinx.Ava.Systems
 
                 deviceDriver = currentBackend switch
                 {
+#pragma warning disable CA1416 // Platform compatibility is enforced in AppleHardwareDeviceDriver.IsSupported, before any potentially platform-sensitive code can run.
+                    AudioBackend.AudioToolbox => InitializeAudioBackend<AppleHardwareDeviceDriver>(AudioBackend.AudioToolbox, nextBackend),
+#pragma warning restore CA1416
                     AudioBackend.SDL3 => InitializeAudioBackend<SDL3HardwareDeviceDriver>(AudioBackend.SDL3, nextBackend),
                     AudioBackend.SoundIo => InitializeAudioBackend<SoundIoHardwareDeviceDriver>(AudioBackend.SoundIo, nextBackend),
                     AudioBackend.OpenAl => InitializeAudioBackend<OpenALHardwareDeviceDriver>(AudioBackend.OpenAl, nextBackend),

src/Ryujinx/Systems/Configuration/AudioBackend.cs

@@ -1,15 +1,15 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Systems.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AudioBackend>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AudioBackend>))]
     public enum AudioBackend
     {
         Dummy,
         OpenAl,
         SoundIo,
         SDL3,
+        AudioToolbox,
         SDL2 = SDL3
     }
 }

src/Ryujinx/Systems/Configuration/System/Language.cs

@@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.SystemState;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Systems.Configuration.System
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Language>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Language>))]
     public enum Language
     {
         Japanese,

src/Ryujinx/Systems/Configuration/System/Region.cs

@@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.SystemState;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Systems.Configuration.System
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Region>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Region>))]
     public enum Region
     {
         Japan,

src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Systems.Configuration.UI
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<FocusLostType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<FocusLostType>))]
     public enum FocusLostType
     {
         DoNothing,

src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs

@@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Systems.Configuration.UI
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<UpdaterType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<UpdaterType>))]
     public enum UpdaterType
     {
         Off,

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -7,6 +7,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Systems.Update.Client;
 using Ryujinx.Systems.Update.Common;
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -46,6 +47,12 @@ namespace Ryujinx.Ava.Systems
                 return Return<VersionResponse>.Failure(
                     new MessageError("DNS resolution error occurred. Is your internet down?"));
             }
+            catch (HttpRequestException hre)
+                when (hre.StatusCode is HttpStatusCode.BadGateway)
+            {
+                return Return<VersionResponse>.Failure(
+                    new MessageError("Could not connect to the update server, but it appears like you have internet. It seems like the update server is offline, try again later."));
+            }
         }
 
         public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)

src/Ryujinx/UI/Renderer/EmbeddedWindow.cs

@@ -2,8 +2,12 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Platform;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
+using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.RenderDocApi;
+using Ryujinx.HLE;
 using SPB.Graphics;
 using SPB.Platform;
 using SPB.Platform.GLX;
@@ -30,6 +34,7 @@ namespace Ryujinx.Ava.UI.Renderer
         protected nint MetalLayer { get; set; }
 
         public delegate void UpdateBoundsCallbackDelegate(Rect rect);
+
         private UpdateBoundsCallbackDelegate _updateBoundsCallback;
 
         public event EventHandler<nint> WindowCreated;
@@ -46,6 +51,55 @@ namespace Ryujinx.Ava.UI.Renderer
 
         protected virtual void OnWindowDestroyed() { }
 
+        public bool ToggleRenderDocCapture(Switch device)
+        {
+            if (!RenderDoc.IsAvailable) return false;
+
+            if (RenderDoc.IsFrameCapturing)
+            {
+                if (EndRenderDocCapture())
+                {
+                    Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
+                    return true;
+                }
+            } 
+            else if (StartRenderDocCapture(device))
+            {
+                Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool StartRenderDocCapture(Switch device)
+        {
+            if (!RenderDoc.IsAvailable) return false;
+
+            if (RenderDoc.IsFrameCapturing) return false;
+
+            RenderDoc.StartFrameCapture(nint.Zero, WindowHandle);
+            RenderDoc.SetCaptureTitle(TitleHelper.FormatRenderDocCaptureTitle(device.Processes.ActiveApplication, Program.Version));
+
+            return true;
+        }
+
+        public bool EndRenderDocCapture()
+        {
+            if (!RenderDoc.IsAvailable) return false;
+            if (!RenderDoc.IsFrameCapturing) return false;
+
+            return RenderDoc.IsFrameCapturing && RenderDoc.EndFrameCapture(nint.Zero, WindowHandle);
+        }
+
+        public bool DiscardRenderDocCapture()
+        {
+            if (!RenderDoc.IsAvailable) return false;
+            if (!RenderDoc.IsFrameCapturing) return false;
+
+            return RenderDoc.IsFrameCapturing && RenderDoc.DiscardFrameCapture(nint.Zero, WindowHandle);
+        }
+
         protected virtual void OnWindowDestroying()
         {
             WindowHandle = nint.Zero;
@@ -124,7 +178,9 @@ namespace Ryujinx.Ava.UI.Renderer
             }
             else
             {
-                X11Window = PlatformHelper.CreateOpenGLWindow(new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100, 100) as GLXWindow;
+                X11Window = PlatformHelper.CreateOpenGLWindow(
+                    new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100,
+                    100) as GLXWindow;
             }
 
             WindowHandle = X11Window.WindowHandle.RawHandle;
@@ -138,7 +194,7 @@ namespace Ryujinx.Ava.UI.Renderer
         {
             _className = "NativeWindow-" + Guid.NewGuid();
 
-            _wndProcDelegate = delegate (nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
+            _wndProcDelegate = delegate(nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
             {
                 switch (msg)
                 {
@@ -161,7 +217,8 @@ namespace Ryujinx.Ava.UI.Renderer
 
             RegisterClassEx(ref wndClassEx);
 
-            WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480, control.Handle, nint.Zero, nint.Zero, nint.Zero);
+            WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480,
+                control.Handle, nint.Zero, nint.Zero, nint.Zero);
 
             SetWindowLongPtrW(control.Handle, GWLP_WNDPROC, wndClassEx.lpfnWndProc);
 

src/Ryujinx/UI/RyujinxApp.axaml.cs

@@ -15,6 +15,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.RenderDocApi;
 using System;
 using System.Diagnostics;
 
@@ -56,6 +57,8 @@ namespace Ryujinx.Ava
 
             if (OperatingSystem.IsMacOS())
             {
+                // Switches macOS key held behavior to repeat the input key instead of showing the character accents menu (like doing on an iOS keyboard would).
+                // https://macos-defaults.com/keyboard/applepressandholdenabled.html
                 Process.Start("/usr/bin/defaults", "write org.ryujinx.Ryujinx ApplePressAndHoldEnabled -bool false");
             }
         }

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -8,6 +8,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -128,6 +129,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async void Add()
         {
+            OsUtils.SetCoreDumpable(true);
+
             IReadOnlyList<IStorageFile> result = await _storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.SelectDlcDialogTitle],
@@ -158,6 +161,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 await ShowNewDlcAddedDialog(totalDlcAdded);
             }
+            
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         private bool AddDownloadableContent(string path, out int numDlcAdded)

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -184,7 +184,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     _controller = 0;
                 }
 
-                if (Controllers.Count > 0 && value < Controllers.Count && _controller > -1)
+                if (Controllers.Count > 0 && _controller < Controllers.Count && _controller > -1)
                 {
                     ControllerType controller = Controllers[_controller].Type;
 
@@ -467,7 +467,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             IsModified = true;
             RevertChanges();
             FindPairedDeviceInConfigFile();
-
+            
             _isChangeTrackingActive = true; // Enable configuration change tracking
 
         }
@@ -521,7 +521,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 if (Config != null && Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType) != -1)
                 {
-                    Controller = Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType);
+                    int controllerIndex = Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType);
+                    
+                    // Avalonia bug: setting a newly instanced ComboBox to 0
+                    // causes the selected item to show up blank
+                    // Workaround: set the box to 1 and then 0
+                    if (controllerIndex == 0)
+                    {
+                        Controller = 1;
+                    }
+
+                    Controller = controllerIndex;
                 }
                 else
                 {
@@ -576,7 +586,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 DeviceList.Clear();
                 Devices.Add((DeviceType.None, Disabled, LocaleManager.Instance[LocaleKeys.ControllerSettingsDeviceDisabled]));
 
-                int controllerNumber = 0;
+                
                 foreach (string id in _mainWindow.InputManager.KeyboardDriver.GamepadsIds)
                 {
                     using IGamepad gamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
@@ -593,6 +603,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                     if (gamepad != null)
                     {
+                        int controllerNumber = 0;
                         string name = GetUniqueGamepadName(gamepad, ref controllerNumber);
                         Devices.Add((DeviceType.Controller, id, name));
                     }
@@ -950,8 +961,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             LoadConfiguration(); // configuration preload is required if the paired gamepad was disconnected but was changed to another gamepad
             Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
 
-            LoadDevice();
+            _isLoaded = false;
             LoadConfiguration();
+            LoadDevice();
+            _isLoaded = true;
 
             OnPropertyChanged();
             IsModified = false;

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -38,6 +38,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.UI;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Cpu;
+using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -104,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] public partial Brush ProgressBarForegroundColor { get; set; }
 
         [ObservableProperty] public partial Brush ProgressBarBackgroundColor { get; set; }
-        
+
 #pragma warning disable MVVMTK0042 // Must stay a normal observable field declaration since this is used as an out parameter target
         [ObservableProperty] private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
 #pragma warning restore MVVMTK0042
@@ -129,8 +130,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         [ObservableProperty] public partial string LastScannedAmiiboId { get; set; }
 
-        [ObservableProperty]
-        public partial long LastFullscreenToggle { get; set; } = Environment.TickCount64;
+        [ObservableProperty] public partial long LastFullscreenToggle { get; set; } = Environment.TickCount64;
         [ObservableProperty] public partial bool ShowContent { get; set; } = true;
 
         [ObservableProperty] public partial float VolumeBeforeMute { get; set; }
@@ -1266,6 +1266,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         private async Task LoadContentFromFolder(LocaleKeys localeMessageAddedKey, LocaleKeys localeMessageRemovedKey,
             LoadContentFromFolderDelegate onDirsSelected, LocaleKeys dirSelectDialogTitle)
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IReadOnlyList<IStorageFolder>> result =
                 await StorageProvider.OpenMultiFolderPickerAsync(
                     new FolderPickerOpenOptions { Title = LocaleManager.Instance[dirSelectDialogTitle] });
@@ -1293,6 +1295,11 @@ namespace Ryujinx.Ava.UI.ViewModels
                         (int)Symbol.Checkmark);
                 });
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         #endregion
@@ -1355,6 +1362,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task InstallFirmwareFromFile()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
             {
                 FileTypeFilter = new List<FilePickerFileType>
@@ -1384,20 +1393,34 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 await HandleFirmwareInstallation(result.Value.Path.LocalPath);
             }
+            
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public async Task InstallFirmwareFromFolder()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFolder> result = await StorageProvider.OpenSingleFolderPickerAsync();
 
             if (result.HasValue)
             {
                 await HandleFirmwareInstallation(result.Value.Path.LocalPath);
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public async Task InstallKeysFromFile()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
             {
                 FileTypeFilter = new List<FilePickerFileType>
@@ -1415,16 +1438,28 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 await HandleKeysInstallation(result.Value.Path.LocalPath);
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public async Task InstallKeysFromFolder()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFolder> result = await StorageProvider.OpenSingleFolderPickerAsync();
 
             if (result.HasValue)
             {
                 await HandleKeysInstallation(result.Value.Path.LocalPath);
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public void OpenRyujinxFolder()
@@ -1528,6 +1563,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task OpenFile()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.LoadApplicationFromFileDialogTitle],
@@ -1599,6 +1636,11 @@ namespace Ryujinx.Ava.UI.ViewModels
                         LocaleManager.Instance[LocaleKeys.MenuBarFileOpenFromFileError]);
                 }
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public async Task LoadDlcFromFolder()
@@ -1621,6 +1663,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task OpenFolder()
         {
+            OsUtils.SetCoreDumpable(true);
+
             Optional<IStorageFolder> result = await StorageProvider.OpenSingleFolderPickerAsync(
                 new FolderPickerOpenOptions
                 {
@@ -1636,6 +1680,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                 await LoadApplication(applicationData);
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public static bool InitializeUserConfig(ApplicationData application)
@@ -1843,6 +1892,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task OpenBinFile()
         {
+            OsUtils.SetCoreDumpable(true);
+
             if (AppHost.Device.System.SearchingForAmiibo(out _) && IsGameRunning)
             {
                 Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(
@@ -1862,9 +1913,37 @@ namespace Ryujinx.Ava.UI.ViewModels
                 {
                     AppHost.Device.System.ScanAmiiboFromBin(result.Value.Path.LocalPath);
                 }
+
+                if (!Program.CoreDumpArg)
+                {
+                    OsUtils.SetCoreDumpable(false);
+                }
             }
         }
 
+        public void ReloadRenderDocApi()
+        {
+            RenderDoc.ReloadApi(ignoreAlreadyLoaded: true);
+
+            OnPropertiesChanged(nameof(ShowStartCaptureButton), nameof(ShowEndCaptureButton), nameof(RenderDocIsAvailable));
+
+            if (RenderDoc.IsAvailable)
+                RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+
+            NotificationHelper.ShowInformation(
+                "RenderDoc API reloaded",
+                RenderDoc.IsAvailable ? "RenderDoc is now available." : "RenderDoc is no longer available."
+            );
+        }
+
+        public void ToggleCapture()
+        {
+            if (ShowLoadProgress) return;
+
+            AppHost.RendererHost.EmbeddedWindow.ToggleRenderDocCapture(AppHost.Device);
+            RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+        }
+
         public void ToggleFullscreen()
         {
             if (Environment.TickCount64 - LastFullscreenToggle < HotKeyPressDelayMs)
@@ -1955,7 +2034,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (ConfigurationState.Instance.Debug.EnableGdbStub)
             {
                 NotificationHelper.ShowInformation(
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.NotificationLaunchCheckGdbStubTitle, ConfigurationState.Instance.Debug.GdbStubPort.Value),
+                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.NotificationLaunchCheckGdbStubTitle,
+                        ConfigurationState.Instance.Debug.GdbStubPort.Value),
                     LocaleManager.Instance[LocaleKeys.NotificationLaunchCheckGdbStubMessage]);
             }
 
@@ -1964,10 +2044,12 @@ namespace Ryujinx.Ava.UI.ViewModels
                 var memoryConfigurationLocaleKey = ConfigurationState.Instance.System.DramSize.Value switch
                 {
                     MemoryConfiguration.MemoryConfiguration4GiB or
-                    MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
-                    MemoryConfiguration.MemoryConfiguration4GiBSystemDev => LocaleKeys.SettingsTabSystemDramSize4GiB,
+                        MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
+                        MemoryConfiguration.MemoryConfiguration4GiBSystemDev =>
+                        LocaleKeys.SettingsTabSystemDramSize4GiB,
                     MemoryConfiguration.MemoryConfiguration6GiB or
-                    MemoryConfiguration.MemoryConfiguration6GiBAppletDev => LocaleKeys.SettingsTabSystemDramSize6GiB,
+                        MemoryConfiguration.MemoryConfiguration6GiBAppletDev =>
+                        LocaleKeys.SettingsTabSystemDramSize6GiB,
                     MemoryConfiguration.MemoryConfiguration8GiB => LocaleKeys.SettingsTabSystemDramSize8GiB,
                     MemoryConfiguration.MemoryConfiguration12GiB => LocaleKeys.SettingsTabSystemDramSize12GiB,
                     _ => LocaleKeys.SettingsTabSystemDramSize4GiB,
@@ -1975,9 +2057,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                 NotificationHelper.ShowWarning(
                     LocaleManager.Instance.UpdateAndGetDynamicValue(
-                        LocaleKeys.NotificationLaunchCheckDramSizeTitle, 
+                        LocaleKeys.NotificationLaunchCheckDramSizeTitle,
                         LocaleManager.Instance[memoryConfigurationLocaleKey]
-                        ),
+                    ),
                     LocaleManager.Instance[LocaleKeys.NotificationLaunchCheckDramSizeMessage]);
             }
         }
@@ -2462,6 +2544,67 @@ namespace Ryujinx.Ava.UI.ViewModels
                     png.SaveTo(fileStream);
                 });
 
+        public bool ShowStartCaptureButton => !RenderDocIsCapturing && RenderDoc.IsAvailable;
+        public bool ShowEndCaptureButton => RenderDocIsCapturing && RenderDoc.IsAvailable;
+        public static bool RenderDocIsAvailable => RenderDoc.IsAvailable;
+
+        public bool RenderDocIsCapturing
+        {
+            get;
+            set
+            {
+                field = value;
+                OnPropertyChanged();
+                OnPropertiesChanged(nameof(ShowStartCaptureButton), nameof(ShowEndCaptureButton));
+            }
+        }
+
+        public static RelayCommand<MainWindowViewModel> StartRenderDocCapture { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => RenderDoc.IsAvailable && !vm.ShowLoadProgress,
+                viewModel =>
+                {
+                    if (!RenderDoc.IsFrameCapturing)
+                    {
+                        if (viewModel.AppHost.RendererHost
+                            .EmbeddedWindow.StartRenderDocCapture(viewModel.AppHost.Device))
+                        {
+                            Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
+                        }
+                    }
+
+                    viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+                });
+
+        public static RelayCommand<MainWindowViewModel> EndRenderDocCapture { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => RenderDoc.IsAvailable && !vm.ShowLoadProgress,
+                viewModel =>
+                {
+                    if (RenderDoc.IsFrameCapturing)
+                    {
+                        if (viewModel.AppHost.RendererHost.EmbeddedWindow.EndRenderDocCapture())
+                        {
+                            Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
+                        }
+                    }
+
+                    viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+                });
+
+        public static RelayCommand<MainWindowViewModel> DiscardRenderDocCapture { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => RenderDoc.IsAvailable  && !vm.ShowLoadProgress,
+                viewModel =>
+                {
+                    if (RenderDoc.IsFrameCapturing)
+                    {
+                        if (viewModel.AppHost.RendererHost.EmbeddedWindow.DiscardRenderDocCapture())
+                        {
+                            Logger.Info?.Print(LogClass.Application, "Discarded RenderDoc capture.");
+                        }
+                    }
+
+                    viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+                });
+
         #endregion
     }
 }

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -288,6 +288,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async void Add()
         {
+            OsUtils.SetCoreDumpable(true);
+
             IReadOnlyList<IStorageFolder> result = await _storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.SelectModDialogTitle],
@@ -298,6 +300,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 AddMod(new DirectoryInfo(folder.Path.LocalPath));
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public void DeleteAll()

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -5,6 +5,7 @@ using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using LibHac.Tools.FsSystem;
+using Ryujinx.Audio.Backends.Apple;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL3;
 using Ryujinx.Audio.Backends.SoundIo;
@@ -277,6 +278,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool IsOpenAlEnabled { get; set; }
         public bool IsSoundIoEnabled { get; set; }
         public bool IsSDL3Enabled { get; set; }
+        public bool IsAudioToolboxEnabled { get; set; }
         public bool IsCustomResolutionScaleActive => _resolutionScale == 4;
         public bool IsScalingFilterActive => _scalingFilter == (int)Ryujinx.Common.Configuration.ScalingFilter.Fsr;
 
@@ -524,12 +526,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported;
             IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported;
             IsSDL3Enabled = SDL3HardwareDeviceDriver.IsSupported;
+            IsAudioToolboxEnabled = OperatingSystem.IsMacOS() && AppleHardwareDeviceDriver.IsSupported;
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 OnPropertyChanged(nameof(IsOpenAlEnabled));
                 OnPropertyChanged(nameof(IsSoundIoEnabled));
                 OnPropertyChanged(nameof(IsSDL3Enabled));
+                OnPropertyChanged(nameof(IsAudioToolboxEnabled));
             });
         }
 

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -7,6 +7,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -148,6 +149,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task Add()
         {
+            OsUtils.SetCoreDumpable(true);
+
             IReadOnlyList<IStorageFile> result = await _storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 AllowMultiple = true,
@@ -177,6 +180,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 await ShowNewUpdatesAddedDialog(totalUpdatesAdded);
             }
+            
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         public void Save()

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -8,6 +8,7 @@
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:common="clr-namespace:Ryujinx.Common;assembly=Ryujinx.Common"
+    xmlns:renderDocApi="clr-namespace:Ryujinx.Graphics.RenderDocApi;assembly=Ryujinx.Graphics.RenderDocApi"
     x:DataType="viewModels:MainWindowViewModel"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
     <Design.DataContext>
@@ -200,6 +201,29 @@
                     Header="{ext:Locale GameListContextMenuManageCheat}"
                     Icon="{ext:Icon fa-solid fa-code}"
                     IsEnabled="{Binding IsGameRunning}" />
+                <Separator IsVisible="{Binding RenderDocIsAvailable}" />
+                <MenuItem
+                    IsVisible="{Binding ShowStartCaptureButton}"
+                    Command="{Binding StartRenderDocCapture}"
+                    CommandParameter="{Binding}"
+                    Header="{ext:Locale RenderDoc_MenuBarActions_StartCapture}"
+                    Icon="{ext:Icon fa-solid fa-video}"
+                    IsEnabled="{Binding IsGameRunning}" />
+                <MenuItem
+                    IsVisible="{Binding ShowEndCaptureButton}"
+                    Command="{Binding EndRenderDocCapture}"
+                    CommandParameter="{Binding}"
+                    Header="{ext:Locale RenderDoc_MenuBarActions_EndCapture}"
+                    Icon="{ext:Icon fa-solid fa-video-slash}"
+                    IsEnabled="{Binding IsGameRunning}" />
+                <MenuItem
+                    IsVisible="{Binding ShowEndCaptureButton}"
+                    Command="{Binding DiscardRenderDocCapture}"
+                    CommandParameter="{Binding}"
+                    Header="{ext:Locale RenderDoc_MenuBarActions_DiscardCapture}"
+                    ToolTip.Tip="{ext:Locale RenderDoc_MenuBarActions_DiscardCapture_ToolTip}"
+                    Icon="{ext:Icon fa-solid fa-video-slash}"
+                    IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarActions}" IsVisible="{Binding EnableNonGameRunningControls}">
                 <MenuItem Header="{ext:Locale MenuBarActionsInstallKeys}" Icon="{ext:Icon fa-solid fa-key}">

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -85,37 +85,24 @@ namespace Ryujinx.Ava.UI.Views.Main
 
         private static IEnumerable<MenuItem> GenerateLanguageMenuItems()
         {
-            const string LocalePath = "Ryujinx/Assets/Locale.json";
+            const string LanguagesPath = "Ryujinx/Assets/Languages.json";
 
-            string languageJson = EmbeddedResources.ReadAllText(LocalePath);
+            string languageJson = EmbeddedResources.ReadAllText(LanguagesPath);
             string currentLanguageCode = LocaleManager.Instance.CurrentLanguageCode;
 
-            LocalesJson locales = JsonHelper.Deserialize(languageJson, LocalesJsonContext.Default.LocalesJson);
+            LanguagesJson languages = JsonHelper.Deserialize(languageJson, LanguagesJsonContext.Default.LanguagesJson);
 
-            foreach (string language in locales.Languages)
+            foreach ((string code, string language) in languages.Languages)
             {
-                int index = locales.Locales.FindIndex(x => x.ID == "Language");
-                string languageName;
-
-                if (index == -1)
-                {
-                    languageName = language;
-                }
-                else
-                {
-                    string tr = locales.Locales[index].Translations[language];
-                    languageName = string.IsNullOrEmpty(tr)
-                        ? language
-                        : tr;
-                }
+                string languageName = string.IsNullOrEmpty(language) ? code : language;
 
                 MenuItem menuItem = new()
                 {
                     Padding = new Thickness(15, 0, 0, 0),
                     Margin = new Thickness(3, 0, 3, 0),
                     HorizontalAlignment = HorizontalAlignment.Stretch,
-                    Header = language == currentLanguageCode ? $"{languageName}  ✔" : languageName,
-                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(language))
+                    Header = code == currentLanguageCode ? $"{languageName}  ✔" : languageName,
+                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(code))
                 };
 
                 yield return menuItem;

src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml

@@ -46,6 +46,9 @@
                         <ComboBoxItem
                             IsEnabled="{Binding IsSDL3Enabled}"
                             Content="{ext:Locale SettingsTabSystemAudioBackendSDL3}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsAudioToolboxEnabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendAudioToolbox}" />
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs

@@ -7,6 +7,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
+using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -27,6 +28,8 @@ namespace Ryujinx.Ava.UI.Views.Settings
 
         private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories)
         {
+            OsUtils.SetCoreDumpable(true);
+
             string path = addDirBox.Text;
 
             if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !directories.Contains(path))
@@ -48,6 +51,11 @@ namespace Ryujinx.Ava.UI.Views.Settings
                     ViewModel.GameListNeedsRefresh = true;
                 }
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         private void RemoveGameDirButton_OnClick(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs

@@ -8,6 +8,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.FileSystem;
 using SkiaSharp;
 using System.Collections.Generic;
@@ -62,6 +63,8 @@ namespace Ryujinx.Ava.UI.Views.User
 
         private async void Import_OnClick(object sender, RoutedEventArgs e)
         {
+            OsUtils.SetCoreDumpable(true);
+
             IReadOnlyList<IStorageFile> result = await ((Window)this.GetVisualRoot()!).StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 AllowMultiple = false,
@@ -81,6 +84,11 @@ namespace Ryujinx.Ava.UI.Views.User
                 _profile.Image = ProcessProfileImage(File.ReadAllBytes(result[0].Path.LocalPath));
                 _parent.GoBack();
             }
+
+            if (!Program.CoreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
         }
 
         private void GoBack(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -41,6 +41,8 @@
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
         <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
+        <KeyBinding Gesture="Ctrl+Shift+R" Command="{Binding ReloadRenderDocApi}" />
+        <KeyBinding Gesture="Ctrl+Shift+C" Command="{Binding ToggleCapture}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*">
         <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />

src/Ryujinx/Utilities/CommandLineState.cs

@@ -19,6 +19,9 @@ namespace Ryujinx.Ava.Utilities
         public static string OverrideSystemLanguage { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
+
+        public static string RenderDocCaptureTitleFormat { get; private set; } =
+            "{EmuVersion}\n{GuestName} {GuestVersion} {GuestTitleId} {GuestArch}";
         public static Optional<FilePath> FirmwareToInstallPathArg { get; set; }
         public static string Profile { get; private set; }
         public static string LaunchPathArg { get; private set; }
@@ -54,6 +57,20 @@ namespace Ryujinx.Ava.Utilities
 
                         BaseDirPathArg = args[++i];
 
+                        arguments.Add(arg);
+                        arguments.Add(args[i]);
+                        break;
+                    case "-rdct":
+                    case "--rd-capture-title-format":
+                        if (i + 1 >= args.Length)
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
+
+                            continue;
+                        }
+
+                        RenderDocCaptureTitleFormat = args[++i];
+
                         arguments.Add(arg);
                         arguments.Add(args[i]);
                         break;

src/Ryujinx/Utilities/TitleHelper.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.HLE.Loaders.Processes;
 
 namespace Ryujinx.Ava.Utilities
@@ -22,5 +23,23 @@ namespace Ryujinx.Ava.Utilities
                 ? appTitle + $" ({pauseString})"
                 : appTitle;
         }
+
+        public static string FormatRenderDocCaptureTitle(ProcessResult activeProcess, string applicationVersion)
+        {
+            if (activeProcess == null)
+                return string.Empty;
+
+            string titleNameSection = string.IsNullOrWhiteSpace(activeProcess.Name) ? string.Empty : activeProcess.Name;
+            string titleVersionSection = string.IsNullOrWhiteSpace(activeProcess.DisplayVersion) ? string.Empty : $"v{activeProcess.DisplayVersion}";
+            string titleIdSection = $"({activeProcess.ProgramIdText.ToUpper()})";
+            string titleArchSection = activeProcess.Is64Bit ? "(64-bit)" : "(32-bit)";
+
+            return CommandLineState.RenderDocCaptureTitleFormat
+                .ReplaceIgnoreCase("{EmuVersion}", applicationVersion)
+                .ReplaceIgnoreCase("{GuestName}", titleNameSection)
+                .ReplaceIgnoreCase("{GuestVersion}", titleVersionSection)
+                .ReplaceIgnoreCase("{GuestTitleId}", titleIdSection)
+                .ReplaceIgnoreCase("{GuestArch}", titleArchSection);
+        }
     }
 }