CPU: Add low-power PPTC load mode.

Specifically, this setting causes the translation load core count to get reduced by two-thirds, for lower-power but still fast loading, and for unstable CPUs.

.github/FUNDING.yml

@@ -1 +0,0 @@
-patreon: Ryujinx

.github/labeler.yml

@@ -20,7 +20,7 @@ gpu:
 
 gui:
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**', 'src/Ryujinx.Gtk3/**']
+  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']
 
 horizon:
 - changed-files:

.github/reviewers.yml

@@ -1,25 +1,17 @@
-
 cpu:
-  - gdkchan
-  - riperiperi
-  - LDj3SNuD
+  - GreemDev
 
 gpu:
-  - gdkchan
-  - riperiperi
+  - GreemDev
 
 gui:
-  - Ack77
-  - emmauss
-  - TSRBerry
+  - GreemDev
 
 horizon:
-  - gdkchan
-  - Ack77
-  - TSRBerry
+  - GreemDev
 
 infra:
-  - TSRBerry
+  - GreemDev
 
 default:
   - '@developers'

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
 env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.1.0"
+  RYUJINX_BASE_VERSION: "1.2.0"
 
 jobs:
   build:
@@ -67,15 +67,10 @@ jobs:
         run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
-      - name: Publish Ryujinx.Gtk3
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_gtk -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Gtk3 --self-contained true
-        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
-
       - name: Set executable bit
         run: |
           chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
           chmod +x ./publish_sdl2_headless/Ryujinx.Headless.SDL2 ./publish_sdl2_headless/Ryujinx.sh
-          chmod +x ./publish_gtk/Ryujinx.Gtk3 ./publish_gtk/Ryujinx.sh
         if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
 
       - name: Upload Ryujinx artifact
@@ -92,13 +87,6 @@ jobs:
           path: publish_sdl2_headless
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
-      - name: Upload Ryujinx.Gtk3 artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: gtk-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
-          path: publish_gtk
-        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
-
   build_macos:
     name: macOS Universal (${{ matrix.configuration }})
     runs-on: ubuntu-latest

.github/workflows/flatpak.yml

@@ -1,212 +0,0 @@
-name: Flatpak release job
-
-on:
-  workflow_call:
-    inputs:
-      ryujinx_version:
-        required: true
-        type: string
-
-
-concurrency: flatpak-release
-
-jobs:
-  release:
-    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
-    runs-on: ubuntu-latest
-
-    env:
-      NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
-      GIT_COMMITTER_NAME: "RyujinxBot"
-      GIT_COMMITTER_EMAIL: "61127645+RyujinxBot@users.noreply.github.com"
-      RYUJINX_PROJECT_FILE: "src/Ryujinx/Ryujinx.csproj"
-      NUGET_SOURCES_DESTDIR: "nuget-sources"
-      RYUJINX_VERSION: "${{ inputs.ryujinx_version }}"
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: Ryujinx
-
-      - uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: Ryujinx/global.json
-
-      - name: Get version info
-        id: version_info
-        working-directory: Ryujinx
-        run: |
-          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-      - uses: actions/checkout@v4
-        with:
-          repository: flathub/org.ryujinx.Ryujinx
-          token: ${{ secrets.RYUJINX_BOT_PAT }}
-          submodules: recursive
-          path: flathub
-
-      - name: Install dependencies
-        run: python -m pip install PyYAML lxml
-
-      - name: Restore Nuget packages
-        # With .NET 8.0.100, Microsoft.NET.ILLink.Tasks isn't restored by default and only seems to appears when publishing.
-        # So we just publish to grab the dependencies
-        run: |
-          dotnet publish -c Release -r linux-x64 Ryujinx/${{ env.RYUJINX_PROJECT_FILE }} --self-contained
-          dotnet publish -c Release -r linux-arm64 Ryujinx/${{ env.RYUJINX_PROJECT_FILE }} --self-contained
-
-      - name: Generate nuget_sources.json
-        shell: python
-        run: |
-          import hashlib
-          from pathlib import Path
-          import base64
-          import binascii
-          import json
-          import os
-          import urllib.request
-
-          sources = []
-
-
-          def create_source_from_external(name, version):
-              full_dir_path = Path(os.environ["NUGET_PACKAGES"]).joinpath(name).joinpath(version)
-              os.makedirs(full_dir_path, exist_ok=True)
-
-              filename = "{}.{}.nupkg".format(name, version)
-              url = "https://api.nuget.org/v3-flatcontainer/{}/{}/{}".format(
-                  name, version, filename
-              )
-
-              print(f"Processing {url}...")
-              response = urllib.request.urlopen(url)
-              sha512 = hashlib.sha512(response.read()).hexdigest()
-
-              return {
-                  "type": "file",
-                  "url": url,
-                  "sha512": sha512,
-                  "dest": os.environ["NUGET_SOURCES_DESTDIR"],
-                  "dest-filename": filename,
-              }
-
-
-          has_added_x64_apphost = False
-
-          for path in Path(os.environ["NUGET_PACKAGES"]).glob("**/*.nupkg.sha512"):
-              name = path.parent.parent.name
-              version = path.parent.name
-              filename = "{}.{}.nupkg".format(name, version)
-              url = "https://api.nuget.org/v3-flatcontainer/{}/{}/{}".format(
-                  name, version, filename
-              )
-
-              with path.open() as fp:
-                  sha512 = binascii.hexlify(base64.b64decode(fp.read())).decode("ascii")
-
-              sources.append(
-                  {
-                      "type": "file",
-                      "url": url,
-                      "sha512": sha512,
-                      "dest": os.environ["NUGET_SOURCES_DESTDIR"],
-                      "dest-filename": filename,
-                  }
-              )
-
-              # .NET will not add current installed application host to the list, force inject it here.
-              if not has_added_x64_apphost and name.startswith('microsoft.netcore.app.host'):
-                  sources.append(create_source_from_external("microsoft.netcore.app.host.linux-x64", version))
-                  has_added_x64_apphost = True
-
-          with open("flathub/nuget_sources.json", "w") as fp:
-              json.dump(sources, fp, indent=4)
-
-      - name: Update flatpak metadata
-        id: metadata
-        env:
-          RYUJINX_GIT_HASH: ${{ steps.version_info.outputs.git_hash }}
-        shell: python
-        run: |
-          import hashlib
-          import hmac
-          import json
-          import os
-          import yaml
-          from datetime import datetime
-          from lxml import etree
-          
-          
-          # Ensure we don't destroy multiline strings
-          def str_presenter(dumper, data):
-            if len(data.splitlines()) > 1:
-              return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
-            return dumper.represent_scalar("tag:yaml.org,2002:str", data)
-            
-            
-          yaml.representer.SafeRepresenter.add_representer(str, str_presenter)
-  
-          yaml_file = "flathub/org.ryujinx.Ryujinx.yml"
-          xml_file = "flathub/org.ryujinx.Ryujinx.appdata.xml"
-
-          with open(yaml_file, "r") as f:
-            data = yaml.safe_load(f)
-
-          for source in data["modules"][0]["sources"]:
-            if type(source) is str:
-              continue
-            if (
-              source["type"] == "git"
-              and source["url"] == "https://github.com/Ryujinx/Ryujinx.git"
-            ):
-              source["commit"] = os.environ['RYUJINX_GIT_HASH']
-
-          is_same_version = data["modules"][0]["build-options"]["env"]["RYUJINX_VERSION"] == os.environ['RYUJINX_VERSION']
-
-          with open(os.environ['GITHUB_OUTPUT'], "a") as gh_out:
-            if is_same_version:
-              gh_out.write(f"commit_message=Retry update to {os.environ['RYUJINX_VERSION']}")
-            else:
-              gh_out.write(f"commit_message=Update to {os.environ['RYUJINX_VERSION']}")
-
-          if not is_same_version:
-            data["modules"][0]["build-options"]["env"]["RYUJINX_VERSION"] = os.environ['RYUJINX_VERSION']
-
-            with open(yaml_file, "w") as f:
-                yaml.safe_dump(data, f, sort_keys=False)
-
-            parser = etree.XMLParser(remove_blank_text=True)
-            tree = etree.parse(xml_file, parser)
-
-            root = tree.getroot()
-
-            releases = root.find("releases")
-
-            element = etree.Element("release")
-            element.set("version", os.environ['RYUJINX_VERSION'])
-            element.set("date", datetime.now().date().isoformat())
-            releases.insert(0, element)
-
-            # Ensure 4 spaces
-            etree.indent(root, space="    ")
-
-            with open(xml_file, "wb") as f:
-              f.write(
-                etree.tostring(
-                  tree,
-                  pretty_print=True,
-                  encoding="UTF-8",
-                  doctype='<?xml version="1.0" encoding="UTF-8"?>',
-                )
-              )
-
-      - name: Push flatpak update
-        working-directory: flathub
-        env:
-          COMMIT_MESSAGE: ${{ steps.metadata.outputs.commit_message }}
-        run: |
-          git config user.name "${{ env.GIT_COMMITTER_NAME }}"
-          git config user.email "${{ env.GIT_COMMITTER_EMAIL }}"
-          git add .
-          git commit -m "$COMMIT_MESSAGE"
-          git push origin master

.github/workflows/mako.yml

@@ -1,41 +0,0 @@
-name: Mako
-on:
-  discussion:
-    types: [created, edited, answered, unanswered, category_changed]
-  discussion_comment:
-    types: [created, edited]
-  gollum:
-  issue_comment:
-    types: [created, edited]
-  issues:
-    types: [opened, edited, reopened, pinned, milestoned, demilestoned, assigned, unassigned, labeled, unlabeled]
-  pull_request_target:
-    types: [opened, edited, reopened, synchronize, ready_for_review, assigned, unassigned]
-
-jobs:
-  tasks:
-    name: Run Ryujinx tasks
-    permissions:
-      actions: read
-      contents: read
-      discussions: write
-      issues: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        if: github.event_name == 'pull_request_target'
-        with:
-          # Ensure we pin the source origin as pull_request_target run under forks.
-          fetch-depth: 0
-          repository: Ryujinx/Ryujinx
-          ref: master
-
-      - name: Run Mako command
-        uses: Ryujinx/Ryujinx-Mako@master
-        with:
-          command: exec-ryujinx-tasks
-          args: --event-name "${{ github.event_name }}" --event-path "${{ github.event_path }}" -w "${{ github.workspace }}" "${{ github.repository }}" "${{ github.run_id }}"
-          app_id: ${{ secrets.MAKO_APP_ID }}
-          private_key: ${{ secrets.MAKO_PRIVATE_KEY }}
-          installation_id: ${{ secrets.MAKO_INSTALLATION_ID }}

.github/workflows/nightly_pr_comment.yml

@@ -9,7 +9,6 @@ jobs:
   pr_comment:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
-    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
     steps:
       - uses: actions/github-script@v6
         with:
@@ -39,24 +38,19 @@ jobs:
               return core.error(`No artifacts found`);
             }
             let body = `Download the artifacts for this pull request:\n`;
-            let hidden_gtk_artifacts = `\n\n <details><summary>Old GUI (GTK3)</summary>\n`;
             let hidden_headless_artifacts = `\n\n <details><summary>GUI-less (SDL2)</summary>\n`;
             let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
             for (const art of artifacts) {
               if(art.name.includes('Debug')) {
                 hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-              } else if(art.name.includes('gtk-ryujinx')) {
-                hidden_gtk_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else if(art.name.includes('sdl2-ryujinx-headless')) {
                 hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else {
                 body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               }
             }
-            hidden_gtk_artifacts += `\n</details>`;
             hidden_headless_artifacts += `\n</details>`;
             hidden_debug_artifacts += `\n</details>`;
-            body += hidden_gtk_artifacts;
             body += hidden_headless_artifacts;
             body += hidden_debug_artifacts;
 

.github/workflows/pr_triage.yml

@@ -18,7 +18,7 @@ jobs:
         with:
            # Ensure we pin the source origin as pull_request_target run under forks.
            fetch-depth: 0
-           repository: Ryujinx/Ryujinx
+           repository: GreemDev/Ryujinx
            ref: master
 
       - name: Update labels based on changes

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
     branches: [ master ]
     paths-ignore:
       - '.github/**'
+      - 'docs/**'
       - '*.yml'
       - '*.json'
       - '*.config'
@@ -17,10 +18,10 @@ concurrency: release
 env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.1"
+  RYUJINX_BASE_VERSION: "1.2"
   RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "release-channel-master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
 
 jobs:
   tag:
@@ -49,7 +50,6 @@ jobs:
         with:
           name: ${{ steps.version_info.outputs.build_version }}
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "For more information about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
           omitBodyDuringUpdate: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -58,7 +58,6 @@ jobs:
   release:
     name: Release for ${{ matrix.platform.name }}
     runs-on: ${{ matrix.platform.os }}
-    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
     strategy:
       matrix:
         platform:
@@ -104,9 +103,7 @@ jobs:
         if: matrix.platform.os == 'windows-latest'
         run: |
           pushd publish_ava
-          cp publish/Ryujinx.exe publish/Ryujinx.Ava.exe
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
-          7z a ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
 
           pushd publish_sdl2_headless
@@ -118,10 +115,8 @@ jobs:
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
           pushd publish_ava
-          cp publish/Ryujinx publish/Ryujinx.Ava
-          chmod +x publish/Ryujinx.sh publish/Ryujinx.Ava publish/Ryujinx
+          chmod +x publish/Ryujinx.sh publish/Ryujinx
           tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
-          tar -czvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
 
           pushd publish_sdl2_headless
@@ -136,7 +131,6 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "release_output/*.tar.gz,release_output/*.zip"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "For more information about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
@@ -147,7 +141,6 @@ jobs:
   macos_release:
     name: Release MacOS universal
     runs-on: ubuntu-latest
-    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
     steps:
       - uses: actions/checkout@v4
 
@@ -202,17 +195,9 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "For more information about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
           token: ${{ secrets.RELEASE_TOKEN }}
-
-  flatpak_release:
-    uses: ./.github/workflows/flatpak.yml
-    needs: release
-    with:
-      ryujinx_version: "1.1.${{ github.run_number }}"
-    secrets: inherit

Directory.Packages.props

@@ -15,8 +15,7 @@
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="9.0.4" />
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
-    <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
-    <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
+    <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
@@ -34,11 +33,9 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview20" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-  <a href="https://ryujinx.org/"><img src="https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/distribution/misc/Logo.svg" alt="Ryujinx" width="150"></a>
+  <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/master/distribution/misc/Logo.svg" alt="Ryujinx" width="150"></a>
   <br>
   <b>Ryujinx</b>
   <br>
@@ -9,29 +9,34 @@
 </h1>
 
 <p align="center">
-  Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, written in C#.
+  Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
   This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
   It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on Github under the <a href="https://github.com/Ryujinx/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on Github under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
   <br />
 </p>
+<p align="center">
+  On October 1st 2024, Ryujinx was discontinued as the creator was forced to abandon the project.
+  This fork is intended to be a direct continuation for existing Ryujinx users.
+  Guides and documentation will not be provided at this time, though you can find the old ones on the Internet Archive.
+</p>
 
 <p align="center">
-    <a href="https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml">
-        <img src="https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml/badge.svg"
+    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml">
+        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg"
             alt="">
     </a>
     <a href="https://crwd.in/ryujinx">
         <img src="https://badges.crowdin.net/ryujinx/localized.svg"
             alt="">
     </a>
-    <a href="https://discord.com/invite/VkQYXAZ">
-        <img src="https://img.shields.io/discord/410208534861447168?color=5865F2&label=Ryujinx&logo=discord&logoColor=white"
+    <a href="https://discord.gg/dHPrkBkkyA">
+        <img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryujinx&logo=discord&logoColor=white"
             alt="Discord">
     </a>
     <br>
     <br>
-    <img src="https://raw.githubusercontent.com/Ryujinx/Ryujinx-Website/master/public/assets/images/shell.png">
+    <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/docs/shell.png">
 </p>
 
 ## Compatibility
@@ -39,8 +44,6 @@
 As of May 2024, Ryujinx has been tested on approximately 4,300 titles;
 over 4,100 boot past menus and into gameplay, with roughly 3,550 of those being considered playable.
 
-You can check out the compatibility list [here](https://github.com/Ryujinx/Ryujinx-Games-List/issues).
-
 Anyone is free to submit a new game test or update an existing game test entry;
 simply follow the new issue template and testing guidelines, or post as a reply to the applicable game issue.
 Use the search function to see if a game has been tested already!
@@ -50,22 +53,11 @@ Use the search function to see if a game has been tested already!
 To run this emulator, your PC must be equipped with at least 8GiB of RAM;
 failing to meet this requirement may result in a poor gameplay experience or unexpected crashes.
 
-See our [Setup & Configuration Guide](https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide) on how to set up the emulator.
-
-For our Local Wireless (LDN) builds, see our [Multiplayer: Local Play/Local Wireless Guide
-](https://github.com/Ryujinx/Ryujinx/wiki/Multiplayer-(LDN-Local-Wireless)-Guide).
-
-Avalonia UI comes with translations for various languages. See [Crowdin](https://crwd.in/ryujinx) for more information.
-
 ## Latest build
 
 These builds are compiled automatically for each commit on the master branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, our automated builds **may be unstable or completely broken**.
 
-If you want to see details on updates to the emulator, you can visit our [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog).
-
-The latest automatic build for Windows, macOS, and Linux can be found on the [Official Website](https://ryujinx.org/download).
-
 ## Documentation
 
 If you are planning to contribute or just want to learn more about this project please read through our [documentation](docs/README.md).
@@ -81,7 +73,7 @@ Make sure your SDK version is higher or equal to the required version specified
 
 ### Step 2
 
-Either use `git clone https://github.com/Ryujinx/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
+Either use `git clone https://github.com/GreemDev/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
 
 ### Step 3
 
@@ -135,27 +127,6 @@ This folder is located in the user folder, which can be accessed by clicking `Op
   The emulator has settings for enabling or disabling some logging, remapping controllers, and more.
   You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the user folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
 
-## Contact
-
-If you have contributions, suggestions, need emulator support or just want to get in touch with the team, join our [Discord server](https://discord.com/invite/Ryujinx).
-You may also review our [FAQ](https://github.com/Ryujinx/Ryujinx/wiki/Frequently-Asked-Questions).
-
-## Donations
-
-If you'd like to support the project financially, Ryujinx has an active Patreon campaign.
-
-<a href="https://www.patreon.com/ryujinx">
-    <img src="https://images.squarespace-cdn.com/content/v1/560c1d39e4b0b4fae0c9cf2a/1567548955044-WVD994WZP76EWF15T0L3/Patreon+Button.png?format=500w" width="150">
-</a>
-
-All developers working on the project do so in their free time, but the project has several expenses:
-* Hackable Nintendo Switch consoles to reverse-engineer the hardware
-* Additional computer hardware for testing purposes (e.g. GPUs to diagnose graphical bugs, etc.)
-* Licenses for various software development tools (e.g. Jetbrains, IDA)
-* Web hosting and infrastructure maintenance (e.g. LDN servers)
-
-All funds received through Patreon are considered a donation to support the project. Patrons receive early access to progress reports and exclusive access to developer interviews.
-
 ## License
 
 This software is licensed under the terms of the [MIT license](LICENSE.txt).

Ryujinx.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Gtk3", "src\Ryujinx.Gtk3\Ryujinx.Gtk3.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Unicorn", "src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj", "{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}"
@@ -88,10 +86,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -99,10 +93,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -259,10 +249,6 @@ Global
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

distribution/macos/create_macos_build_ava.sh

@@ -109,12 +109,6 @@ python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "
 gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
 rm "$RELEASE_TAR_FILE_NAME"
 
-# Create legacy update package for Avalonia to not left behind old testers.
-if [ "$VERSION" != "1.1.0" ];
-then
-    cp $RELEASE_TAR_FILE_NAME.gz test-ava-ryujinx-$VERSION-macos_universal.app.tar.gz
-fi
-
 popd
 
 echo "Done"

src/ARMeilleure/Optimizations.cs

@@ -5,6 +5,9 @@ namespace ARMeilleure
 
     public static class Optimizations
     {
+        // low-core count PPTC
+        public static bool EcoFriendly { get; set; } = false;
+
         public static bool FastFP { get; set; } = true;
 
         public static bool AllowLcqInFunctionTable { get; set; } = true;

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -309,7 +309,7 @@ namespace ARMeilleure.Translation.PTC
                     ReadOnlySpan<byte> infosBytes = new(stream.PositionPointer, innerHeader.InfosLength);
                     stream.Seek(innerHeader.InfosLength, SeekOrigin.Current);
 
-                    Hash128 infosHash = XXHash128.ComputeHash(infosBytes);
+                    Hash128 infosHash = Hash128.ComputeHash(infosBytes);
 
                     if (innerHeader.InfosHash != infosHash)
                     {
@@ -321,7 +321,7 @@ namespace ARMeilleure.Translation.PTC
                     ReadOnlySpan<byte> codesBytes = (int)innerHeader.CodesLength > 0 ? new(stream.PositionPointer, (int)innerHeader.CodesLength) : ReadOnlySpan<byte>.Empty;
                     stream.Seek(innerHeader.CodesLength, SeekOrigin.Current);
 
-                    Hash128 codesHash = XXHash128.ComputeHash(codesBytes);
+                    Hash128 codesHash = Hash128.ComputeHash(codesBytes);
 
                     if (innerHeader.CodesHash != codesHash)
                     {
@@ -333,7 +333,7 @@ namespace ARMeilleure.Translation.PTC
                     ReadOnlySpan<byte> relocsBytes = new(stream.PositionPointer, innerHeader.RelocsLength);
                     stream.Seek(innerHeader.RelocsLength, SeekOrigin.Current);
 
-                    Hash128 relocsHash = XXHash128.ComputeHash(relocsBytes);
+                    Hash128 relocsHash = Hash128.ComputeHash(relocsBytes);
 
                     if (innerHeader.RelocsHash != relocsHash)
                     {
@@ -345,7 +345,7 @@ namespace ARMeilleure.Translation.PTC
                     ReadOnlySpan<byte> unwindInfosBytes = new(stream.PositionPointer, innerHeader.UnwindInfosLength);
                     stream.Seek(innerHeader.UnwindInfosLength, SeekOrigin.Current);
 
-                    Hash128 unwindInfosHash = XXHash128.ComputeHash(unwindInfosBytes);
+                    Hash128 unwindInfosHash = Hash128.ComputeHash(unwindInfosBytes);
 
                     if (innerHeader.UnwindInfosHash != unwindInfosHash)
                     {
@@ -478,10 +478,10 @@ namespace ARMeilleure.Translation.PTC
 
                 Debug.Assert(stream.Position == stream.Length);
 
-                innerHeader.InfosHash = XXHash128.ComputeHash(infosBytes);
-                innerHeader.CodesHash = XXHash128.ComputeHash(codesBytes);
-                innerHeader.RelocsHash = XXHash128.ComputeHash(relocsBytes);
-                innerHeader.UnwindInfosHash = XXHash128.ComputeHash(unwindInfosBytes);
+                innerHeader.InfosHash = Hash128.ComputeHash(infosBytes);
+                innerHeader.CodesHash = Hash128.ComputeHash(codesBytes);
+                innerHeader.RelocsHash = Hash128.ComputeHash(relocsBytes);
+                innerHeader.UnwindInfosHash = Hash128.ComputeHash(unwindInfosBytes);
 
                 innerHeader.SetHeaderHash();
 
@@ -795,10 +795,15 @@ namespace ARMeilleure.Translation.PTC
                 return;
             }
 
+
+
             int degreeOfParallelism = Environment.ProcessorCount;
 
+            if (Optimizations.EcoFriendly)
+                degreeOfParallelism /= 3;
+
             // If there are enough cores lying around, we leave one alone for other tasks.
-            if (degreeOfParallelism > 4)
+            if (degreeOfParallelism > 4 && !Optimizations.EcoFriendly)
             {
                 degreeOfParallelism--;
             }
@@ -907,7 +912,7 @@ namespace ARMeilleure.Translation.PTC
 
         public static Hash128 ComputeHash(IMemoryManager memory, ulong address, ulong guestSize)
         {
-            return XXHash128.ComputeHash(memory.GetSpan(address, checked((int)(guestSize))));
+            return Hash128.ComputeHash(memory.GetSpan(address, checked((int)(guestSize))));
         }
 
         public void WriteCompiledFunction(ulong address, ulong guestSize, Hash128 hash, bool highCq, CompiledFunction compiledFunc)
@@ -1036,14 +1041,14 @@ namespace ARMeilleure.Translation.PTC
             {
                 Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                HeaderHash = XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]);
+                HeaderHash = Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]);
             }
 
             public bool IsHeaderValid()
             {
                 Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                return XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
+                return Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
             }
         }
 
@@ -1071,14 +1076,14 @@ namespace ARMeilleure.Translation.PTC
             {
                 Span<InnerHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                HeaderHash = XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<InnerHeader>() - Unsafe.SizeOf<Hash128>())]);
+                HeaderHash = Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<InnerHeader>() - Unsafe.SizeOf<Hash128>())]);
             }
 
             public bool IsHeaderValid()
             {
                 Span<InnerHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                return XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<InnerHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
+                return Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<InnerHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
             }
         }
 

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -209,7 +209,7 @@ namespace ARMeilleure.Translation.PTC
 
                 Hash128 expectedHash = DeserializeStructure<Hash128>(stream);
 
-                Hash128 actualHash = XXHash128.ComputeHash(GetReadOnlySpan(stream));
+                Hash128 actualHash = Hash128.ComputeHash(GetReadOnlySpan(stream));
 
                 if (actualHash != expectedHash)
                 {
@@ -313,7 +313,7 @@ namespace ARMeilleure.Translation.PTC
                 Debug.Assert(stream.Position == stream.Length);
 
                 stream.Seek(Unsafe.SizeOf<Hash128>(), SeekOrigin.Begin);
-                Hash128 hash = XXHash128.ComputeHash(GetReadOnlySpan(stream));
+                Hash128 hash = Hash128.ComputeHash(GetReadOnlySpan(stream));
 
                 stream.Seek(0L, SeekOrigin.Begin);
                 SerializeStructure(stream, hash);
@@ -374,14 +374,14 @@ namespace ARMeilleure.Translation.PTC
             {
                 Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                HeaderHash = XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]);
+                HeaderHash = Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]);
             }
 
             public bool IsHeaderValid()
             {
                 Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
 
-                return XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
+                return Hash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader)[..(Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())]) == HeaderHash;
             }
         }
 

src/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs

@@ -1,9 +1,11 @@
 using Ryujinx.Audio.Renderer.Dsp.Effect;
 using Ryujinx.Audio.Renderer.Dsp.State;
+using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Parameter.Effect;
 using Ryujinx.Audio.Renderer.Server.Effect;
 using System;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
 {
@@ -21,18 +23,20 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public CompressorParameter Parameter => _parameter;
         public Memory<CompressorState> State { get; }
+        public Memory<EffectResultState> ResultState { get; }
         public ushort[] OutputBufferIndices { get; }
         public ushort[] InputBufferIndices { get; }
         public bool IsEffectEnabled { get; }
 
         private CompressorParameter _parameter;
 
-        public CompressorCommand(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, bool isEnabled, int nodeId)
+        public CompressorCommand(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, Memory<EffectResultState> resultState, bool isEnabled, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;
             _parameter = parameter;
             State = state;
+            ResultState = resultState;
 
             IsEffectEnabled = isEnabled;
 
@@ -71,9 +75,16 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled && _parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<float> channelInput = stackalloc float[Parameter.ChannelCount];
+                if (!ResultState.IsEmpty && _parameter.StatisticsReset)
+                {
+                    ref CompressorStatistics statistics = ref MemoryMarshal.Cast<byte, CompressorStatistics>(ResultState.Span[0].SpecificData)[0];
+
+                    statistics.Reset(_parameter.ChannelCount);
+                }
+
+                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<float> channelInput = stackalloc float[_parameter.ChannelCount];
                 ExponentialMovingAverage inputMovingAverage = state.InputMovingAverage;
                 float unknown4 = state.Unknown4;
                 ExponentialMovingAverage compressionGainAverage = state.CompressionGainAverage;
@@ -92,7 +103,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                         channelInput[channelIndex] = *((float*)inputBuffers[channelIndex] + sampleIndex);
                     }
 
-                    float newMean = inputMovingAverage.Update(FloatingPointHelper.MeanSquare(channelInput), _parameter.InputGain);
+                    float mean = FloatingPointHelper.MeanSquare(channelInput);
+                    float newMean = inputMovingAverage.Update(mean, _parameter.InputGain);
                     float y = FloatingPointHelper.Log10(newMean) * 10.0f;
                     float z = 1.0f;
 
@@ -111,7 +123,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
                         if (y >= state.Unknown14)
                         {
-                            tmpGain = ((1.0f / Parameter.Ratio) - 1.0f) * (y - Parameter.Threshold);
+                            tmpGain = ((1.0f / _parameter.Ratio) - 1.0f) * (y - _parameter.Threshold);
                         }
                         else
                         {
@@ -126,7 +138,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
                     if ((unknown4 - z) <= 0.08f)
                     {
-                        compressionEmaAlpha = Parameter.ReleaseCoefficient;
+                        compressionEmaAlpha = _parameter.ReleaseCoefficient;
 
                         if ((unknown4 - z) >= -0.08f)
                         {
@@ -140,18 +152,31 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                     }
                     else
                     {
-                        compressionEmaAlpha = Parameter.AttackCoefficient;
+                        compressionEmaAlpha = _parameter.AttackCoefficient;
                     }
 
                     float compressionGain = compressionGainAverage.Update(z, compressionEmaAlpha);
 
-                    for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
+                    for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
                     {
                         *((float*)outputBuffers[channelIndex] + sampleIndex) = channelInput[channelIndex] * compressionGain * state.OutputGain;
                     }
 
                     unknown4 = unknown4New;
                     previousCompressionEmaAlpha = compressionEmaAlpha;
+
+                    if (!ResultState.IsEmpty)
+                    {
+                        ref CompressorStatistics statistics = ref MemoryMarshal.Cast<byte, CompressorStatistics>(ResultState.Span[0].SpecificData)[0];
+
+                        statistics.MinimumGain = MathF.Min(statistics.MinimumGain, compressionGain * state.OutputGain);
+                        statistics.MaximumMean = MathF.Max(statistics.MaximumMean, mean);
+
+                        for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
+                        {
+                            statistics.LastSamples[channelIndex] = MathF.Abs(channelInput[channelIndex] * (1f / 32768f));
+                        }
+                    }
                 }
 
                 state.InputMovingAverage = inputMovingAverage;
@@ -161,7 +186,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             }
             else
             {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
+                for (int i = 0; i < _parameter.ChannelCount; i++)
                 {
                     if (InputBufferIndices[i] != OutputBufferIndices[i])
                     {

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs

@@ -38,10 +38,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            for (int i = 0; i < Parameter.ChannelCount; i++)
+            for (int i = 0; i < _parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
             }
         }
 
@@ -51,11 +51,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled)
             {
-                if (Parameter.Status == UsageState.Invalid)
+                if (_parameter.Status == UsageState.Invalid)
                 {
                     state = new LimiterState(ref _parameter, WorkBuffer);
                 }
-                else if (Parameter.Status == UsageState.New)
+                else if (_parameter.Status == UsageState.New)
                 {
                     LimiterState.UpdateParameter(ref _parameter);
                 }
@@ -66,56 +66,56 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         private unsafe void ProcessLimiter(CommandList context, ref LimiterState state)
         {
-            Debug.Assert(Parameter.IsChannelCountValid());
+            Debug.Assert(_parameter.IsChannelCountValid());
 
-            if (IsEffectEnabled && Parameter.IsChannelCountValid())
+            if (IsEffectEnabled && _parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
+                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
 
-                for (int i = 0; i < Parameter.ChannelCount; i++)
+                for (int i = 0; i < _parameter.ChannelCount; i++)
                 {
                     inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
                     outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
                 }
 
-                for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
+                for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
                 {
                     for (int sampleIndex = 0; sampleIndex < context.SampleCount; sampleIndex++)
                     {
                         float rawInputSample = *((float*)inputBuffers[channelIndex] + sampleIndex);
 
-                        float inputSample = (rawInputSample / short.MaxValue) * Parameter.InputGain;
+                        float inputSample = (rawInputSample / short.MaxValue) * _parameter.InputGain;
 
                         float sampleInputMax = Math.Abs(inputSample);
 
-                        float inputCoefficient = Parameter.ReleaseCoefficient;
+                        float inputCoefficient = _parameter.ReleaseCoefficient;
 
                         if (sampleInputMax > state.DetectorAverage[channelIndex].Read())
                         {
-                            inputCoefficient = Parameter.AttackCoefficient;
+                            inputCoefficient = _parameter.AttackCoefficient;
                         }
 
                         float detectorValue = state.DetectorAverage[channelIndex].Update(sampleInputMax, inputCoefficient);
                         float attenuation = 1.0f;
 
-                        if (detectorValue > Parameter.Threshold)
+                        if (detectorValue > _parameter.Threshold)
                         {
-                            attenuation = Parameter.Threshold / detectorValue;
+                            attenuation = _parameter.Threshold / detectorValue;
                         }
 
-                        float outputCoefficient = Parameter.ReleaseCoefficient;
+                        float outputCoefficient = _parameter.ReleaseCoefficient;
 
                         if (state.CompressionGainAverage[channelIndex].Read() > attenuation)
                         {
-                            outputCoefficient = Parameter.AttackCoefficient;
+                            outputCoefficient = _parameter.AttackCoefficient;
                         }
 
                         float compressionGain = state.CompressionGainAverage[channelIndex].Update(attenuation, outputCoefficient);
 
-                        ref float delayedSample = ref state.DelayedSampleBuffer[channelIndex * Parameter.DelayBufferSampleCountMax + state.DelayedSampleBufferPosition[channelIndex]];
+                        ref float delayedSample = ref state.DelayedSampleBuffer[channelIndex * _parameter.DelayBufferSampleCountMax + state.DelayedSampleBufferPosition[channelIndex]];
 
-                        float outputSample = delayedSample * compressionGain * Parameter.OutputGain;
+                        float outputSample = delayedSample * compressionGain * _parameter.OutputGain;
 
                         *((float*)outputBuffers[channelIndex] + sampleIndex) = outputSample * short.MaxValue;
 
@@ -123,16 +123,16 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
                         state.DelayedSampleBufferPosition[channelIndex]++;
 
-                        while (state.DelayedSampleBufferPosition[channelIndex] >= Parameter.DelayBufferSampleCountMin)
+                        while (state.DelayedSampleBufferPosition[channelIndex] >= _parameter.DelayBufferSampleCountMin)
                         {
-                            state.DelayedSampleBufferPosition[channelIndex] -= Parameter.DelayBufferSampleCountMin;
+                            state.DelayedSampleBufferPosition[channelIndex] -= _parameter.DelayBufferSampleCountMin;
                         }
                     }
                 }
             }
             else
             {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
+                for (int i = 0; i < _parameter.ChannelCount; i++)
                 {
                     if (InputBufferIndices[i] != OutputBufferIndices[i])
                     {

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs

@@ -49,10 +49,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            for (int i = 0; i < Parameter.ChannelCount; i++)
+            for (int i = 0; i < _parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
             }
         }
 
@@ -62,11 +62,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled)
             {
-                if (Parameter.Status == UsageState.Invalid)
+                if (_parameter.Status == UsageState.Invalid)
                 {
                     state = new LimiterState(ref _parameter, WorkBuffer);
                 }
-                else if (Parameter.Status == UsageState.New)
+                else if (_parameter.Status == UsageState.New)
                 {
                     LimiterState.UpdateParameter(ref _parameter);
                 }
@@ -77,63 +77,63 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         private unsafe void ProcessLimiter(CommandList context, ref LimiterState state)
         {
-            Debug.Assert(Parameter.IsChannelCountValid());
+            Debug.Assert(_parameter.IsChannelCountValid());
 
-            if (IsEffectEnabled && Parameter.IsChannelCountValid())
+            if (IsEffectEnabled && _parameter.IsChannelCountValid())
             {
-                if (!ResultState.IsEmpty && Parameter.StatisticsReset)
+                if (!ResultState.IsEmpty && _parameter.StatisticsReset)
                 {
                     ref LimiterStatistics statistics = ref MemoryMarshal.Cast<byte, LimiterStatistics>(ResultState.Span[0].SpecificData)[0];
 
                     statistics.Reset();
                 }
 
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
+                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
 
-                for (int i = 0; i < Parameter.ChannelCount; i++)
+                for (int i = 0; i < _parameter.ChannelCount; i++)
                 {
                     inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
                     outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
                 }
 
-                for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
+                for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
                 {
                     for (int sampleIndex = 0; sampleIndex < context.SampleCount; sampleIndex++)
                     {
                         float rawInputSample = *((float*)inputBuffers[channelIndex] + sampleIndex);
 
-                        float inputSample = (rawInputSample / short.MaxValue) * Parameter.InputGain;
+                        float inputSample = (rawInputSample / short.MaxValue) * _parameter.InputGain;
 
                         float sampleInputMax = Math.Abs(inputSample);
 
-                        float inputCoefficient = Parameter.ReleaseCoefficient;
+                        float inputCoefficient = _parameter.ReleaseCoefficient;
 
                         if (sampleInputMax > state.DetectorAverage[channelIndex].Read())
                         {
-                            inputCoefficient = Parameter.AttackCoefficient;
+                            inputCoefficient = _parameter.AttackCoefficient;
                         }
 
                         float detectorValue = state.DetectorAverage[channelIndex].Update(sampleInputMax, inputCoefficient);
                         float attenuation = 1.0f;
 
-                        if (detectorValue > Parameter.Threshold)
+                        if (detectorValue > _parameter.Threshold)
                         {
-                            attenuation = Parameter.Threshold / detectorValue;
+                            attenuation = _parameter.Threshold / detectorValue;
                         }
 
-                        float outputCoefficient = Parameter.ReleaseCoefficient;
+                        float outputCoefficient = _parameter.ReleaseCoefficient;
 
                         if (state.CompressionGainAverage[channelIndex].Read() > attenuation)
                         {
-                            outputCoefficient = Parameter.AttackCoefficient;
+                            outputCoefficient = _parameter.AttackCoefficient;
                         }
 
                         float compressionGain = state.CompressionGainAverage[channelIndex].Update(attenuation, outputCoefficient);
 
-                        ref float delayedSample = ref state.DelayedSampleBuffer[channelIndex * Parameter.DelayBufferSampleCountMax + state.DelayedSampleBufferPosition[channelIndex]];
+                        ref float delayedSample = ref state.DelayedSampleBuffer[channelIndex * _parameter.DelayBufferSampleCountMax + state.DelayedSampleBufferPosition[channelIndex]];
 
-                        float outputSample = delayedSample * compressionGain * Parameter.OutputGain;
+                        float outputSample = delayedSample * compressionGain * _parameter.OutputGain;
 
                         *((float*)outputBuffers[channelIndex] + sampleIndex) = outputSample * short.MaxValue;
 
@@ -141,9 +141,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
                         state.DelayedSampleBufferPosition[channelIndex]++;
 
-                        while (state.DelayedSampleBufferPosition[channelIndex] >= Parameter.DelayBufferSampleCountMin)
+                        while (state.DelayedSampleBufferPosition[channelIndex] >= _parameter.DelayBufferSampleCountMin)
                         {
-                            state.DelayedSampleBufferPosition[channelIndex] -= Parameter.DelayBufferSampleCountMin;
+                            state.DelayedSampleBufferPosition[channelIndex] -= _parameter.DelayBufferSampleCountMin;
                         }
 
                         if (!ResultState.IsEmpty)
@@ -158,7 +158,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             }
             else
             {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
+                for (int i = 0; i < _parameter.ChannelCount; i++)
                 {
                     if (InputBufferIndices[i] != OutputBufferIndices[i])
                     {

src/Ryujinx.Audio/Renderer/Parameter/Effect/CompressorParameter.cs

@@ -90,9 +90,16 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
         public bool MakeupGainEnabled;
 
         /// <summary>
-        /// Reserved/padding.
+        /// Indicate if the compressor effect should output statistics.
         /// </summary>
-        private Array2<byte> _reserved;
+        [MarshalAs(UnmanagedType.I1)]
+        public bool StatisticsEnabled;
+
+        /// <summary>
+        /// Indicate to the DSP that the user did a statistics reset.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool StatisticsReset;
 
         /// <summary>
         /// Check if the <see cref="ChannelCount"/> is valid.

src/Ryujinx.Audio/Renderer/Parameter/Effect/CompressorStatistics.cs

@@ -0,0 +1,38 @@
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter.Effect
+{
+    /// <summary>
+    /// Effect result state for <seealso cref="Common.EffectType.Compressor"/>.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct CompressorStatistics
+    {
+        /// <summary>
+        /// Maximum input mean value since last reset.
+        /// </summary>
+        public float MaximumMean;
+
+        /// <summary>
+        /// Minimum output gain since last reset.
+        /// </summary>
+        public float MinimumGain;
+
+        /// <summary>
+        /// Last processed input sample, per channel.
+        /// </summary>
+        public Array6<float> LastSamples;
+
+        /// <summary>
+        /// Reset the statistics.
+        /// </summary>
+        /// <param name="channelCount">Number of channels to reset.</param>
+        public void Reset(ushort channelCount)
+        {
+            MaximumMean = 0.0f;
+            MinimumGain = 1.0f;
+            LastSamples.AsSpan()[..channelCount].Clear();
+        }
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/ISplitterDestinationInParameter.cs

@@ -28,6 +28,11 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// </summary>
         bool IsUsed { get; }
 
+        /// <summary>
+        /// Set to true to force resetting the previous mix volumes.
+        /// </summary>
+        bool ResetPrevVolume { get; }
+
         /// <summary>
         /// Mix buffer volumes.
         /// </summary>

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion1.cs

@@ -37,10 +37,16 @@ namespace Ryujinx.Audio.Renderer.Parameter
         [MarshalAs(UnmanagedType.I1)]
         public bool IsUsed;
 
+        /// <summary>
+        /// Set to true to force resetting the previous mix volumes.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool ResetPrevVolume;
+
         /// <summary>
         /// Reserved/padding.
         /// </summary>
-        private unsafe fixed byte _reserved[3];
+        private unsafe fixed byte _reserved[2];
 
         [StructLayout(LayoutKind.Sequential, Size = sizeof(float) * Constants.MixBufferCountMax, Pack = 1)]
         private struct MixArray { }
@@ -58,6 +64,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => default;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
+        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
 
         /// <summary>
         /// The expected constant of any input header.

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2.cs

@@ -42,10 +42,16 @@ namespace Ryujinx.Audio.Renderer.Parameter
         [MarshalAs(UnmanagedType.I1)]
         public bool IsUsed;
 
+        /// <summary>
+        /// Set to true to force resetting the previous mix volumes.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool ResetPrevVolume;
+
         /// <summary>
         /// Reserved/padding.
         /// </summary>
-        private unsafe fixed byte _reserved[11];
+        private unsafe fixed byte _reserved[10];
 
         [StructLayout(LayoutKind.Sequential, Size = sizeof(float) * Constants.MixBufferCountMax, Pack = 1)]
         private struct MixArray { }
@@ -63,6 +69,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => BiquadFilters;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
+        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
 
         /// <summary>
         /// The expected constant of any input header.

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

@@ -108,10 +108,18 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <remarks>This was added in system update 17.0.0</remarks>
         public const int Revision12 = 12 << 24;
 
+        /// <summary>
+        /// REV13:
+        /// The compressor effect can now output statistics.
+        /// Splitter destinations now explicitly reset the previous mix volume, instead of doing so on first use.
+        /// </summary>
+        /// <remarks>This was added in system update 18.0.0</remarks>
+        public const int Revision13 = 13 << 24;
+
         /// <summary>
         /// Last revision supported by the implementation.
         /// </summary>
-        public const int LastRevision = Revision12;
+        public const int LastRevision = Revision13;
 
         /// <summary>
         /// Target revision magic supported by the implementation.
@@ -384,6 +392,15 @@ namespace Ryujinx.Audio.Renderer.Server
             return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision12);
         }
 
+        /// <summary>
+        /// Check if the audio renderer should support explicit previous mix volume reset on splitter.
+        /// </summary>
+        /// <returns>True if the audio renderer support explicit previous mix volume reset on splitter</returns>
+        public bool IsSplitterPrevVolumeResetSupported()
+        {
+            return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision13);
+        }
+
         /// <summary>
         /// Get the version of the <see cref="ICommandProcessingTimeEstimator"/>.
         /// </summary>

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

@@ -583,11 +583,20 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        public void GenerateCompressorEffect(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, bool isEnabled, int nodeId)
+        /// <summary>
+        /// Generate a new <see cref="CompressorCommand"/>.
+        /// </summary>
+        /// <param name="bufferOffset">The target buffer offset.</param>
+        /// <param name="parameter">The compressor parameter.</param>
+        /// <param name="state">The compressor state.</param>
+        /// <param name="effectResultState">The DSP effect result state.</param>
+        /// <param name="isEnabled">Set to true if the effect should be active.</param>
+        /// <param name="nodeId">The node id associated to this command.</param>
+        public void GenerateCompressorEffect(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, Memory<EffectResultState> effectResultState, bool isEnabled, int nodeId)
         {
             if (parameter.IsChannelCountValid())
             {
-                CompressorCommand command = new(bufferOffset, parameter, state, isEnabled, nodeId);
+                CompressorCommand command = new(bufferOffset, parameter, state, effectResultState, isEnabled, nodeId);
 
                 command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 

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

@@ -735,14 +735,26 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        private void GenerateCompressorEffect(uint bufferOffset, CompressorEffect effect, int nodeId)
+        private void GenerateCompressorEffect(uint bufferOffset, CompressorEffect effect, int nodeId, int effectId)
         {
             Debug.Assert(effect.Type == EffectType.Compressor);
 
+            Memory<EffectResultState> dspResultState;
+
+            if (effect.Parameter.StatisticsEnabled)
+            {
+                dspResultState = _effectContext.GetDspStateMemory(effectId);
+            }
+            else
+            {
+                dspResultState = Memory<EffectResultState>.Empty;
+            }
+
             _commandBuffer.GenerateCompressorEffect(
                 bufferOffset,
                 effect.Parameter,
                 effect.State,
+                dspResultState,
                 effect.IsEnabled,
                 nodeId);
         }
@@ -795,7 +807,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     GenerateCaptureEffect(mix.BufferOffset, (CaptureBufferEffect)effect, nodeId);
                     break;
                 case EffectType.Compressor:
-                    GenerateCompressorEffect(mix.BufferOffset, (CompressorEffect)effect, nodeId);
+                    GenerateCompressorEffect(mix.BufferOffset, (CompressorEffect)effect, nodeId, effectId);
                     break;
                 default:
                     throw new NotImplementedException($"Unsupported effect type {effect.Type}");

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

@@ -169,14 +169,28 @@ namespace Ryujinx.Audio.Renderer.Server
             {
                 if (command.Enabled)
                 {
-                    return command.Parameter.ChannelCount switch
+                    if (command.Parameter.StatisticsEnabled)
                     {
-                        1 => 34431,
-                        2 => 44253,
-                        4 => 63827,
-                        6 => 83361,
-                        _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
-                    };
+                        return command.Parameter.ChannelCount switch
+                        {
+                            1 => 22100,
+                            2 => 33211,
+                            4 => 41587,
+                            6 => 58819,
+                            _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
+                        };
+                    }
+                    else
+                    {
+                        return command.Parameter.ChannelCount switch
+                        {
+                            1 => 19052,
+                            2 => 29852,
+                            4 => 37904,
+                            6 => 55020,
+                            _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
+                        };
+                    }
                 }
 
                 return command.Parameter.ChannelCount switch
@@ -191,14 +205,28 @@ namespace Ryujinx.Audio.Renderer.Server
 
             if (command.Enabled)
             {
-                return command.Parameter.ChannelCount switch
+                if (command.Parameter.StatisticsEnabled)
                 {
-                    1 => 51095,
-                    2 => 65693,
-                    4 => 95383,
-                    6 => 124510,
-                    _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
-                };
+                    return command.Parameter.ChannelCount switch
+                    {
+                        1 => 32518,
+                        2 => 49102,
+                        4 => 61685,
+                        6 => 87250,
+                        _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
+                    };
+                }
+                else
+                {
+                    return command.Parameter.ChannelCount switch
+                    {
+                        1 => 27963,
+                        2 => 44016,
+                        4 => 56183,
+                        6 => 81862,
+                        _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
+                    };
+                }
             }
 
             return command.Parameter.ChannelCount switch

src/Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs

@@ -62,6 +62,19 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
             UpdateUsageStateForCommandGeneration();
 
             Parameter.Status = UsageState.Enabled;
+            Parameter.StatisticsReset = false;
+        }
+
+        public override void InitializeResultState(ref EffectResultState state)
+        {
+            ref CompressorStatistics statistics = ref MemoryMarshal.Cast<byte, CompressorStatistics>(state.SpecificData)[0];
+
+            statistics.Reset(Parameter.ChannelCount);
+        }
+
+        public override void UpdateResultState(ref EffectResultState destState, ref EffectResultState srcState)
+        {
+            destState = srcState;
         }
     }
 }

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterContext.cs

@@ -51,6 +51,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public bool IsBugFixed { get; private set; }
 
+        /// <summary>
+        /// If set to true, the previous mix volume is explicitly resetted using the input parameter, instead of implicitly on first use.
+        /// </summary>
+        public bool IsSplitterPrevVolumeResetSupported { get; private set; }
+
         /// <summary>
         /// Initialize <see cref="SplitterContext"/>.
         /// </summary>
@@ -139,6 +144,8 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 }
             }
 
+            IsSplitterPrevVolumeResetSupported = behaviourContext.IsSplitterPrevVolumeResetSupported();
+
             SplitterState.InitializeSplitters(splitters.Span);
 
             Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourContext.IsSplitterBugFixed());
@@ -277,7 +284,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 {
                     SplitterDestination destination = GetDestination(parameter.Id);
 
-                    destination.Update(parameter);
+                    destination.Update(parameter, IsSplitterPrevVolumeResetSupported);
                 }
 
                 return true;

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestination.cs

@@ -184,15 +184,16 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// Update the splitter destination data from user parameter.
         /// </summary>
         /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
+        /// <param name="isPrevVolumeResetSupported">Indicates that the audio renderer revision in use supports explicitly resetting the volume.</param>
+        public void Update<T>(in T parameter, bool isPrevVolumeResetSupported) where T : ISplitterDestinationInParameter
         {
             if (Unsafe.IsNullRef(ref _v2))
             {
-                _v1.Update(parameter);
+                _v1.Update(parameter, isPrevVolumeResetSupported);
             }
             else
             {
-                _v2.Update(parameter);
+                _v2.Update(parameter, isPrevVolumeResetSupported);
             }
         }
 

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestinationVersion1.cs

@@ -93,7 +93,8 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// Update the <see cref="SplitterDestinationVersion1"/> from user parameter.
         /// </summary>
         /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
+        /// <param name="isPrevVolumeResetSupported">Indicates that the audio renderer revision in use supports explicitly resetting the volume.</param>
+        public void Update<T>(in T parameter, bool isPrevVolumeResetSupported) where T : ISplitterDestinationInParameter
         {
             Debug.Assert(Id == parameter.Id);
 
@@ -103,7 +104,8 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
                 parameter.MixBufferVolume.CopyTo(MixBufferVolume);
 
-                if (!IsUsed && parameter.IsUsed)
+                bool resetPrevVolume = isPrevVolumeResetSupported ? parameter.ResetPrevVolume : !IsUsed && parameter.IsUsed;
+                if (resetPrevVolume)
                 {
                     MixBufferVolume.CopyTo(PreviousMixBufferVolume);
 

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestinationVersion2.cs

@@ -98,7 +98,8 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// Update the <see cref="SplitterDestinationVersion2"/> from user parameter.
         /// </summary>
         /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
+        /// <param name="isPrevVolumeResetSupported">Indicates that the audio renderer revision in use supports explicitly resetting the volume.</param>
+        public void Update<T>(in T parameter, bool isPrevVolumeResetSupported) where T : ISplitterDestinationInParameter
         {
             Debug.Assert(Id == parameter.Id);
 
@@ -110,7 +111,8 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
                 _biquadFilters = parameter.BiquadFilters;
 
-                if (!IsUsed && parameter.IsUsed)
+                bool resetPrevVolume = isPrevVolumeResetSupported ? parameter.ResetPrevVolume : !IsUsed && parameter.IsUsed;
+                if (resetPrevVolume)
                 {
                     MixBufferVolume.CopyTo(PreviousMixBufferVolume);
 

src/Ryujinx.Common/Collections/IntervalTree.cs

@@ -492,7 +492,7 @@ namespace Ryujinx.Common.Collections
             Start = start;
             End = end;
             Max = end;
-            Values = new List<RangeNode<TKey, TValue>> { new RangeNode<TKey, TValue>(start, end, value) };
+            Values = [ new RangeNode<TKey, TValue>(start, end, value) ];
             Parent = parent;
         }
     }

src/Ryujinx.Common/Configuration/GraphicsBackend.cs

@@ -8,6 +8,5 @@ namespace Ryujinx.Common.Configuration
     {
         Vulkan,
         OpenGl,
-        Metal
     }
 }

src/Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs

@@ -2,6 +2,7 @@ using Ryujinx.Common.GraphicsDriver.NVAPI;
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+// ReSharper disable InconsistentNaming
 
 namespace Ryujinx.Common.GraphicsDriver
 {

src/Ryujinx.Common/Hash128.cs

@@ -1,48 +1,556 @@
 using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Numerics;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.Intrinsics.X86;
+using System.Runtime.Intrinsics;
+// ReSharper disable InconsistentNaming
 
 namespace Ryujinx.Common
 {
     [StructLayout(LayoutKind.Sequential)]
-    public struct Hash128 : IEquatable<Hash128>
+    public struct Hash128(ulong low, ulong high) : IEquatable<Hash128>
     {
-        public ulong Low;
-        public ulong High;
+        public ulong Low = low;
+        public ulong High = high;
 
-        public Hash128(ulong low, ulong high)
+        public readonly override string ToString() => $"{High:x16}{Low:x16}";
+
+        public static bool operator ==(Hash128 x, Hash128 y) => x.Equals(y);
+
+        public static bool operator !=(Hash128 x, Hash128 y) => !x.Equals(y);
+
+        public readonly override bool Equals(object obj) => obj is Hash128 hash128 && Equals(hash128);
+
+        public readonly bool Equals(Hash128 cmpObj) => Low == cmpObj.Low && High == cmpObj.High;
+
+        public readonly override int GetHashCode() => HashCode.Combine(Low, High);
+
+        public static Hash128 ComputeHash(ReadOnlySpan<byte> input) => Xxh3128bitsInternal(input, Xxh3KSecret, 0UL);
+
+        #region Hash computation
+
+        private const int StripeLen = 64;
+        private const int AccNb = StripeLen / sizeof(ulong);
+        private const int SecretConsumeRate = 8;
+        private const int SecretLastAccStart = 7;
+        private const int SecretMergeAccsStart = 11;
+        private const int SecretSizeMin = 136;
+        private const int MidSizeStartOffset = 3;
+        private const int MidSizeLastOffset = 17;
+
+        private const uint Prime32_1 = 0x9E3779B1U;
+        private const uint Prime32_2 = 0x85EBCA77U;
+        private const uint Prime32_3 = 0xC2B2AE3DU;
+        private const uint Prime32_4 = 0x27D4EB2FU;
+        private const uint Prime32_5 = 0x165667B1U;
+
+        private const ulong Prime64_1 = 0x9E3779B185EBCA87UL;
+        private const ulong Prime64_2 = 0xC2B2AE3D27D4EB4FUL;
+        private const ulong Prime64_3 = 0x165667B19E3779F9UL;
+        private const ulong Prime64_4 = 0x85EBCA77C2B2AE63UL;
+        private const ulong Prime64_5 = 0x27D4EB2F165667C5UL;
+
+        private static readonly ulong[] _xxh3InitAcc =
+        [
+            Prime32_3,
+            Prime64_1,
+            Prime64_2,
+            Prime64_3,
+            Prime64_4,
+            Prime32_2,
+            Prime64_5,
+            Prime32_1
+        ];
+
+        private static ReadOnlySpan<byte> Xxh3KSecret =>
+        [
+            0xb8, 0xfe, 0x6c, 0x39, 0x23, 0xa4, 0x4b, 0xbe, 0x7c, 0x01, 0x81, 0x2c, 0xf7, 0x21, 0xad, 0x1c,
+            0xde, 0xd4, 0x6d, 0xe9, 0x83, 0x90, 0x97, 0xdb, 0x72, 0x40, 0xa4, 0xa4, 0xb7, 0xb3, 0x67, 0x1f,
+            0xcb, 0x79, 0xe6, 0x4e, 0xcc, 0xc0, 0xe5, 0x78, 0x82, 0x5a, 0xd0, 0x7d, 0xcc, 0xff, 0x72, 0x21,
+            0xb8, 0x08, 0x46, 0x74, 0xf7, 0x43, 0x24, 0x8e, 0xe0, 0x35, 0x90, 0xe6, 0x81, 0x3a, 0x26, 0x4c,
+            0x3c, 0x28, 0x52, 0xbb, 0x91, 0xc3, 0x00, 0xcb, 0x88, 0xd0, 0x65, 0x8b, 0x1b, 0x53, 0x2e, 0xa3,
+            0x71, 0x64, 0x48, 0x97, 0xa2, 0x0d, 0xf9, 0x4e, 0x38, 0x19, 0xef, 0x46, 0xa9, 0xde, 0xac, 0xd8,
+            0xa8, 0xfa, 0x76, 0x3f, 0xe3, 0x9c, 0x34, 0x3f, 0xf9, 0xdc, 0xbb, 0xc7, 0xc7, 0x0b, 0x4f, 0x1d,
+            0x8a, 0x51, 0xe0, 0x4b, 0xcd, 0xb4, 0x59, 0x31, 0xc8, 0x9f, 0x7e, 0xc9, 0xd9, 0x78, 0x73, 0x64,
+            0xea, 0xc5, 0xac, 0x83, 0x34, 0xd3, 0xeb, 0xc3, 0xc5, 0x81, 0xa0, 0xff, 0xfa, 0x13, 0x63, 0xeb,
+            0x17, 0x0d, 0xdd, 0x51, 0xb7, 0xf0, 0xda, 0x49, 0xd3, 0x16, 0x55, 0x26, 0x29, 0xd4, 0x68, 0x9e,
+            0x2b, 0x16, 0xbe, 0x58, 0x7d, 0x47, 0xa1, 0xfc, 0x8f, 0xf8, 0xb8, 0xd1, 0x7a, 0xd0, 0x31, 0xce,
+            0x45, 0xcb, 0x3a, 0x8f, 0x95, 0x16, 0x04, 0x28, 0xaf, 0xd7, 0xfb, 0xca, 0xbb, 0x4b, 0x40, 0x7e
+        ];
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Mult32To64(ulong x, ulong y) => (uint)x * (ulong)(uint)y;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static Hash128 Mult64To128(ulong lhs, ulong rhs)
         {
-            Low = low;
-            High = high;
+            ulong high = Math.BigMul(lhs, rhs, out ulong low);
+
+            return new Hash128
+            {
+                Low = low,
+                High = high,
+            };
         }
 
-        public readonly override string ToString()
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Mul128Fold64(ulong lhs, ulong rhs)
         {
-            return $"{High:x16}{Low:x16}";
+            Hash128 product = Mult64To128(lhs, rhs);
+
+            return product.Low ^ product.High;
         }
 
-        public static bool operator ==(Hash128 x, Hash128 y)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong XorShift64(ulong v64, int shift)
         {
-            return x.Equals(y);
+            Debug.Assert(0 <= shift && shift < 64);
+
+            return v64 ^ (v64 >> shift);
         }
 
-        public static bool operator !=(Hash128 x, Hash128 y)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Xxh3Avalanche(ulong h64)
         {
-            return !x.Equals(y);
+            h64 = XorShift64(h64, 37);
+            h64 *= 0x165667919E3779F9UL;
+            h64 = XorShift64(h64, 32);
+
+            return h64;
         }
 
-        public readonly override bool Equals(object obj)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Xxh64Avalanche(ulong h64)
         {
-            return obj is Hash128 hash128 && Equals(hash128);
+            h64 ^= h64 >> 33;
+            h64 *= Prime64_2;
+            h64 ^= h64 >> 29;
+            h64 *= Prime64_3;
+            h64 ^= h64 >> 32;
+
+            return h64;
         }
 
-        public readonly bool Equals(Hash128 cmpObj)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private unsafe static void Xxh3Accumulate512(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
         {
-            return Low == cmpObj.Low && High == cmpObj.High;
+            if (Avx2.IsSupported)
+            {
+                fixed (ulong* pAcc = acc)
+                {
+                    fixed (byte* pInput = input, pSecret = secret)
+                    {
+                        Vector256<ulong>* xAcc = (Vector256<ulong>*)pAcc;
+                        Vector256<byte>* xInput = (Vector256<byte>*)pInput;
+                        Vector256<byte>* xSecret = (Vector256<byte>*)pSecret;
+
+                        for (ulong i = 0; i < StripeLen / 32; i++)
+                        {
+                            Vector256<byte> dataVec = xInput[i];
+                            Vector256<byte> keyVec = xSecret[i];
+                            Vector256<byte> dataKey = Avx2.Xor(dataVec, keyVec);
+                            Vector256<uint> dataKeyLo = Avx2.Shuffle(dataKey.AsUInt32(), 0b00110001);
+                            Vector256<ulong> product = Avx2.Multiply(dataKey.AsUInt32(), dataKeyLo);
+                            Vector256<uint> dataSwap = Avx2.Shuffle(dataVec.AsUInt32(), 0b01001110);
+                            Vector256<ulong> sum = Avx2.Add(xAcc[i], dataSwap.AsUInt64());
+                            xAcc[i] = Avx2.Add(product, sum);
+                        }
+                    }
+                }
+            }
+            else if (Sse2.IsSupported)
+            {
+                fixed (ulong* pAcc = acc)
+                {
+                    fixed (byte* pInput = input, pSecret = secret)
+                    {
+                        Vector128<ulong>* xAcc = (Vector128<ulong>*)pAcc;
+                        Vector128<byte>* xInput = (Vector128<byte>*)pInput;
+                        Vector128<byte>* xSecret = (Vector128<byte>*)pSecret;
+
+                        for (ulong i = 0; i < StripeLen / 16; i++)
+                        {
+                            Vector128<byte> dataVec = xInput[i];
+                            Vector128<byte> keyVec = xSecret[i];
+                            Vector128<byte> dataKey = Sse2.Xor(dataVec, keyVec);
+                            Vector128<uint> dataKeyLo = Sse2.Shuffle(dataKey.AsUInt32(), 0b00110001);
+                            Vector128<ulong> product = Sse2.Multiply(dataKey.AsUInt32(), dataKeyLo);
+                            Vector128<uint> dataSwap = Sse2.Shuffle(dataVec.AsUInt32(), 0b01001110);
+                            Vector128<ulong> sum = Sse2.Add(xAcc[i], dataSwap.AsUInt64());
+                            xAcc[i] = Sse2.Add(product, sum);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < AccNb; i++)
+                {
+                    ulong dataVal = BinaryPrimitives.ReadUInt64LittleEndian(input[(i * sizeof(ulong))..]);
+                    ulong dataKey = dataVal ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[(i * sizeof(ulong))..]);
+                    acc[i ^ 1] += dataVal;
+                    acc[i] += Mult32To64((uint)dataKey, dataKey >> 32);
+                }
+            }
         }
 
-        public readonly override int GetHashCode()
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private unsafe static void Xxh3ScrambleAcc(Span<ulong> acc, ReadOnlySpan<byte> secret)
         {
-            return HashCode.Combine(Low, High);
+            if (Avx2.IsSupported)
+            {
+                fixed (ulong* pAcc = acc)
+                {
+                    fixed (byte* pSecret = secret)
+                    {
+                        Vector256<uint> prime32 = Vector256.Create(Prime32_1);
+                        Vector256<ulong>* xAcc = (Vector256<ulong>*)pAcc;
+                        Vector256<byte>* xSecret = (Vector256<byte>*)pSecret;
+
+                        for (ulong i = 0; i < StripeLen / 32; i++)
+                        {
+                            Vector256<ulong> accVec = xAcc[i];
+                            Vector256<ulong> shifted = Avx2.ShiftRightLogical(accVec, 47);
+                            Vector256<ulong> dataVec = Avx2.Xor(accVec, shifted);
+
+                            Vector256<byte> keyVec = xSecret[i];
+                            Vector256<uint> dataKey = Avx2.Xor(dataVec.AsUInt32(), keyVec.AsUInt32());
+
+                            Vector256<uint> dataKeyHi = Avx2.Shuffle(dataKey.AsUInt32(), 0b00110001);
+                            Vector256<ulong> prodLo = Avx2.Multiply(dataKey, prime32);
+                            Vector256<ulong> prodHi = Avx2.Multiply(dataKeyHi, prime32);
+
+                            xAcc[i] = Avx2.Add(prodLo, Avx2.ShiftLeftLogical(prodHi, 32));
+                        }
+                    }
+                }
+            }
+            else if (Sse2.IsSupported)
+            {
+                fixed (ulong* pAcc = acc)
+                {
+                    fixed (byte* pSecret = secret)
+                    {
+                        Vector128<uint> prime32 = Vector128.Create(Prime32_1);
+                        Vector128<ulong>* xAcc = (Vector128<ulong>*)pAcc;
+                        Vector128<byte>* xSecret = (Vector128<byte>*)pSecret;
+
+                        for (ulong i = 0; i < StripeLen / 16; i++)
+                        {
+                            Vector128<ulong> accVec = xAcc[i];
+                            Vector128<ulong> shifted = Sse2.ShiftRightLogical(accVec, 47);
+                            Vector128<ulong> dataVec = Sse2.Xor(accVec, shifted);
+
+                            Vector128<byte> keyVec = xSecret[i];
+                            Vector128<uint> dataKey = Sse2.Xor(dataVec.AsUInt32(), keyVec.AsUInt32());
+
+                            Vector128<uint> dataKeyHi = Sse2.Shuffle(dataKey.AsUInt32(), 0b00110001);
+                            Vector128<ulong> prodLo = Sse2.Multiply(dataKey, prime32);
+                            Vector128<ulong> prodHi = Sse2.Multiply(dataKeyHi, prime32);
+
+                            xAcc[i] = Sse2.Add(prodLo, Sse2.ShiftLeftLogical(prodHi, 32));
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < AccNb; i++)
+                {
+                    ulong key64 = BinaryPrimitives.ReadUInt64LittleEndian(secret[(i * sizeof(ulong))..]);
+                    ulong acc64 = acc[i];
+                    acc64 = XorShift64(acc64, 47);
+                    acc64 ^= key64;
+                    acc64 *= Prime32_1;
+                    acc[i] = acc64;
+                }
+            }
         }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void Xxh3Accumulate(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, int nbStripes)
+        {
+            for (int n = 0; n < nbStripes; n++)
+            {
+                ReadOnlySpan<byte> inData = input[(n * StripeLen)..];
+                Xxh3Accumulate512(acc, inData, secret[(n * SecretConsumeRate)..]);
+            }
+        }
+
+        private static void Xxh3HashLongInternalLoop(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
+        {
+            int nbStripesPerBlock = (secret.Length - StripeLen) / SecretConsumeRate;
+            int blockLen = StripeLen * nbStripesPerBlock;
+            int nbBlocks = (input.Length - 1) / blockLen;
+
+            Debug.Assert(secret.Length >= SecretSizeMin);
+
+            for (int n = 0; n < nbBlocks; n++)
+            {
+                Xxh3Accumulate(acc, input[(n * blockLen)..], secret, nbStripesPerBlock);
+                Xxh3ScrambleAcc(acc, secret[^StripeLen..]);
+            }
+
+            Debug.Assert(input.Length > StripeLen);
+
+            int nbStripes = (input.Length - 1 - (blockLen * nbBlocks)) / StripeLen;
+            Debug.Assert(nbStripes <= (secret.Length / SecretConsumeRate));
+            Xxh3Accumulate(acc, input[(nbBlocks * blockLen)..], secret, nbStripes);
+
+            ReadOnlySpan<byte> p = input[^StripeLen..];
+            Xxh3Accumulate512(acc, p, secret[(secret.Length - StripeLen - SecretLastAccStart)..]);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Xxh3Mix2Accs(Span<ulong> acc, ReadOnlySpan<byte> secret)
+        {
+            return Mul128Fold64(
+                acc[0] ^ BinaryPrimitives.ReadUInt64LittleEndian(secret),
+                acc[1] ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[8..]));
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static ulong Xxh3MergeAccs(Span<ulong> acc, ReadOnlySpan<byte> secret, ulong start)
+        {
+            ulong result64 = start;
+
+            for (int i = 0; i < 4; i++)
+            {
+                result64 += Xxh3Mix2Accs(acc[(2 * i)..], secret[(16 * i)..]);
+            }
+
+            return Xxh3Avalanche(result64);
+        }
+
+        [SkipLocalsInit]
+        private static Hash128 Xxh3HashLong128bInternal(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
+        {
+            Span<ulong> acc = stackalloc ulong[AccNb];
+            _xxh3InitAcc.CopyTo(acc);
+
+            Xxh3HashLongInternalLoop(acc, input, secret);
+
+            Debug.Assert(acc.Length == 8);
+            Debug.Assert(secret.Length >= acc.Length * sizeof(ulong) + SecretMergeAccsStart);
+
+            return new Hash128
+            {
+                Low = Xxh3MergeAccs(acc, secret[SecretMergeAccsStart..], (ulong)input.Length * Prime64_1),
+                High = Xxh3MergeAccs(
+                    acc,
+                    secret[(secret.Length - acc.Length * sizeof(ulong) - SecretMergeAccsStart)..],
+                    ~((ulong)input.Length * Prime64_2)),
+            };
+        }
+
+        private static Hash128 Xxh3Len1To3128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(1 <= input.Length && input.Length <= 3);
+
+            byte c1 = input[0];
+            byte c2 = input[input.Length >> 1];
+            byte c3 = input[^1];
+
+            uint combinedL = ((uint)c1 << 16) | ((uint)c2 << 24) | c3 | ((uint)input.Length << 8);
+            uint combinedH = BitOperations.RotateLeft(BinaryPrimitives.ReverseEndianness(combinedL), 13);
+            ulong bitFlipL = (BinaryPrimitives.ReadUInt32LittleEndian(secret) ^ BinaryPrimitives.ReadUInt32LittleEndian(secret[4..])) + seed;
+            ulong bitFlipH = (BinaryPrimitives.ReadUInt32LittleEndian(secret[8..]) ^ BinaryPrimitives.ReadUInt32LittleEndian(secret[12..])) - seed;
+            ulong keyedLo = combinedL ^ bitFlipL;
+            ulong keyedHi = combinedH ^ bitFlipH;
+
+            return new Hash128
+            {
+                Low = Xxh64Avalanche(keyedLo),
+                High = Xxh64Avalanche(keyedHi),
+            };
+        }
+
+        private static Hash128 Xxh3Len4To8128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(4 <= input.Length && input.Length <= 8);
+
+            seed ^= BinaryPrimitives.ReverseEndianness((uint)seed) << 32;
+
+            uint inputLo = BinaryPrimitives.ReadUInt32LittleEndian(input);
+            uint inputHi = BinaryPrimitives.ReadUInt32LittleEndian(input[^4..]);
+            ulong input64 = inputLo + ((ulong)inputHi << 32);
+            ulong bitFlip = (BinaryPrimitives.ReadUInt64LittleEndian(secret[16..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[24..])) + seed;
+            ulong keyed = input64 ^ bitFlip;
+
+            Hash128 m128 = Mult64To128(keyed, Prime64_1 + ((ulong)input.Length << 2));
+
+            m128.High += m128.Low << 1;
+            m128.Low ^= m128.High >> 3;
+
+            m128.Low = XorShift64(m128.Low, 35);
+            m128.Low *= 0x9FB21C651E98DF25UL;
+            m128.Low = XorShift64(m128.Low, 28);
+            m128.High = Xxh3Avalanche(m128.High);
+
+            return m128;
+        }
+
+        private static Hash128 Xxh3Len9To16128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(9 <= input.Length && input.Length <= 16);
+
+            ulong bitFlipL = (BinaryPrimitives.ReadUInt64LittleEndian(secret[32..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[40..])) - seed;
+            ulong bitFlipH = (BinaryPrimitives.ReadUInt64LittleEndian(secret[48..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[56..])) + seed;
+            ulong inputLo = BinaryPrimitives.ReadUInt64LittleEndian(input);
+            ulong inputHi = BinaryPrimitives.ReadUInt64LittleEndian(input[^8..]);
+
+            Hash128 m128 = Mult64To128(inputLo ^ inputHi ^ bitFlipL, Prime64_1);
+            m128.Low += ((ulong)input.Length - 1) << 54;
+            inputHi ^= bitFlipH;
+            m128.High += inputHi + Mult32To64((uint)inputHi, Prime32_2 - 1);
+            m128.Low ^= BinaryPrimitives.ReverseEndianness(m128.High);
+
+            Hash128 h128 = Mult64To128(m128.Low, Prime64_2);
+            h128.High += m128.High * Prime64_2;
+            h128.Low = Xxh3Avalanche(h128.Low);
+            h128.High = Xxh3Avalanche(h128.High);
+
+            return h128;
+        }
+
+        private static Hash128 Xxh3Len0To16128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(input.Length <= 16);
+
+            if (input.Length > 8)
+            {
+                return Xxh3Len9To16128b(input, secret, seed);
+            }
+
+            if (input.Length >= 4)
+            {
+                return Xxh3Len4To8128b(input, secret, seed);
+            }
+
+            if (input.Length != 0)
+            {
+                return Xxh3Len1To3128b(input, secret, seed);
+            }
+
+            Hash128 h128 = new();
+            ulong bitFlipL = BinaryPrimitives.ReadUInt64LittleEndian(secret[64..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[72..]);
+            ulong bitFlipH = BinaryPrimitives.ReadUInt64LittleEndian(secret[80..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[88..]);
+            h128.Low = Xxh64Avalanche(seed ^ bitFlipL);
+            h128.High = Xxh64Avalanche(seed ^ bitFlipH);
+
+            return h128;
+        }
+
+        private static ulong Xxh3Mix16b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            ulong inputLo = BinaryPrimitives.ReadUInt64LittleEndian(input);
+            ulong inputHi = BinaryPrimitives.ReadUInt64LittleEndian(input[8..]);
+
+            return Mul128Fold64(
+                inputLo ^ (BinaryPrimitives.ReadUInt64LittleEndian(secret) + seed),
+                inputHi ^ (BinaryPrimitives.ReadUInt64LittleEndian(secret[8..]) - seed));
+        }
+
+        private static Hash128 Xxh128Mix32b(Hash128 acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> input2, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            acc.Low += Xxh3Mix16b(input, secret, seed);
+            acc.Low ^= BinaryPrimitives.ReadUInt64LittleEndian(input2) + BinaryPrimitives.ReadUInt64LittleEndian(input2[8..]);
+            acc.High += Xxh3Mix16b(input2, secret[16..], seed);
+            acc.High ^= BinaryPrimitives.ReadUInt64LittleEndian(input) + BinaryPrimitives.ReadUInt64LittleEndian(input[8..]);
+
+            return acc;
+        }
+
+        private static Hash128 Xxh3Len17To128128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(secret.Length >= SecretSizeMin);
+            Debug.Assert(16 < input.Length && input.Length <= 128);
+
+            Hash128 acc = new()
+            {
+                Low = (ulong)input.Length * Prime64_1,
+                High = 0,
+            };
+
+            if (input.Length > 32)
+            {
+                if (input.Length > 64)
+                {
+                    if (input.Length > 96)
+                    {
+                        acc = Xxh128Mix32b(acc, input[48..], input[^64..], secret[96..], seed);
+                    }
+                    acc = Xxh128Mix32b(acc, input[32..], input[^48..], secret[64..], seed);
+                }
+                acc = Xxh128Mix32b(acc, input[16..], input[^32..], secret[32..], seed);
+            }
+            acc = Xxh128Mix32b(acc, input, input[^16..], secret, seed);
+
+            Hash128 h128 = new()
+            {
+                Low = acc.Low + acc.High,
+                High = acc.Low * Prime64_1 + acc.High * Prime64_4 + ((ulong)input.Length - seed) * Prime64_2,
+            };
+            h128.Low = Xxh3Avalanche(h128.Low);
+            h128.High = 0UL - Xxh3Avalanche(h128.High);
+
+            return h128;
+        }
+
+        private static Hash128 Xxh3Len129To240128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(secret.Length >= SecretSizeMin);
+            Debug.Assert(128 < input.Length && input.Length <= 240);
+
+            Hash128 acc = new();
+
+            int nbRounds = input.Length / 32;
+            acc.Low = (ulong)input.Length * Prime64_1;
+            acc.High = 0;
+
+            for (int i = 0; i < 4; i++)
+            {
+                acc = Xxh128Mix32b(acc, input[(32 * i)..], input[(32 * i + 16)..], secret[(32 * i)..], seed);
+            }
+
+            acc.Low = Xxh3Avalanche(acc.Low);
+            acc.High = Xxh3Avalanche(acc.High);
+            Debug.Assert(nbRounds >= 4);
+
+            for (int i = 4; i < nbRounds; i++)
+            {
+                acc = Xxh128Mix32b(acc, input[(32 * i)..], input[(32 * i + 16)..], secret[(MidSizeStartOffset + 32 * (i - 4))..], seed);
+            }
+
+            acc = Xxh128Mix32b(acc, input[^16..], input[^32..], secret[(SecretSizeMin - MidSizeLastOffset - 16)..], 0UL - seed);
+
+            Hash128 h128 = new()
+            {
+                Low = acc.Low + acc.High,
+                High = acc.Low * Prime64_1 + acc.High * Prime64_4 + ((ulong)input.Length - seed) * Prime64_2,
+            };
+            h128.Low = Xxh3Avalanche(h128.Low);
+            h128.High = 0UL - Xxh3Avalanche(h128.High);
+
+            return h128;
+        }
+
+        private static Hash128 Xxh3128bitsInternal(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
+        {
+            Debug.Assert(secret.Length >= SecretSizeMin);
+
+            return input.Length switch
+            {
+                <= 16 => Xxh3Len0To16128b(input, secret, seed),
+                <= 128 => Xxh3Len17To128128b(input, secret, seed),
+                <= 240 => Xxh3Len129To240128b(input, secret, seed),
+                _ => Xxh3HashLong128bInternal(input, secret)
+            };
+        }
+
+#endregion
     }
 }

src/Ryujinx.Common/Logging/Logger.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Common.Logging
         public readonly struct Log
         {
             private static readonly string _homeDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            private static readonly string _homeDirRedacted = Path.Combine(Directory.GetParent(_homeDir).FullName, "[redacted]");
+            private static readonly string _homeDirRedacted = Path.Combine(Directory.GetParent(_homeDir)!.FullName, "[redacted]");
 
             internal readonly LogLevel Level;
 
@@ -233,7 +233,7 @@ namespace Ryujinx.Common.Logging
                 case LogLevel.AccessLog : AccessLog = enabled ? new Log(LogLevel.AccessLog) : new Log?(); break;
                 case LogLevel.Stub      : Stub      = enabled ? new Log(LogLevel.Stub)      : new Log?(); break;
                 case LogLevel.Trace     : Trace     = enabled ? new Log(LogLevel.Trace)     : new Log?(); break;
-                default: throw new ArgumentException("Unknown Log Level");
+                default: throw new ArgumentException("Unknown Log Level", nameof(logLevel));
 #pragma warning restore IDE0055
             }
         }

src/Ryujinx.Common/Pools/ObjectPool.cs

@@ -3,19 +3,11 @@ using System.Threading;
 
 namespace Ryujinx.Common
 {
-    public class ObjectPool<T>
+    public class ObjectPool<T>(Func<T> factory, int size)
         where T : class
     {
         private T _firstItem;
-        private readonly T[] _items;
-
-        private readonly Func<T> _factory;
-
-        public ObjectPool(Func<T> factory, int size)
-        {
-            _items = new T[size - 1];
-            _factory = factory;
-        }
+        private readonly T[] _items = new T[size - 1];
 
         public T Allocate()
         {
@@ -43,7 +35,7 @@ namespace Ryujinx.Common
                 }
             }
 
-            return _factory();
+            return factory();
         }
 
         public void Release(T obj)

src/Ryujinx.Common/ReactiveObject.cs

@@ -47,15 +47,9 @@ namespace Ryujinx.Common
         }
     }
 
-    public class ReactiveEventArgs<T>
+    public class ReactiveEventArgs<T>(T oldValue, T newValue)
     {
-        public T OldValue { get; }
-        public T NewValue { get; }
-
-        public ReactiveEventArgs(T oldValue, T newValue)
-        {
-            OldValue = oldValue;
-            NewValue = newValue;
-        }
+        public T OldValue { get; } = oldValue;
+        public T NewValue { get; } = newValue;
     }
 }

src/Ryujinx.Common/ReleaseInformation.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Common
         private const string FlatHubChannelOwner = "flathub";
 
         private const string BuildVersion = "%%RYUJINX_BUILD_VERSION%%";
-        private const string BuildGitHash = "%%RYUJINX_BUILD_GIT_HASH%%";
+        public const string BuildGitHash = "%%RYUJINX_BUILD_GIT_HASH%%";
         private const string ReleaseChannelName = "%%RYUJINX_TARGET_RELEASE_CHANNEL_NAME%%";
         private const string ConfigFileName = "%%RYUJINX_CONFIG_FILE_NAME%%";
 

src/Ryujinx.Common/Utilities/JsonHelper.cs

@@ -75,15 +75,10 @@ namespace Ryujinx.Common.Utilities
 
                     if (char.IsUpper(c))
                     {
-                        if (i == 0 || char.IsUpper(name[i - 1]))
-                        {
-                            builder.Append(char.ToLowerInvariant(c));
-                        }
-                        else
-                        {
+                        if (!(i == 0 || char.IsUpper(name[i - 1])))
                             builder.Append('_');
-                            builder.Append(char.ToLowerInvariant(c));
-                        }
+
+                        builder.Append(char.ToLowerInvariant(c));
                     }
                     else
                     {

src/Ryujinx.Common/Utilities/UInt128Utils.cs

@@ -5,14 +5,16 @@ namespace Ryujinx.Common.Utilities
 {
     public static class UInt128Utils
     {
-        public static UInt128 FromHex(string hex)
-        {
-            return new UInt128(ulong.Parse(hex.AsSpan(0, 16), NumberStyles.HexNumber), ulong.Parse(hex.AsSpan(16), NumberStyles.HexNumber));
-        }
+        public static UInt128 FromHex(string hex) =>
+            new(
+                ulong.Parse(hex.AsSpan(0, 16), NumberStyles.HexNumber),
+                ulong.Parse(hex.AsSpan(16), NumberStyles.HexNumber)
+            );
 
-        public static UInt128 CreateRandom()
-        {
-            return new UInt128((ulong)Random.Shared.NextInt64(), (ulong)Random.Shared.NextInt64());
-        }
+        public static Int128 NextInt128(this Random rand) =>
+            new((ulong)rand.NextInt64(), (ulong)rand.NextInt64());
+
+        public static UInt128 NextUInt128(this Random rand) =>
+            new((ulong)rand.NextInt64(), (ulong)rand.NextInt64());
     }
 }

src/Ryujinx.Common/XXHash128.cs

@@ -1,548 +0,0 @@
-using System;
-using System.Buffers.Binary;
-using System.Diagnostics;
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using System.Runtime.Intrinsics;
-using System.Runtime.Intrinsics.X86;
-
-namespace Ryujinx.Common
-{
-    public static class XXHash128
-    {
-        private const int StripeLen = 64;
-        private const int AccNb = StripeLen / sizeof(ulong);
-        private const int SecretConsumeRate = 8;
-        private const int SecretLastAccStart = 7;
-        private const int SecretMergeAccsStart = 11;
-        private const int SecretSizeMin = 136;
-        private const int MidSizeStartOffset = 3;
-        private const int MidSizeLastOffset = 17;
-
-        private const uint Prime32_1 = 0x9E3779B1U;
-        private const uint Prime32_2 = 0x85EBCA77U;
-        private const uint Prime32_3 = 0xC2B2AE3DU;
-        private const uint Prime32_4 = 0x27D4EB2FU;
-        private const uint Prime32_5 = 0x165667B1U;
-
-        private const ulong Prime64_1 = 0x9E3779B185EBCA87UL;
-        private const ulong Prime64_2 = 0xC2B2AE3D27D4EB4FUL;
-        private const ulong Prime64_3 = 0x165667B19E3779F9UL;
-        private const ulong Prime64_4 = 0x85EBCA77C2B2AE63UL;
-        private const ulong Prime64_5 = 0x27D4EB2F165667C5UL;
-
-        private static readonly ulong[] _xxh3InitAcc = {
-            Prime32_3,
-            Prime64_1,
-            Prime64_2,
-            Prime64_3,
-            Prime64_4,
-            Prime32_2,
-            Prime64_5,
-            Prime32_1,
-        };
-
-        private static ReadOnlySpan<byte> Xxh3KSecret => new byte[]
-        {
-            0xb8, 0xfe, 0x6c, 0x39, 0x23, 0xa4, 0x4b, 0xbe, 0x7c, 0x01, 0x81, 0x2c, 0xf7, 0x21, 0xad, 0x1c,
-            0xde, 0xd4, 0x6d, 0xe9, 0x83, 0x90, 0x97, 0xdb, 0x72, 0x40, 0xa4, 0xa4, 0xb7, 0xb3, 0x67, 0x1f,
-            0xcb, 0x79, 0xe6, 0x4e, 0xcc, 0xc0, 0xe5, 0x78, 0x82, 0x5a, 0xd0, 0x7d, 0xcc, 0xff, 0x72, 0x21,
-            0xb8, 0x08, 0x46, 0x74, 0xf7, 0x43, 0x24, 0x8e, 0xe0, 0x35, 0x90, 0xe6, 0x81, 0x3a, 0x26, 0x4c,
-            0x3c, 0x28, 0x52, 0xbb, 0x91, 0xc3, 0x00, 0xcb, 0x88, 0xd0, 0x65, 0x8b, 0x1b, 0x53, 0x2e, 0xa3,
-            0x71, 0x64, 0x48, 0x97, 0xa2, 0x0d, 0xf9, 0x4e, 0x38, 0x19, 0xef, 0x46, 0xa9, 0xde, 0xac, 0xd8,
-            0xa8, 0xfa, 0x76, 0x3f, 0xe3, 0x9c, 0x34, 0x3f, 0xf9, 0xdc, 0xbb, 0xc7, 0xc7, 0x0b, 0x4f, 0x1d,
-            0x8a, 0x51, 0xe0, 0x4b, 0xcd, 0xb4, 0x59, 0x31, 0xc8, 0x9f, 0x7e, 0xc9, 0xd9, 0x78, 0x73, 0x64,
-            0xea, 0xc5, 0xac, 0x83, 0x34, 0xd3, 0xeb, 0xc3, 0xc5, 0x81, 0xa0, 0xff, 0xfa, 0x13, 0x63, 0xeb,
-            0x17, 0x0d, 0xdd, 0x51, 0xb7, 0xf0, 0xda, 0x49, 0xd3, 0x16, 0x55, 0x26, 0x29, 0xd4, 0x68, 0x9e,
-            0x2b, 0x16, 0xbe, 0x58, 0x7d, 0x47, 0xa1, 0xfc, 0x8f, 0xf8, 0xb8, 0xd1, 0x7a, 0xd0, 0x31, 0xce,
-            0x45, 0xcb, 0x3a, 0x8f, 0x95, 0x16, 0x04, 0x28, 0xaf, 0xd7, 0xfb, 0xca, 0xbb, 0x4b, 0x40, 0x7e,
-        };
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Mult32To64(ulong x, ulong y)
-        {
-            return (uint)x * (ulong)(uint)y;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Hash128 Mult64To128(ulong lhs, ulong rhs)
-        {
-            ulong high = Math.BigMul(lhs, rhs, out ulong low);
-
-            return new Hash128
-            {
-                Low = low,
-                High = high,
-            };
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Mul128Fold64(ulong lhs, ulong rhs)
-        {
-            Hash128 product = Mult64To128(lhs, rhs);
-
-            return product.Low ^ product.High;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong XorShift64(ulong v64, int shift)
-        {
-            Debug.Assert(0 <= shift && shift < 64);
-
-            return v64 ^ (v64 >> shift);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Xxh3Avalanche(ulong h64)
-        {
-            h64 = XorShift64(h64, 37);
-            h64 *= 0x165667919E3779F9UL;
-            h64 = XorShift64(h64, 32);
-
-            return h64;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Xxh64Avalanche(ulong h64)
-        {
-            h64 ^= h64 >> 33;
-            h64 *= Prime64_2;
-            h64 ^= h64 >> 29;
-            h64 *= Prime64_3;
-            h64 ^= h64 >> 32;
-
-            return h64;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe static void Xxh3Accumulate512(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
-        {
-            if (Avx2.IsSupported)
-            {
-                fixed (ulong* pAcc = acc)
-                {
-                    fixed (byte* pInput = input, pSecret = secret)
-                    {
-                        Vector256<ulong>* xAcc = (Vector256<ulong>*)pAcc;
-                        Vector256<byte>* xInput = (Vector256<byte>*)pInput;
-                        Vector256<byte>* xSecret = (Vector256<byte>*)pSecret;
-
-                        for (ulong i = 0; i < StripeLen / 32; i++)
-                        {
-                            Vector256<byte> dataVec = xInput[i];
-                            Vector256<byte> keyVec = xSecret[i];
-                            Vector256<byte> dataKey = Avx2.Xor(dataVec, keyVec);
-                            Vector256<uint> dataKeyLo = Avx2.Shuffle(dataKey.AsUInt32(), 0b00110001);
-                            Vector256<ulong> product = Avx2.Multiply(dataKey.AsUInt32(), dataKeyLo);
-                            Vector256<uint> dataSwap = Avx2.Shuffle(dataVec.AsUInt32(), 0b01001110);
-                            Vector256<ulong> sum = Avx2.Add(xAcc[i], dataSwap.AsUInt64());
-                            xAcc[i] = Avx2.Add(product, sum);
-                        }
-                    }
-                }
-            }
-            else if (Sse2.IsSupported)
-            {
-                fixed (ulong* pAcc = acc)
-                {
-                    fixed (byte* pInput = input, pSecret = secret)
-                    {
-                        Vector128<ulong>* xAcc = (Vector128<ulong>*)pAcc;
-                        Vector128<byte>* xInput = (Vector128<byte>*)pInput;
-                        Vector128<byte>* xSecret = (Vector128<byte>*)pSecret;
-
-                        for (ulong i = 0; i < StripeLen / 16; i++)
-                        {
-                            Vector128<byte> dataVec = xInput[i];
-                            Vector128<byte> keyVec = xSecret[i];
-                            Vector128<byte> dataKey = Sse2.Xor(dataVec, keyVec);
-                            Vector128<uint> dataKeyLo = Sse2.Shuffle(dataKey.AsUInt32(), 0b00110001);
-                            Vector128<ulong> product = Sse2.Multiply(dataKey.AsUInt32(), dataKeyLo);
-                            Vector128<uint> dataSwap = Sse2.Shuffle(dataVec.AsUInt32(), 0b01001110);
-                            Vector128<ulong> sum = Sse2.Add(xAcc[i], dataSwap.AsUInt64());
-                            xAcc[i] = Sse2.Add(product, sum);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (int i = 0; i < AccNb; i++)
-                {
-                    ulong dataVal = BinaryPrimitives.ReadUInt64LittleEndian(input[(i * sizeof(ulong))..]);
-                    ulong dataKey = dataVal ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[(i * sizeof(ulong))..]);
-                    acc[i ^ 1] += dataVal;
-                    acc[i] += Mult32To64((uint)dataKey, dataKey >> 32);
-                }
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe static void Xxh3ScrambleAcc(Span<ulong> acc, ReadOnlySpan<byte> secret)
-        {
-            if (Avx2.IsSupported)
-            {
-                fixed (ulong* pAcc = acc)
-                {
-                    fixed (byte* pSecret = secret)
-                    {
-                        Vector256<uint> prime32 = Vector256.Create(Prime32_1);
-                        Vector256<ulong>* xAcc = (Vector256<ulong>*)pAcc;
-                        Vector256<byte>* xSecret = (Vector256<byte>*)pSecret;
-
-                        for (ulong i = 0; i < StripeLen / 32; i++)
-                        {
-                            Vector256<ulong> accVec = xAcc[i];
-                            Vector256<ulong> shifted = Avx2.ShiftRightLogical(accVec, 47);
-                            Vector256<ulong> dataVec = Avx2.Xor(accVec, shifted);
-
-                            Vector256<byte> keyVec = xSecret[i];
-                            Vector256<uint> dataKey = Avx2.Xor(dataVec.AsUInt32(), keyVec.AsUInt32());
-
-                            Vector256<uint> dataKeyHi = Avx2.Shuffle(dataKey.AsUInt32(), 0b00110001);
-                            Vector256<ulong> prodLo = Avx2.Multiply(dataKey, prime32);
-                            Vector256<ulong> prodHi = Avx2.Multiply(dataKeyHi, prime32);
-
-                            xAcc[i] = Avx2.Add(prodLo, Avx2.ShiftLeftLogical(prodHi, 32));
-                        }
-                    }
-                }
-            }
-            else if (Sse2.IsSupported)
-            {
-                fixed (ulong* pAcc = acc)
-                {
-                    fixed (byte* pSecret = secret)
-                    {
-                        Vector128<uint> prime32 = Vector128.Create(Prime32_1);
-                        Vector128<ulong>* xAcc = (Vector128<ulong>*)pAcc;
-                        Vector128<byte>* xSecret = (Vector128<byte>*)pSecret;
-
-                        for (ulong i = 0; i < StripeLen / 16; i++)
-                        {
-                            Vector128<ulong> accVec = xAcc[i];
-                            Vector128<ulong> shifted = Sse2.ShiftRightLogical(accVec, 47);
-                            Vector128<ulong> dataVec = Sse2.Xor(accVec, shifted);
-
-                            Vector128<byte> keyVec = xSecret[i];
-                            Vector128<uint> dataKey = Sse2.Xor(dataVec.AsUInt32(), keyVec.AsUInt32());
-
-                            Vector128<uint> dataKeyHi = Sse2.Shuffle(dataKey.AsUInt32(), 0b00110001);
-                            Vector128<ulong> prodLo = Sse2.Multiply(dataKey, prime32);
-                            Vector128<ulong> prodHi = Sse2.Multiply(dataKeyHi, prime32);
-
-                            xAcc[i] = Sse2.Add(prodLo, Sse2.ShiftLeftLogical(prodHi, 32));
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (int i = 0; i < AccNb; i++)
-                {
-                    ulong key64 = BinaryPrimitives.ReadUInt64LittleEndian(secret[(i * sizeof(ulong))..]);
-                    ulong acc64 = acc[i];
-                    acc64 = XorShift64(acc64, 47);
-                    acc64 ^= key64;
-                    acc64 *= Prime32_1;
-                    acc[i] = acc64;
-                }
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void Xxh3Accumulate(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, int nbStripes)
-        {
-            for (int n = 0; n < nbStripes; n++)
-            {
-                ReadOnlySpan<byte> inData = input[(n * StripeLen)..];
-                Xxh3Accumulate512(acc, inData, secret[(n * SecretConsumeRate)..]);
-            }
-        }
-
-        private static void Xxh3HashLongInternalLoop(Span<ulong> acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
-        {
-            int nbStripesPerBlock = (secret.Length - StripeLen) / SecretConsumeRate;
-            int blockLen = StripeLen * nbStripesPerBlock;
-            int nbBlocks = (input.Length - 1) / blockLen;
-
-            Debug.Assert(secret.Length >= SecretSizeMin);
-
-            for (int n = 0; n < nbBlocks; n++)
-            {
-                Xxh3Accumulate(acc, input[(n * blockLen)..], secret, nbStripesPerBlock);
-                Xxh3ScrambleAcc(acc, secret[^StripeLen..]);
-            }
-
-            Debug.Assert(input.Length > StripeLen);
-
-            int nbStripes = (input.Length - 1 - (blockLen * nbBlocks)) / StripeLen;
-            Debug.Assert(nbStripes <= (secret.Length / SecretConsumeRate));
-            Xxh3Accumulate(acc, input[(nbBlocks * blockLen)..], secret, nbStripes);
-
-            ReadOnlySpan<byte> p = input[^StripeLen..];
-            Xxh3Accumulate512(acc, p, secret[(secret.Length - StripeLen - SecretLastAccStart)..]);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Xxh3Mix2Accs(Span<ulong> acc, ReadOnlySpan<byte> secret)
-        {
-            return Mul128Fold64(
-                acc[0] ^ BinaryPrimitives.ReadUInt64LittleEndian(secret),
-                acc[1] ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[8..]));
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ulong Xxh3MergeAccs(Span<ulong> acc, ReadOnlySpan<byte> secret, ulong start)
-        {
-            ulong result64 = start;
-
-            for (int i = 0; i < 4; i++)
-            {
-                result64 += Xxh3Mix2Accs(acc[(2 * i)..], secret[(16 * i)..]);
-            }
-
-            return Xxh3Avalanche(result64);
-        }
-
-        [SkipLocalsInit]
-        private static Hash128 Xxh3HashLong128bInternal(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret)
-        {
-            Span<ulong> acc = stackalloc ulong[AccNb];
-            _xxh3InitAcc.CopyTo(acc);
-
-            Xxh3HashLongInternalLoop(acc, input, secret);
-
-            Debug.Assert(acc.Length == 8);
-            Debug.Assert(secret.Length >= acc.Length * sizeof(ulong) + SecretMergeAccsStart);
-
-            return new Hash128
-            {
-                Low = Xxh3MergeAccs(acc, secret[SecretMergeAccsStart..], (ulong)input.Length * Prime64_1),
-                High = Xxh3MergeAccs(
-                    acc,
-                    secret[(secret.Length - acc.Length * sizeof(ulong) - SecretMergeAccsStart)..],
-                    ~((ulong)input.Length * Prime64_2)),
-            };
-        }
-
-        private static Hash128 Xxh3Len1To3128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(1 <= input.Length && input.Length <= 3);
-
-            byte c1 = input[0];
-            byte c2 = input[input.Length >> 1];
-            byte c3 = input[^1];
-
-            uint combinedL = ((uint)c1 << 16) | ((uint)c2 << 24) | c3 | ((uint)input.Length << 8);
-            uint combinedH = BitOperations.RotateLeft(BinaryPrimitives.ReverseEndianness(combinedL), 13);
-            ulong bitFlipL = (BinaryPrimitives.ReadUInt32LittleEndian(secret) ^ BinaryPrimitives.ReadUInt32LittleEndian(secret[4..])) + seed;
-            ulong bitFlipH = (BinaryPrimitives.ReadUInt32LittleEndian(secret[8..]) ^ BinaryPrimitives.ReadUInt32LittleEndian(secret[12..])) - seed;
-            ulong keyedLo = combinedL ^ bitFlipL;
-            ulong keyedHi = combinedH ^ bitFlipH;
-
-            return new Hash128
-            {
-                Low = Xxh64Avalanche(keyedLo),
-                High = Xxh64Avalanche(keyedHi),
-            };
-        }
-
-        private static Hash128 Xxh3Len4To8128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(4 <= input.Length && input.Length <= 8);
-
-            seed ^= BinaryPrimitives.ReverseEndianness((uint)seed) << 32;
-
-            uint inputLo = BinaryPrimitives.ReadUInt32LittleEndian(input);
-            uint inputHi = BinaryPrimitives.ReadUInt32LittleEndian(input[^4..]);
-            ulong input64 = inputLo + ((ulong)inputHi << 32);
-            ulong bitFlip = (BinaryPrimitives.ReadUInt64LittleEndian(secret[16..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[24..])) + seed;
-            ulong keyed = input64 ^ bitFlip;
-
-            Hash128 m128 = Mult64To128(keyed, Prime64_1 + ((ulong)input.Length << 2));
-
-            m128.High += m128.Low << 1;
-            m128.Low ^= m128.High >> 3;
-
-            m128.Low = XorShift64(m128.Low, 35);
-            m128.Low *= 0x9FB21C651E98DF25UL;
-            m128.Low = XorShift64(m128.Low, 28);
-            m128.High = Xxh3Avalanche(m128.High);
-
-            return m128;
-        }
-
-        private static Hash128 Xxh3Len9To16128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(9 <= input.Length && input.Length <= 16);
-
-            ulong bitFlipL = (BinaryPrimitives.ReadUInt64LittleEndian(secret[32..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[40..])) - seed;
-            ulong bitFlipH = (BinaryPrimitives.ReadUInt64LittleEndian(secret[48..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[56..])) + seed;
-            ulong inputLo = BinaryPrimitives.ReadUInt64LittleEndian(input);
-            ulong inputHi = BinaryPrimitives.ReadUInt64LittleEndian(input[^8..]);
-
-            Hash128 m128 = Mult64To128(inputLo ^ inputHi ^ bitFlipL, Prime64_1);
-            m128.Low += ((ulong)input.Length - 1) << 54;
-            inputHi ^= bitFlipH;
-            m128.High += inputHi + Mult32To64((uint)inputHi, Prime32_2 - 1);
-            m128.Low ^= BinaryPrimitives.ReverseEndianness(m128.High);
-
-            Hash128 h128 = Mult64To128(m128.Low, Prime64_2);
-            h128.High += m128.High * Prime64_2;
-            h128.Low = Xxh3Avalanche(h128.Low);
-            h128.High = Xxh3Avalanche(h128.High);
-
-            return h128;
-        }
-
-        private static Hash128 Xxh3Len0To16128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(input.Length <= 16);
-
-            if (input.Length > 8)
-            {
-                return Xxh3Len9To16128b(input, secret, seed);
-            }
-
-            if (input.Length >= 4)
-            {
-                return Xxh3Len4To8128b(input, secret, seed);
-            }
-
-            if (input.Length != 0)
-            {
-                return Xxh3Len1To3128b(input, secret, seed);
-            }
-
-            Hash128 h128 = new();
-            ulong bitFlipL = BinaryPrimitives.ReadUInt64LittleEndian(secret[64..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[72..]);
-            ulong bitFlipH = BinaryPrimitives.ReadUInt64LittleEndian(secret[80..]) ^ BinaryPrimitives.ReadUInt64LittleEndian(secret[88..]);
-            h128.Low = Xxh64Avalanche(seed ^ bitFlipL);
-            h128.High = Xxh64Avalanche(seed ^ bitFlipH);
-
-            return h128;
-        }
-
-        private static ulong Xxh3Mix16b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            ulong inputLo = BinaryPrimitives.ReadUInt64LittleEndian(input);
-            ulong inputHi = BinaryPrimitives.ReadUInt64LittleEndian(input[8..]);
-
-            return Mul128Fold64(
-                inputLo ^ (BinaryPrimitives.ReadUInt64LittleEndian(secret) + seed),
-                inputHi ^ (BinaryPrimitives.ReadUInt64LittleEndian(secret[8..]) - seed));
-        }
-
-        private static Hash128 Xxh128Mix32b(Hash128 acc, ReadOnlySpan<byte> input, ReadOnlySpan<byte> input2, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            acc.Low += Xxh3Mix16b(input, secret, seed);
-            acc.Low ^= BinaryPrimitives.ReadUInt64LittleEndian(input2) + BinaryPrimitives.ReadUInt64LittleEndian(input2[8..]);
-            acc.High += Xxh3Mix16b(input2, secret[16..], seed);
-            acc.High ^= BinaryPrimitives.ReadUInt64LittleEndian(input) + BinaryPrimitives.ReadUInt64LittleEndian(input[8..]);
-
-            return acc;
-        }
-
-        private static Hash128 Xxh3Len17To128128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(secret.Length >= SecretSizeMin);
-            Debug.Assert(16 < input.Length && input.Length <= 128);
-
-            Hash128 acc = new()
-            {
-                Low = (ulong)input.Length * Prime64_1,
-                High = 0,
-            };
-
-            if (input.Length > 32)
-            {
-                if (input.Length > 64)
-                {
-                    if (input.Length > 96)
-                    {
-                        acc = Xxh128Mix32b(acc, input[48..], input[^64..], secret[96..], seed);
-                    }
-                    acc = Xxh128Mix32b(acc, input[32..], input[^48..], secret[64..], seed);
-                }
-                acc = Xxh128Mix32b(acc, input[16..], input[^32..], secret[32..], seed);
-            }
-            acc = Xxh128Mix32b(acc, input, input[^16..], secret, seed);
-
-            Hash128 h128 = new()
-            {
-                Low = acc.Low + acc.High,
-                High = acc.Low * Prime64_1 + acc.High * Prime64_4 + ((ulong)input.Length - seed) * Prime64_2,
-            };
-            h128.Low = Xxh3Avalanche(h128.Low);
-            h128.High = 0UL - Xxh3Avalanche(h128.High);
-
-            return h128;
-        }
-
-        private static Hash128 Xxh3Len129To240128b(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(secret.Length >= SecretSizeMin);
-            Debug.Assert(128 < input.Length && input.Length <= 240);
-
-            Hash128 acc = new();
-
-            int nbRounds = input.Length / 32;
-            acc.Low = (ulong)input.Length * Prime64_1;
-            acc.High = 0;
-
-            for (int i = 0; i < 4; i++)
-            {
-                acc = Xxh128Mix32b(acc, input[(32 * i)..], input[(32 * i + 16)..], secret[(32 * i)..], seed);
-            }
-
-            acc.Low = Xxh3Avalanche(acc.Low);
-            acc.High = Xxh3Avalanche(acc.High);
-            Debug.Assert(nbRounds >= 4);
-
-            for (int i = 4; i < nbRounds; i++)
-            {
-                acc = Xxh128Mix32b(acc, input[(32 * i)..], input[(32 * i + 16)..], secret[(MidSizeStartOffset + 32 * (i - 4))..], seed);
-            }
-
-            acc = Xxh128Mix32b(acc, input[^16..], input[^32..], secret[(SecretSizeMin - MidSizeLastOffset - 16)..], 0UL - seed);
-
-            Hash128 h128 = new()
-            {
-                Low = acc.Low + acc.High,
-                High = acc.Low * Prime64_1 + acc.High * Prime64_4 + ((ulong)input.Length - seed) * Prime64_2,
-            };
-            h128.Low = Xxh3Avalanche(h128.Low);
-            h128.High = 0UL - Xxh3Avalanche(h128.High);
-
-            return h128;
-        }
-
-        private static Hash128 Xxh3128bitsInternal(ReadOnlySpan<byte> input, ReadOnlySpan<byte> secret, ulong seed)
-        {
-            Debug.Assert(secret.Length >= SecretSizeMin);
-
-            if (input.Length <= 16)
-            {
-                return Xxh3Len0To16128b(input, secret, seed);
-            }
-
-            if (input.Length <= 128)
-            {
-                return Xxh3Len17To128128b(input, secret, seed);
-            }
-
-            if (input.Length <= 240)
-            {
-                return Xxh3Len129To240128b(input, secret, seed);
-            }
-
-            return Xxh3HashLong128bInternal(input, secret);
-        }
-
-        public static Hash128 ComputeHash(ReadOnlySpan<byte> input)
-        {
-            return Xxh3128bitsInternal(input, Xxh3KSecret, 0UL);
-        }
-    }
-}

src/Ryujinx.Graphics.GAL/ComputeSize.cs

@@ -1,18 +0,0 @@
-namespace Ryujinx.Graphics.GAL
-{
-    public readonly struct ComputeSize
-    {
-        public readonly static ComputeSize VtgAsCompute = new ComputeSize(32, 32, 1);
-
-        public readonly int X;
-        public readonly int Y;
-        public readonly int Z;
-
-        public ComputeSize(int x, int y, int z)
-        {
-            X = x;
-            Y = y;
-            Z = z;
-        }
-    }
-}

src/Ryujinx.Graphics.GAL/Format.cs

@@ -339,84 +339,6 @@ namespace Ryujinx.Graphics.GAL
             return 1;
         }
 
-        /// <summary>
-        /// Get bytes per element for this format.
-        /// </summary>
-        /// <param name="format">Texture format</param>
-        /// <returns>Byte size for an element of this format (pixel, vertex attribute, etc)</returns>
-        public static int GetBytesPerElement(this Format format)
-        {
-            int scalarSize = format.GetScalarSize();
-
-            switch (format)
-            {
-                case Format.R8G8Unorm:
-                case Format.R8G8Snorm:
-                case Format.R8G8Uint:
-                case Format.R8G8Sint:
-                case Format.R8G8Uscaled:
-                case Format.R8G8Sscaled:
-                case Format.R16G16Float:
-                case Format.R16G16Unorm:
-                case Format.R16G16Snorm:
-                case Format.R16G16Uint:
-                case Format.R16G16Sint:
-                case Format.R16G16Uscaled:
-                case Format.R16G16Sscaled:
-                case Format.R32G32Float:
-                case Format.R32G32Uint:
-                case Format.R32G32Sint:
-                case Format.R32G32Uscaled:
-                case Format.R32G32Sscaled:
-                    return 2 * scalarSize;
-
-                case Format.R8G8B8Unorm:
-                case Format.R8G8B8Snorm:
-                case Format.R8G8B8Uint:
-                case Format.R8G8B8Sint:
-                case Format.R8G8B8Uscaled:
-                case Format.R8G8B8Sscaled:
-                case Format.R16G16B16Float:
-                case Format.R16G16B16Unorm:
-                case Format.R16G16B16Snorm:
-                case Format.R16G16B16Uint:
-                case Format.R16G16B16Sint:
-                case Format.R16G16B16Uscaled:
-                case Format.R16G16B16Sscaled:
-                case Format.R32G32B32Float:
-                case Format.R32G32B32Uint:
-                case Format.R32G32B32Sint:
-                case Format.R32G32B32Uscaled:
-                case Format.R32G32B32Sscaled:
-                    return 3 * scalarSize;
-
-                case Format.R8G8B8A8Unorm:
-                case Format.R8G8B8A8Snorm:
-                case Format.R8G8B8A8Uint:
-                case Format.R8G8B8A8Sint:
-                case Format.R8G8B8A8Srgb:
-                case Format.R8G8B8A8Uscaled:
-                case Format.R8G8B8A8Sscaled:
-                case Format.B8G8R8A8Unorm:
-                case Format.B8G8R8A8Srgb:
-                case Format.R16G16B16A16Float:
-                case Format.R16G16B16A16Unorm:
-                case Format.R16G16B16A16Snorm:
-                case Format.R16G16B16A16Uint:
-                case Format.R16G16B16A16Sint:
-                case Format.R16G16B16A16Uscaled:
-                case Format.R16G16B16A16Sscaled:
-                case Format.R32G32B32A32Float:
-                case Format.R32G32B32A32Uint:
-                case Format.R32G32B32A32Sint:
-                case Format.R32G32B32A32Uscaled:
-                case Format.R32G32B32A32Sscaled:
-                    return 4 * scalarSize;
-            }
-
-            return scalarSize;
-        }
-
         /// <summary>
         /// Checks if the texture format is a depth or depth-stencil format.
         /// </summary>

src/Ryujinx.Graphics.GAL/ShaderInfo.cs

@@ -4,22 +4,23 @@ namespace Ryujinx.Graphics.GAL
     {
         public int FragmentOutputMap { get; }
         public ResourceLayout ResourceLayout { get; }
-        public ComputeSize ComputeLocalSize { get; }
         public ProgramPipelineState? State { get; }
         public bool FromCache { get; set; }
 
-        public ShaderInfo(
-            int fragmentOutputMap,
-            ResourceLayout resourceLayout,
-            ComputeSize computeLocalSize,
-            ProgramPipelineState? state,
-            bool fromCache = false)
+        public ShaderInfo(int fragmentOutputMap, ResourceLayout resourceLayout, ProgramPipelineState state, bool fromCache = false)
         {
             FragmentOutputMap = fragmentOutputMap;
             ResourceLayout = resourceLayout;
-            ComputeLocalSize = computeLocalSize;
             State = state;
             FromCache = fromCache;
         }
+
+        public ShaderInfo(int fragmentOutputMap, ResourceLayout resourceLayout, bool fromCache = false)
+        {
+            FragmentOutputMap = fragmentOutputMap;
+            ResourceLayout = resourceLayout;
+            State = null;
+            FromCache = fromCache;
+        }
     }
 }

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLETable.cs

@@ -96,7 +96,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
             {
                 ref var entry = ref _table[i];
 
-                var hash = XXHash128.ComputeHash(mc[..entry.Length]);
+                var hash = Hash128.ComputeHash(mc[..entry.Length]);
                 if (hash == entry.Hash)
                 {
                     if (IsMacroHLESupported(caps, entry.Name))

src/Ryujinx.Graphics.Gpu/Engine/Threed/Blender/AdvancedBlendFunctions.cs

@@ -223,7 +223,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.Blender
 
             foreach (var entry in Table)
             {
-                Hash128 hash = XXHash128.ComputeHash(MemoryMarshal.Cast<uint, byte>(entry.Code));
+                Hash128 hash = Hash128.ComputeHash(MemoryMarshal.Cast<uint, byte>(entry.Code));
 
                 string[] constants = new string[entry.Constants != null ? entry.Constants.Length : 0];
 

src/Ryujinx.Graphics.Gpu/Engine/Threed/Blender/AdvancedBlendManager.cs

@@ -62,7 +62,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.Blender
                 currentCode = currentCode[..codeLength];
             }
 
-            Hash128 hash = XXHash128.ComputeHash(MemoryMarshal.Cast<uint, byte>(currentCode));
+            Hash128 hash = Hash128.ComputeHash(MemoryMarshal.Cast<uint, byte>(currentCode));
 
             descriptor = default;
 

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeContext.cs

@@ -11,6 +11,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
     /// </summary>
     class VtgAsComputeContext : IDisposable
     {
+        private const int DummyBufferSize = 16;
+
         private readonly GpuContext _context;
 
         /// <summary>
@@ -46,7 +48,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                         1,
                         1,
                         1,
-                        format.GetBytesPerElement(),
+                        1,
                         format,
                         DepthStencilMode.Depth,
                         Target.TextureBuffer,
@@ -519,6 +521,21 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
             return new BufferRange(_geometryIndexDataBuffer.Handle, offset, size, write);
         }
 
+        /// <summary>
+        /// Gets the range for a dummy 16 bytes buffer, filled with zeros.
+        /// </summary>
+        /// <returns>Dummy buffer range</returns>
+        public BufferRange GetDummyBufferRange()
+        {
+            if (_dummyBuffer == BufferHandle.Null)
+            {
+                _dummyBuffer = _context.Renderer.CreateBuffer(DummyBufferSize, BufferAccess.DeviceMemory);
+                _context.Renderer.Pipeline.ClearBuffer(_dummyBuffer, 0, DummyBufferSize, 0);
+            }
+
+            return new BufferRange(_dummyBuffer, 0, DummyBufferSize);
+        }
+
         /// <summary>
         /// Gets the range for a sequential index buffer, with ever incrementing index values.
         /// </summary>

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeState.cs

@@ -147,6 +147,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                 {
                     _vacContext.VertexInfoBufferUpdater.SetVertexStride(index, 0, componentsCount);
                     _vacContext.VertexInfoBufferUpdater.SetVertexOffset(index, 0, 0);
+                    SetDummyBufferTexture(_vertexAsCompute.Reservations, index, format);
                     continue;
                 }
 
@@ -162,12 +163,15 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                 {
                     _vacContext.VertexInfoBufferUpdater.SetVertexStride(index, 0, componentsCount);
                     _vacContext.VertexInfoBufferUpdater.SetVertexOffset(index, 0, 0);
+                    SetDummyBufferTexture(_vertexAsCompute.Reservations, index, format);
                     continue;
                 }
 
                 int vbStride = vertexBuffer.UnpackStride();
                 ulong vbSize = GetVertexBufferSize(address, endAddress.Pack(), vbStride, _indexed, instanced, _firstVertex, _count);
 
+                ulong oldVbSize = vbSize;
+
                 ulong attributeOffset = (ulong)vertexAttrib.UnpackOffset();
                 int componentSize = format.GetScalarSize();
 
@@ -341,6 +345,20 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
             return maxOutputVertices / verticesPerPrimitive;
         }
 
+        /// <summary>
+        /// Binds a dummy buffer as vertex buffer into a buffer texture.
+        /// </summary>
+        /// <param name="reservations">Shader resource binding reservations</param>
+        /// <param name="index">Buffer texture index</param>
+        /// <param name="format">Buffer texture format</param>
+        private readonly void SetDummyBufferTexture(ResourceReservations reservations, int index, Format format)
+        {
+            ITexture bufferTexture = _vacContext.EnsureBufferTexture(index + 2, format);
+            bufferTexture.SetStorage(_vacContext.GetDummyBufferRange());
+
+            _context.Renderer.Pipeline.SetTextureAndSampler(ShaderStage.Compute, reservations.GetVertexBufferTextureBinding(index), bufferTexture, null);
+        }
+
         /// <summary>
         /// Binds a vertex buffer into a buffer texture.
         /// </summary>

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGuestStorage.cs

@@ -453,7 +453,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         /// <returns>Hash of the data</returns>
         private static uint CalcHash(ReadOnlySpan<byte> data)
         {
-            return (uint)XXHash128.ComputeHash(data).Low;
+            return (uint)Hash128.ComputeHash(data).Low;
         }
     }
 }

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -324,11 +324,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
 
                 bool loadHostCache = header.CodeGenVersion == CodeGenVersion;
 
-                if (context.Capabilities.Api == TargetApi.Metal)
-                {
-                    loadHostCache = false;
-                }
-
                 int programIndex = 0;
 
                 DataEntry entry = new();
@@ -397,8 +392,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                                 context,
                                 shaders,
                                 specState.PipelineState,
-                                specState.TransformFeedbackDescriptors != null,
-                                specState.ComputeState.GetLocalSize());
+                                specState.TransformFeedbackDescriptors != null);
 
                             IProgram hostProgram;
 
@@ -635,10 +629,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                 return;
             }
 
-            if (context.Capabilities.Api != TargetApi.Metal)
-            {
-                WriteHostCode(context, hostCode, program.Shaders, streams, timestamp);
-            }
+            WriteHostCode(context, hostCode, program.Shaders, streams, timestamp);
         }
 
         /// <summary>

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -490,12 +490,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
             {
                 ShaderSource[] shaderSources = new ShaderSource[compilation.TranslatedStages.Length];
 
-                ref GpuChannelComputeState computeState = ref compilation.SpecializationState.ComputeState;
-
-                ShaderInfoBuilder shaderInfoBuilder = new(
-                    _context,
-                    compilation.SpecializationState.TransformFeedbackDescriptors != null,
-                    computeLocalSize: computeState.GetLocalSize());
+                ShaderInfoBuilder shaderInfoBuilder = new(_context, compilation.SpecializationState.TransformFeedbackDescriptors != null);
 
                 for (int index = 0; index < compilation.TranslatedStages.Length; index++)
                 {

src/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private readonly GpuAccessorState _state;
         private readonly int _stageIndex;
         private readonly bool _compute;
-        private readonly bool _isOpenGL;
+        private readonly bool _isVulkan;
         private readonly bool _hasGeometryShader;
         private readonly bool _supportsQuads;
 
@@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
             _channel = channel;
             _state = state;
             _stageIndex = stageIndex;
-            _isOpenGL = context.Capabilities.Api == TargetApi.OpenGL;
+            _isVulkan = context.Capabilities.Api == TargetApi.Vulkan;
             _hasGeometryShader = hasGeometryShader;
             _supportsQuads = context.Capabilities.SupportsQuads;
 
@@ -116,10 +116,10 @@ namespace Ryujinx.Graphics.Gpu.Shader
         public GpuGraphicsState QueryGraphicsState()
         {
             return _state.GraphicsState.CreateShaderGraphicsState(
-                _isOpenGL,
+                !_isVulkan,
                 _supportsQuads,
                 _hasGeometryShader,
-                !_isOpenGL || _state.GraphicsState.YNegateEnabled);
+                _isVulkan || _state.GraphicsState.YNegateEnabled);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Graphics.Gpu/Shader/GpuAccessorBase.cs

@@ -55,7 +55,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             int binding;
 
-            if (_context.Capabilities.Api != TargetApi.OpenGL)
+            if (_context.Capabilities.Api == TargetApi.Vulkan)
             {
                 binding = GetBindingFromIndex(index, _context.Capabilities.MaximumUniformBuffersPerStage, "Uniform buffer");
             }
@@ -71,7 +71,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             int binding;
 
-            if (_context.Capabilities.Api != TargetApi.OpenGL)
+            if (_context.Capabilities.Api == TargetApi.Vulkan)
             {
                 if (count == 1)
                 {
@@ -103,7 +103,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             int binding;
 
-            if (_context.Capabilities.Api != TargetApi.OpenGL)
+            if (_context.Capabilities.Api == TargetApi.Vulkan)
             {
                 binding = GetBindingFromIndex(index, _context.Capabilities.MaximumStorageBuffersPerStage, "Storage buffer");
             }
@@ -119,7 +119,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             int binding;
 
-            if (_context.Capabilities.Api != TargetApi.OpenGL)
+            if (_context.Capabilities.Api == TargetApi.Vulkan)
             {
                 if (count == 1)
                 {

src/Ryujinx.Graphics.Gpu/Shader/GpuChannelComputeState.cs

@@ -1,5 +1,3 @@
-using Ryujinx.Graphics.GAL;
-
 namespace Ryujinx.Graphics.Gpu.Shader
 {
     /// <summary>
@@ -63,14 +61,5 @@ namespace Ryujinx.Graphics.Gpu.Shader
             SharedMemorySize = sharedMemorySize;
             HasUnalignedStorageBuffer = hasUnalignedStorageBuffer;
         }
-
-        /// <summary>
-        /// Gets the local group size of the shader in a GAL compatible struct.
-        /// </summary>
-        /// <returns>Local group size</returns>
-        public ComputeSize GetLocalSize()
-        {
-            return new ComputeSize(LocalSizeX, LocalSizeY, LocalSizeZ);
-        }
     }
 }

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -224,10 +224,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
             TranslatedShader translatedShader = TranslateShader(_dumper, channel, translatorContext, cachedGuestCode, asCompute: false);
 
             ShaderSource[] shaderSourcesArray = new ShaderSource[] { CreateShaderSource(translatedShader.Program) };
-            ShaderInfo info = ShaderInfoBuilder.BuildForCompute(
-                _context,
-                translatedShader.Program.Info,
-                computeState.GetLocalSize());
+            ShaderInfo info = ShaderInfoBuilder.BuildForCompute(_context, translatedShader.Program.Info);
             IProgram hostProgram = _context.Renderer.CreateProgram(shaderSourcesArray, info);
 
             cpShader = new CachedShaderProgram(hostProgram, specState, translatedShader.Shader);
@@ -428,8 +425,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
 
                             TranslatorContext lastInVertexPipeline = geometryToCompute ? translatorContexts[4] ?? currentStage : currentStage;
 
-                            (program, ShaderProgramInfo vacInfo) = lastInVertexPipeline.GenerateVertexPassthroughForCompute();
-                            infoBuilder.AddStageInfoVac(vacInfo);
+                            program = lastInVertexPipeline.GenerateVertexPassthroughForCompute();
                         }
                         else
                         {
@@ -534,7 +530,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private ShaderAsCompute CreateHostVertexAsComputeProgram(ShaderProgram program, TranslatorContext context, bool tfEnabled)
         {
             ShaderSource source = new(program.Code, program.BinaryCode, ShaderStage.Compute, program.Language);
-            ShaderInfo info = ShaderInfoBuilder.BuildForVertexAsCompute(_context, program.Info, context.GetVertexAsComputeInfo(), tfEnabled);
+            ShaderInfo info = ShaderInfoBuilder.BuildForVertexAsCompute(_context, program.Info, tfEnabled);
 
             return new(_context.Renderer.CreateProgram(new[] { source }, info), program.Info, context.GetResourceReservations());
         }
@@ -826,19 +822,16 @@ namespace Ryujinx.Graphics.Gpu.Shader
 
         /// <summary>
         /// Creates shader translation options with the requested graphics API and flags.
-        /// The shader language is chosen based on the current configuration and graphics API.
+        /// The shader language is choosen based on the current configuration and graphics API.
         /// </summary>
         /// <param name="api">Target graphics API</param>
         /// <param name="flags">Translation flags</param>
         /// <returns>Translation options</returns>
         private static TranslationOptions CreateTranslationOptions(TargetApi api, TranslationFlags flags)
         {
-            TargetLanguage lang = api switch
-            {
-                TargetApi.OpenGL => TargetLanguage.Glsl,
-                TargetApi.Vulkan => GraphicsConfig.EnableSpirvCompilationOnVulkan ? TargetLanguage.Spirv : TargetLanguage.Glsl,
-                TargetApi.Metal => TargetLanguage.Msl,
-            };
+            TargetLanguage lang = GraphicsConfig.EnableSpirvCompilationOnVulkan && api == TargetApi.Vulkan
+                ? TargetLanguage.Spirv
+                : TargetLanguage.Glsl;
 
             return new TranslationOptions(lang, api, flags);
         }

src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs

@@ -22,7 +22,6 @@ namespace Ryujinx.Graphics.Gpu.Shader
             ResourceStages.Geometry;
 
         private readonly GpuContext _context;
-        private readonly ComputeSize _computeLocalSize;
 
         private int _fragmentOutputMap;
 
@@ -40,11 +39,9 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <param name="context">GPU context that owns the shaders that will be added to the builder</param>
         /// <param name="tfEnabled">Indicates if the graphics shader is used with transform feedback enabled</param>
         /// <param name="vertexAsCompute">Indicates that the vertex shader will be emulated on a compute shader</param>
-        /// <param name="computeLocalSize">Indicates the local thread size for a compute shader</param>
-        public ShaderInfoBuilder(GpuContext context, bool tfEnabled, bool vertexAsCompute = false, ComputeSize computeLocalSize = default)
+        public ShaderInfoBuilder(GpuContext context, bool tfEnabled, bool vertexAsCompute = false)
         {
             _context = context;
-            _computeLocalSize = computeLocalSize;
 
             _fragmentOutputMap = -1;
 
@@ -98,7 +95,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private void PopulateDescriptorAndUsages(ResourceStages stages, ResourceType type, int setIndex, int start, int count, bool write = false)
         {
             AddDescriptor(stages, type, setIndex, start, count);
-            // AddUsage(stages, type, setIndex, start, count, write);
+            AddUsage(stages, type, setIndex, start, count, write);
         }
 
         /// <summary>
@@ -162,25 +159,6 @@ namespace Ryujinx.Graphics.Gpu.Shader
             AddUsage(info.Images, stages, isImage: true);
         }
 
-        public void AddStageInfoVac(ShaderProgramInfo info)
-        {
-            ResourceStages stages = info.Stage switch
-            {
-                ShaderStage.Compute => ResourceStages.Compute,
-                ShaderStage.Vertex => ResourceStages.Vertex,
-                ShaderStage.TessellationControl => ResourceStages.TessellationControl,
-                ShaderStage.TessellationEvaluation => ResourceStages.TessellationEvaluation,
-                ShaderStage.Geometry => ResourceStages.Geometry,
-                ShaderStage.Fragment => ResourceStages.Fragment,
-                _ => ResourceStages.None,
-            };
-
-            AddUsage(info.CBuffers, stages, isStorage: false);
-            AddUsage(info.SBuffers, stages, isStorage: true);
-            AddUsage(info.Textures, stages, isImage: false);
-            AddUsage(info.Images, stages, isImage: true);
-        }
-
         /// <summary>
         /// Adds a resource descriptor to the list of descriptors.
         /// </summary>
@@ -383,7 +361,14 @@ namespace Ryujinx.Graphics.Gpu.Shader
 
             ResourceLayout resourceLayout = new(descriptors.AsReadOnly(), usages.AsReadOnly());
 
-            return new ShaderInfo(_fragmentOutputMap, resourceLayout, _computeLocalSize, pipeline, fromCache);
+            if (pipeline.HasValue)
+            {
+                return new ShaderInfo(_fragmentOutputMap, resourceLayout, pipeline.Value, fromCache);
+            }
+            else
+            {
+                return new ShaderInfo(_fragmentOutputMap, resourceLayout, fromCache);
+            }
         }
 
         /// <summary>
@@ -393,16 +378,14 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <param name="programs">Shaders from the disk cache</param>
         /// <param name="pipeline">Optional pipeline for background compilation</param>
         /// <param name="tfEnabled">Indicates if the graphics shader is used with transform feedback enabled</param>
-        /// <param name="computeLocalSize">Compute local thread size</param>
         /// <returns>Shader information</returns>
         public static ShaderInfo BuildForCache(
             GpuContext context,
             IEnumerable<CachedShaderStage> programs,
             ProgramPipelineState? pipeline,
-            bool tfEnabled,
-            ComputeSize computeLocalSize)
+            bool tfEnabled)
         {
-            ShaderInfoBuilder builder = new(context, tfEnabled, computeLocalSize: computeLocalSize);
+            ShaderInfoBuilder builder = new(context, tfEnabled);
 
             foreach (CachedShaderStage program in programs)
             {
@@ -420,12 +403,11 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// </summary>
         /// <param name="context">GPU context that owns the shader</param>
         /// <param name="info">Compute shader information</param>
-        /// <param name="computeLocalSize">Compute local thread size</param>
         /// <param name="fromCache">True if the compute shader comes from a disk cache, false otherwise</param>
         /// <returns>Shader information</returns>
-        public static ShaderInfo BuildForCompute(GpuContext context, ShaderProgramInfo info, ComputeSize computeLocalSize, bool fromCache = false)
+        public static ShaderInfo BuildForCompute(GpuContext context, ShaderProgramInfo info, bool fromCache = false)
         {
-            ShaderInfoBuilder builder = new(context, tfEnabled: false, vertexAsCompute: false, computeLocalSize: computeLocalSize);
+            ShaderInfoBuilder builder = new(context, tfEnabled: false, vertexAsCompute: false);
 
             builder.AddStageInfo(info);
 
@@ -440,11 +422,10 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <param name="tfEnabled">Indicates if the graphics shader is used with transform feedback enabled</param>
         /// <param name="fromCache">True if the compute shader comes from a disk cache, false otherwise</param>
         /// <returns>Shader information</returns>
-        public static ShaderInfo BuildForVertexAsCompute(GpuContext context, ShaderProgramInfo info, ShaderProgramInfo info2, bool tfEnabled, bool fromCache = false)
+        public static ShaderInfo BuildForVertexAsCompute(GpuContext context, ShaderProgramInfo info, bool tfEnabled, bool fromCache = false)
         {
-            ShaderInfoBuilder builder = new(context, tfEnabled, vertexAsCompute: true, computeLocalSize: ComputeSize.VtgAsCompute);
+            ShaderInfoBuilder builder = new(context, tfEnabled, vertexAsCompute: true);
 
-            builder.AddStageInfoVac(info2);
             builder.AddStageInfo(info, vertexAsCompute: true);
 
             return builder.Build(null, fromCache);

src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs

@@ -743,7 +743,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
                 constantBufferUsePerStageMask &= ~(1 << index);
             }
 
-            if (checkTextures)
+            if (checkTextures && _allTextures.Length > 0)
             {
                 TexturePool pool = channel.TextureManager.GetTexturePool(poolState.TexturePoolGpuVa, poolState.TexturePoolMaximumId);
 

src/Ryujinx.Graphics.Metal/Auto.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.Versioning;
-using System.Threading;
-
-namespace Ryujinx.Graphics.Metal
-{
-    interface IAuto
-    {
-        bool HasCommandBufferDependency(CommandBufferScoped cbs);
-
-        void IncrementReferenceCount();
-        void DecrementReferenceCount(int cbIndex);
-        void DecrementReferenceCount();
-    }
-
-    interface IAutoPrivate : IAuto
-    {
-        void AddCommandBufferDependencies(CommandBufferScoped cbs);
-    }
-
-    [SupportedOSPlatform("macos")]
-    class Auto<T> : IAutoPrivate, IDisposable where T : IDisposable
-    {
-        private int _referenceCount;
-        private T _value;
-
-        private readonly BitMap _cbOwnership;
-        private readonly MultiFenceHolder _waitable;
-
-        private bool _disposed;
-        private bool _destroyed;
-
-        public Auto(T value)
-        {
-            _referenceCount = 1;
-            _value = value;
-            _cbOwnership = new BitMap(CommandBufferPool.MaxCommandBuffers);
-        }
-
-        public Auto(T value, MultiFenceHolder waitable) : this(value)
-        {
-            _waitable = waitable;
-        }
-
-        public T Get(CommandBufferScoped cbs, int offset, int size, bool write = false)
-        {
-            _waitable?.AddBufferUse(cbs.CommandBufferIndex, offset, size, write);
-            return Get(cbs);
-        }
-
-        public T GetUnsafe()
-        {
-            return _value;
-        }
-
-        public T Get(CommandBufferScoped cbs)
-        {
-            if (!_destroyed)
-            {
-                AddCommandBufferDependencies(cbs);
-            }
-
-            return _value;
-        }
-
-        public bool HasCommandBufferDependency(CommandBufferScoped cbs)
-        {
-            return _cbOwnership.IsSet(cbs.CommandBufferIndex);
-        }
-
-        public bool HasRentedCommandBufferDependency(CommandBufferPool cbp)
-        {
-            return _cbOwnership.AnySet();
-        }
-
-        public void AddCommandBufferDependencies(CommandBufferScoped cbs)
-        {
-            // We don't want to add a reference to this object to the command buffer
-            // more than once, so if we detect that the command buffer already has ownership
-            // of this object, then we can just return without doing anything else.
-            if (_cbOwnership.Set(cbs.CommandBufferIndex))
-            {
-                if (_waitable != null)
-                {
-                    cbs.AddWaitable(_waitable);
-                }
-
-                cbs.AddDependant(this);
-            }
-        }
-
-        public bool TryIncrementReferenceCount()
-        {
-            int lastValue;
-            do
-            {
-                lastValue = _referenceCount;
-
-                if (lastValue == 0)
-                {
-                    return false;
-                }
-            }
-            while (Interlocked.CompareExchange(ref _referenceCount, lastValue + 1, lastValue) != lastValue);
-
-            return true;
-        }
-
-        public void IncrementReferenceCount()
-        {
-            if (Interlocked.Increment(ref _referenceCount) == 1)
-            {
-                Interlocked.Decrement(ref _referenceCount);
-                throw new InvalidOperationException("Attempted to increment the reference count of an object that was already destroyed.");
-            }
-        }
-
-        public void DecrementReferenceCount(int cbIndex)
-        {
-            _cbOwnership.Clear(cbIndex);
-            DecrementReferenceCount();
-        }
-
-        public void DecrementReferenceCount()
-        {
-            if (Interlocked.Decrement(ref _referenceCount) == 0)
-            {
-                _value.Dispose();
-                _value = default;
-                _destroyed = true;
-            }
-
-            Debug.Assert(_referenceCount >= 0);
-        }
-
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                DecrementReferenceCount();
-                _disposed = true;
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/BackgroundResources.cs

@@ -1,107 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Collections.Generic;
-using System.Runtime.Versioning;
-using System.Threading;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class BackgroundResource : IDisposable
-    {
-        private readonly MetalRenderer _renderer;
-
-        private CommandBufferPool _pool;
-        private PersistentFlushBuffer _flushBuffer;
-
-        public BackgroundResource(MetalRenderer renderer)
-        {
-            _renderer = renderer;
-        }
-
-        public CommandBufferPool GetPool()
-        {
-            if (_pool == null)
-            {
-                MTLCommandQueue queue = _renderer.BackgroundQueue;
-                _pool = new CommandBufferPool(queue, true);
-                _pool.Initialize(null); // TODO: Proper encoder factory for background render/compute
-            }
-
-            return _pool;
-        }
-
-        public PersistentFlushBuffer GetFlushBuffer()
-        {
-            _flushBuffer ??= new PersistentFlushBuffer(_renderer);
-
-            return _flushBuffer;
-        }
-
-        public void Dispose()
-        {
-            _pool?.Dispose();
-            _flushBuffer?.Dispose();
-        }
-    }
-
-    [SupportedOSPlatform("macos")]
-    class BackgroundResources : IDisposable
-    {
-        private readonly MetalRenderer _renderer;
-
-        private readonly Dictionary<Thread, BackgroundResource> _resources;
-
-        public BackgroundResources(MetalRenderer renderer)
-        {
-            _renderer = renderer;
-
-            _resources = new Dictionary<Thread, BackgroundResource>();
-        }
-
-        private void Cleanup()
-        {
-            lock (_resources)
-            {
-                foreach (KeyValuePair<Thread, BackgroundResource> tuple in _resources)
-                {
-                    if (!tuple.Key.IsAlive)
-                    {
-                        tuple.Value.Dispose();
-                        _resources.Remove(tuple.Key);
-                    }
-                }
-            }
-        }
-
-        public BackgroundResource Get()
-        {
-            Thread thread = Thread.CurrentThread;
-
-            lock (_resources)
-            {
-                if (!_resources.TryGetValue(thread, out BackgroundResource resource))
-                {
-                    Cleanup();
-
-                    resource = new BackgroundResource(_renderer);
-
-                    _resources[thread] = resource;
-                }
-
-                return resource;
-            }
-        }
-
-        public void Dispose()
-        {
-            lock (_resources)
-            {
-                foreach (var resource in _resources.Values)
-                {
-                    resource.Dispose();
-                }
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/BitMap.cs

@@ -1,157 +0,0 @@
-namespace Ryujinx.Graphics.Metal
-{
-    readonly struct BitMap
-    {
-        public const int IntSize = 64;
-
-        private const int IntShift = 6;
-        private const int IntMask = IntSize - 1;
-
-        private readonly long[] _masks;
-
-        public BitMap(int count)
-        {
-            _masks = new long[(count + IntMask) / IntSize];
-        }
-
-        public bool AnySet()
-        {
-            for (int i = 0; i < _masks.Length; i++)
-            {
-                if (_masks[i] != 0)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public bool IsSet(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            return (_masks[wordIndex] & wordMask) != 0;
-        }
-
-        public bool IsSet(int start, int end)
-        {
-            if (start == end)
-            {
-                return IsSet(start);
-            }
-
-            int startIndex = start >> IntShift;
-            int startBit = start & IntMask;
-            long startMask = -1L << startBit;
-
-            int endIndex = end >> IntShift;
-            int endBit = end & IntMask;
-            long endMask = (long)(ulong.MaxValue >> (IntMask - endBit));
-
-            if (startIndex == endIndex)
-            {
-                return (_masks[startIndex] & startMask & endMask) != 0;
-            }
-
-            if ((_masks[startIndex] & startMask) != 0)
-            {
-                return true;
-            }
-
-            for (int i = startIndex + 1; i < endIndex; i++)
-            {
-                if (_masks[i] != 0)
-                {
-                    return true;
-                }
-            }
-
-            if ((_masks[endIndex] & endMask) != 0)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        public bool Set(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            if ((_masks[wordIndex] & wordMask) != 0)
-            {
-                return false;
-            }
-
-            _masks[wordIndex] |= wordMask;
-
-            return true;
-        }
-
-        public void SetRange(int start, int end)
-        {
-            if (start == end)
-            {
-                Set(start);
-                return;
-            }
-
-            int startIndex = start >> IntShift;
-            int startBit = start & IntMask;
-            long startMask = -1L << startBit;
-
-            int endIndex = end >> IntShift;
-            int endBit = end & IntMask;
-            long endMask = (long)(ulong.MaxValue >> (IntMask - endBit));
-
-            if (startIndex == endIndex)
-            {
-                _masks[startIndex] |= startMask & endMask;
-            }
-            else
-            {
-                _masks[startIndex] |= startMask;
-
-                for (int i = startIndex + 1; i < endIndex; i++)
-                {
-                    _masks[i] |= -1;
-                }
-
-                _masks[endIndex] |= endMask;
-            }
-        }
-
-        public void Clear(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            _masks[wordIndex] &= ~wordMask;
-        }
-
-        public void Clear()
-        {
-            for (int i = 0; i < _masks.Length; i++)
-            {
-                _masks[i] = 0;
-            }
-        }
-
-        public void ClearInt(int start, int end)
-        {
-            for (int i = start; i <= end; i++)
-            {
-                _masks[i] = 0;
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/BufferHolder.cs

@@ -1,385 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Threading;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class BufferHolder : IDisposable
-    {
-        private CacheByRange<BufferHolder> _cachedConvertedBuffers;
-
-        public int Size { get; }
-
-        private readonly IntPtr _map;
-        private readonly MetalRenderer _renderer;
-        private readonly Pipeline _pipeline;
-
-        private readonly MultiFenceHolder _waitable;
-        private readonly Auto<DisposableBuffer> _buffer;
-
-        private readonly ReaderWriterLockSlim _flushLock;
-        private FenceHolder _flushFence;
-        private int _flushWaiting;
-
-        public BufferHolder(MetalRenderer renderer, Pipeline pipeline, MTLBuffer buffer, int size)
-        {
-            _renderer = renderer;
-            _pipeline = pipeline;
-            _map = buffer.Contents;
-            _waitable = new MultiFenceHolder(size);
-            _buffer = new Auto<DisposableBuffer>(new(buffer), _waitable);
-
-            _flushLock = new ReaderWriterLockSlim();
-
-            Size = size;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer()
-        {
-            return _buffer;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer(bool isWrite)
-        {
-            if (isWrite)
-            {
-                SignalWrite(0, Size);
-            }
-
-            return _buffer;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer(int offset, int size, bool isWrite)
-        {
-            if (isWrite)
-            {
-                SignalWrite(offset, size);
-            }
-
-            return _buffer;
-        }
-
-        public void SignalWrite(int offset, int size)
-        {
-            if (offset == 0 && size == Size)
-            {
-                _cachedConvertedBuffers.Clear();
-            }
-            else
-            {
-                _cachedConvertedBuffers.ClearRange(offset, size);
-            }
-        }
-
-        private void ClearFlushFence()
-        {
-            // Assumes _flushLock is held as writer.
-
-            if (_flushFence != null)
-            {
-                if (_flushWaiting == 0)
-                {
-                    _flushFence.Put();
-                }
-
-                _flushFence = null;
-            }
-        }
-
-        private void WaitForFlushFence()
-        {
-            if (_flushFence == null)
-            {
-                return;
-            }
-
-            // If storage has changed, make sure the fence has been reached so that the data is in place.
-            _flushLock.ExitReadLock();
-            _flushLock.EnterWriteLock();
-
-            if (_flushFence != null)
-            {
-                var fence = _flushFence;
-                Interlocked.Increment(ref _flushWaiting);
-
-                // Don't wait in the lock.
-
-                _flushLock.ExitWriteLock();
-
-                fence.Wait();
-
-                _flushLock.EnterWriteLock();
-
-                if (Interlocked.Decrement(ref _flushWaiting) == 0)
-                {
-                    fence.Put();
-                }
-
-                _flushFence = null;
-            }
-
-            // Assumes the _flushLock is held as reader, returns in same state.
-            _flushLock.ExitWriteLock();
-            _flushLock.EnterReadLock();
-        }
-
-        public PinnedSpan<byte> GetData(int offset, int size)
-        {
-            _flushLock.EnterReadLock();
-
-            WaitForFlushFence();
-
-            Span<byte> result;
-
-            if (_map != IntPtr.Zero)
-            {
-                result = GetDataStorage(offset, size);
-
-                // Need to be careful here, the buffer can't be unmapped while the data is being used.
-                _buffer.IncrementReferenceCount();
-
-                _flushLock.ExitReadLock();
-
-                return PinnedSpan<byte>.UnsafeFromSpan(result, _buffer.DecrementReferenceCount);
-            }
-
-            throw new InvalidOperationException("The buffer is not mapped");
-        }
-
-        public unsafe Span<byte> GetDataStorage(int offset, int size)
-        {
-            int mappingSize = Math.Min(size, Size - offset);
-
-            if (_map != IntPtr.Zero)
-            {
-                return new Span<byte>((void*)(_map + offset), mappingSize);
-            }
-
-            throw new InvalidOperationException("The buffer is not mapped.");
-        }
-
-        public unsafe void SetData(int offset, ReadOnlySpan<byte> data, CommandBufferScoped? cbs = null, bool allowCbsWait = true)
-        {
-            int dataSize = Math.Min(data.Length, Size - offset);
-            if (dataSize == 0)
-            {
-                return;
-            }
-
-            if (_map != IntPtr.Zero)
-            {
-                // If persistently mapped, set the data directly if the buffer is not currently in use.
-                bool isRented = _buffer.HasRentedCommandBufferDependency(_renderer.CommandBufferPool);
-
-                // If the buffer is rented, take a little more time and check if the use overlaps this handle.
-                bool needsFlush = isRented && _waitable.IsBufferRangeInUse(offset, dataSize, false);
-
-                if (!needsFlush)
-                {
-                    WaitForFences(offset, dataSize);
-
-                    data[..dataSize].CopyTo(new Span<byte>((void*)(_map + offset), dataSize));
-
-                    SignalWrite(offset, dataSize);
-
-                    return;
-                }
-            }
-
-            if (cbs != null &&
-                cbs.Value.Encoders.CurrentEncoderType == EncoderType.Render &&
-                !(_buffer.HasCommandBufferDependency(cbs.Value) &&
-                  _waitable.IsBufferRangeInUse(cbs.Value.CommandBufferIndex, offset, dataSize)))
-            {
-                // If the buffer hasn't been used on the command buffer yet, try to preload the data.
-                // This avoids ending and beginning render passes on each buffer data upload.
-
-                cbs = _pipeline.GetPreloadCommandBuffer();
-            }
-
-            if (allowCbsWait)
-            {
-                _renderer.BufferManager.StagingBuffer.PushData(_renderer.CommandBufferPool, cbs, this, offset, data);
-            }
-            else
-            {
-                bool rentCbs = cbs == null;
-                if (rentCbs)
-                {
-                    cbs = _renderer.CommandBufferPool.Rent();
-                }
-
-                if (!_renderer.BufferManager.StagingBuffer.TryPushData(cbs.Value, this, offset, data))
-                {
-                    // Need to do a slow upload.
-                    BufferHolder srcHolder = _renderer.BufferManager.Create(dataSize);
-                    srcHolder.SetDataUnchecked(0, data);
-
-                    var srcBuffer = srcHolder.GetBuffer();
-                    var dstBuffer = this.GetBuffer(true);
-
-                    Copy(cbs.Value, srcBuffer, dstBuffer, 0, offset, dataSize);
-
-                    srcHolder.Dispose();
-                }
-
-                if (rentCbs)
-                {
-                    cbs.Value.Dispose();
-                }
-            }
-        }
-
-        public unsafe void SetDataUnchecked(int offset, ReadOnlySpan<byte> data)
-        {
-            int dataSize = Math.Min(data.Length, Size - offset);
-            if (dataSize == 0)
-            {
-                return;
-            }
-
-            if (_map != IntPtr.Zero)
-            {
-                data[..dataSize].CopyTo(new Span<byte>((void*)(_map + offset), dataSize));
-            }
-        }
-
-        public void SetDataUnchecked<T>(int offset, ReadOnlySpan<T> data) where T : unmanaged
-        {
-            SetDataUnchecked(offset, MemoryMarshal.AsBytes(data));
-        }
-
-        public static void Copy(
-            CommandBufferScoped cbs,
-            Auto<DisposableBuffer> src,
-            Auto<DisposableBuffer> dst,
-            int srcOffset,
-            int dstOffset,
-            int size,
-            bool registerSrcUsage = true)
-        {
-            var srcBuffer = registerSrcUsage ? src.Get(cbs, srcOffset, size).Value : src.GetUnsafe().Value;
-            var dstbuffer = dst.Get(cbs, dstOffset, size, true).Value;
-
-            cbs.Encoders.EnsureBlitEncoder().CopyFromBuffer(
-                srcBuffer,
-                (ulong)srcOffset,
-                dstbuffer,
-                (ulong)dstOffset,
-                (ulong)size);
-        }
-
-        public void WaitForFences()
-        {
-            _waitable.WaitForFences();
-        }
-
-        public void WaitForFences(int offset, int size)
-        {
-            _waitable.WaitForFences(offset, size);
-        }
-
-        private bool BoundToRange(int offset, ref int size)
-        {
-            if (offset >= Size)
-            {
-                return false;
-            }
-
-            size = Math.Min(Size - offset, size);
-
-            return true;
-        }
-
-        public Auto<DisposableBuffer> GetBufferI8ToI16(CommandBufferScoped cbs, int offset, int size)
-        {
-            if (!BoundToRange(offset, ref size))
-            {
-                return null;
-            }
-
-            var key = new I8ToI16CacheKey(_renderer);
-
-            if (!_cachedConvertedBuffers.TryGetValue(offset, size, key, out var holder))
-            {
-                holder = _renderer.BufferManager.Create((size * 2 + 3) & ~3);
-
-                _renderer.HelperShader.ConvertI8ToI16(cbs, this, holder, offset, size);
-
-                key.SetBuffer(holder.GetBuffer());
-
-                _cachedConvertedBuffers.Add(offset, size, key, holder);
-            }
-
-            return holder.GetBuffer();
-        }
-
-        public Auto<DisposableBuffer> GetBufferTopologyConversion(CommandBufferScoped cbs, int offset, int size, IndexBufferPattern pattern, int indexSize)
-        {
-            if (!BoundToRange(offset, ref size))
-            {
-                return null;
-            }
-
-            var key = new TopologyConversionCacheKey(_renderer, pattern, indexSize);
-
-            if (!_cachedConvertedBuffers.TryGetValue(offset, size, key, out var holder))
-            {
-                // The destination index size is always I32.
-
-                int indexCount = size / indexSize;
-
-                int convertedCount = pattern.GetConvertedCount(indexCount);
-
-                holder = _renderer.BufferManager.Create(convertedCount * 4);
-
-                _renderer.HelperShader.ConvertIndexBuffer(cbs, this, holder, pattern, indexSize, offset, indexCount);
-
-                key.SetBuffer(holder.GetBuffer());
-
-                _cachedConvertedBuffers.Add(offset, size, key, holder);
-            }
-
-            return holder.GetBuffer();
-        }
-
-        public bool TryGetCachedConvertedBuffer(int offset, int size, ICacheKey key, out BufferHolder holder)
-        {
-            return _cachedConvertedBuffers.TryGetValue(offset, size, key, out holder);
-        }
-
-        public void AddCachedConvertedBuffer(int offset, int size, ICacheKey key, BufferHolder holder)
-        {
-            _cachedConvertedBuffers.Add(offset, size, key, holder);
-        }
-
-        public void AddCachedConvertedBufferDependency(int offset, int size, ICacheKey key, Dependency dependency)
-        {
-            _cachedConvertedBuffers.AddDependency(offset, size, key, dependency);
-        }
-
-        public void RemoveCachedConvertedBuffer(int offset, int size, ICacheKey key)
-        {
-            _cachedConvertedBuffers.Remove(offset, size, key);
-        }
-
-
-        public void Dispose()
-        {
-            _pipeline.FlushCommandsIfWeightExceeding(_buffer, (ulong)Size);
-
-            _buffer.Dispose();
-            _cachedConvertedBuffers.Dispose();
-
-            _flushLock.EnterWriteLock();
-
-            ClearFlushFence();
-
-            _flushLock.ExitWriteLock();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/BufferManager.cs

@@ -1,237 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    readonly struct ScopedTemporaryBuffer : IDisposable
-    {
-        private readonly BufferManager _bufferManager;
-        private readonly bool _isReserved;
-
-        public readonly BufferRange Range;
-        public readonly BufferHolder Holder;
-
-        public BufferHandle Handle => Range.Handle;
-        public int Offset => Range.Offset;
-
-        public ScopedTemporaryBuffer(BufferManager bufferManager, BufferHolder holder, BufferHandle handle, int offset, int size, bool isReserved)
-        {
-            _bufferManager = bufferManager;
-
-            Range = new BufferRange(handle, offset, size);
-            Holder = holder;
-
-            _isReserved = isReserved;
-        }
-
-        public void Dispose()
-        {
-            if (!_isReserved)
-            {
-                _bufferManager.Delete(Range.Handle);
-            }
-        }
-    }
-
-    [SupportedOSPlatform("macos")]
-    class BufferManager : IDisposable
-    {
-        private readonly IdList<BufferHolder> _buffers;
-
-        private readonly MTLDevice _device;
-        private readonly MetalRenderer _renderer;
-        private readonly Pipeline _pipeline;
-
-        public int BufferCount { get; private set; }
-
-        public StagingBuffer StagingBuffer { get; }
-
-        public BufferManager(MTLDevice device, MetalRenderer renderer, Pipeline pipeline)
-        {
-            _device = device;
-            _renderer = renderer;
-            _pipeline = pipeline;
-            _buffers = new IdList<BufferHolder>();
-
-            StagingBuffer = new StagingBuffer(_renderer, this);
-        }
-
-        public BufferHandle Create(nint pointer, int size)
-        {
-            // TODO: This is the wrong Metal method, we need no-copy which SharpMetal isn't giving us.
-            var buffer = _device.NewBuffer(pointer, (ulong)size, MTLResourceOptions.ResourceStorageModeShared);
-
-            if (buffer == IntPtr.Zero)
-            {
-                Logger.Error?.PrintMsg(LogClass.Gpu, $"Failed to create buffer with size 0x{size:X}, and pointer 0x{pointer:X}.");
-
-                return BufferHandle.Null;
-            }
-
-            var holder = new BufferHolder(_renderer, _pipeline, buffer, size);
-
-            BufferCount++;
-
-            ulong handle64 = (uint)_buffers.Add(holder);
-
-            return Unsafe.As<ulong, BufferHandle>(ref handle64);
-        }
-
-        public BufferHandle CreateWithHandle(int size)
-        {
-            return CreateWithHandle(size, out _);
-        }
-
-        public BufferHandle CreateWithHandle(int size, out BufferHolder holder)
-        {
-            holder = Create(size);
-
-            if (holder == null)
-            {
-                return BufferHandle.Null;
-            }
-
-            BufferCount++;
-
-            ulong handle64 = (uint)_buffers.Add(holder);
-
-            return Unsafe.As<ulong, BufferHandle>(ref handle64);
-        }
-
-        public ScopedTemporaryBuffer ReserveOrCreate(CommandBufferScoped cbs, int size)
-        {
-            StagingBufferReserved? result = StagingBuffer.TryReserveData(cbs, size);
-
-            if (result.HasValue)
-            {
-                return new ScopedTemporaryBuffer(this, result.Value.Buffer, StagingBuffer.Handle, result.Value.Offset, result.Value.Size, true);
-            }
-            else
-            {
-                // Create a temporary buffer.
-                BufferHandle handle = CreateWithHandle(size, out BufferHolder holder);
-
-                return new ScopedTemporaryBuffer(this, holder, handle, 0, size, false);
-            }
-        }
-
-        public BufferHolder Create(int size)
-        {
-            var buffer = _device.NewBuffer((ulong)size, MTLResourceOptions.ResourceStorageModeShared);
-
-            if (buffer != IntPtr.Zero)
-            {
-                return new BufferHolder(_renderer, _pipeline, buffer, size);
-            }
-
-            Logger.Error?.PrintMsg(LogClass.Gpu, $"Failed to create buffer with size 0x{size:X}.");
-
-            return null;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer(BufferHandle handle, bool isWrite, out int size)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                size = holder.Size;
-                return holder.GetBuffer(isWrite);
-            }
-
-            size = 0;
-            return null;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer(BufferHandle handle, int offset, int size, bool isWrite)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                return holder.GetBuffer(offset, size, isWrite);
-            }
-
-            return null;
-        }
-
-        public Auto<DisposableBuffer> GetBuffer(BufferHandle handle, bool isWrite)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                return holder.GetBuffer(isWrite);
-            }
-
-            return null;
-        }
-
-        public Auto<DisposableBuffer> GetBufferI8ToI16(CommandBufferScoped cbs, BufferHandle handle, int offset, int size)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                return holder.GetBufferI8ToI16(cbs, offset, size);
-            }
-
-            return null;
-        }
-
-        public Auto<DisposableBuffer> GetBufferTopologyConversion(CommandBufferScoped cbs, BufferHandle handle, int offset, int size, IndexBufferPattern pattern, int indexSize)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                return holder.GetBufferTopologyConversion(cbs, offset, size, pattern, indexSize);
-            }
-
-            return null;
-        }
-
-        public PinnedSpan<byte> GetData(BufferHandle handle, int offset, int size)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                return holder.GetData(offset, size);
-            }
-
-            return new PinnedSpan<byte>();
-        }
-
-        public void SetData<T>(BufferHandle handle, int offset, ReadOnlySpan<T> data) where T : unmanaged
-        {
-            SetData(handle, offset, MemoryMarshal.Cast<T, byte>(data), null);
-        }
-
-        public void SetData(BufferHandle handle, int offset, ReadOnlySpan<byte> data, CommandBufferScoped? cbs)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                holder.SetData(offset, data, cbs);
-            }
-        }
-
-        public void Delete(BufferHandle handle)
-        {
-            if (TryGetBuffer(handle, out var holder))
-            {
-                holder.Dispose();
-                _buffers.Remove((int)Unsafe.As<BufferHandle, ulong>(ref handle));
-            }
-        }
-
-        private bool TryGetBuffer(BufferHandle handle, out BufferHolder holder)
-        {
-            return _buffers.TryGetValue((int)Unsafe.As<BufferHandle, ulong>(ref handle), out holder);
-        }
-
-        public void Dispose()
-        {
-            StagingBuffer.Dispose();
-
-            foreach (var buffer in _buffers)
-            {
-                buffer.Dispose();
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/BufferUsageBitmap.cs

@@ -1,85 +0,0 @@
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    internal class BufferUsageBitmap
-    {
-        private readonly BitMap _bitmap;
-        private readonly int _size;
-        private readonly int _granularity;
-        private readonly int _bits;
-        private readonly int _writeBitOffset;
-
-        private readonly int _intsPerCb;
-        private readonly int _bitsPerCb;
-
-        public BufferUsageBitmap(int size, int granularity)
-        {
-            _size = size;
-            _granularity = granularity;
-
-            // There are two sets of bits - one for read tracking, and the other for write.
-            int bits = (size + (granularity - 1)) / granularity;
-            _writeBitOffset = bits;
-            _bits = bits << 1;
-
-            _intsPerCb = (_bits + (BitMap.IntSize - 1)) / BitMap.IntSize;
-            _bitsPerCb = _intsPerCb * BitMap.IntSize;
-
-            _bitmap = new BitMap(_bitsPerCb * CommandBufferPool.MaxCommandBuffers);
-        }
-
-        public void Add(int cbIndex, int offset, int size, bool write)
-        {
-            if (size == 0)
-            {
-                return;
-            }
-
-            // Some usages can be out of bounds (vertex buffer on amd), so bound if necessary.
-            if (offset + size > _size)
-            {
-                size = _size - offset;
-            }
-
-            int cbBase = cbIndex * _bitsPerCb + (write ? _writeBitOffset : 0);
-            int start = cbBase + offset / _granularity;
-            int end = cbBase + (offset + size - 1) / _granularity;
-
-            _bitmap.SetRange(start, end);
-        }
-
-        public bool OverlapsWith(int cbIndex, int offset, int size, bool write = false)
-        {
-            if (size == 0)
-            {
-                return false;
-            }
-
-            int cbBase = cbIndex * _bitsPerCb + (write ? _writeBitOffset : 0);
-            int start = cbBase + offset / _granularity;
-            int end = cbBase + (offset + size - 1) / _granularity;
-
-            return _bitmap.IsSet(start, end);
-        }
-
-        public bool OverlapsWith(int offset, int size, bool write)
-        {
-            for (int i = 0; i < CommandBufferPool.MaxCommandBuffers; i++)
-            {
-                if (OverlapsWith(i, offset, size, write))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public void Clear(int cbIndex)
-        {
-            _bitmap.ClearInt(cbIndex * _intsPerCb, (cbIndex + 1) * _intsPerCb - 1);
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/CacheByRange.cs

@@ -1,294 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    interface ICacheKey : IDisposable
-    {
-        bool KeyEqual(ICacheKey other);
-    }
-
-    [SupportedOSPlatform("macos")]
-    struct I8ToI16CacheKey : ICacheKey
-    {
-        // Used to notify the pipeline that bindings have invalidated on dispose.
-        // private readonly MetalRenderer _renderer;
-        // private Auto<DisposableBuffer> _buffer;
-
-        public I8ToI16CacheKey(MetalRenderer renderer)
-        {
-            // _renderer = renderer;
-            // _buffer = null;
-        }
-
-        public readonly bool KeyEqual(ICacheKey other)
-        {
-            return other is I8ToI16CacheKey;
-        }
-
-        public readonly void SetBuffer(Auto<DisposableBuffer> buffer)
-        {
-            // _buffer = buffer;
-        }
-
-        public readonly void Dispose()
-        {
-            // TODO: Tell pipeline buffer is dirty!
-            // _renderer.PipelineInternal.DirtyIndexBuffer(_buffer);
-        }
-    }
-
-    [SupportedOSPlatform("macos")]
-    readonly struct TopologyConversionCacheKey : ICacheKey
-    {
-        private readonly IndexBufferPattern _pattern;
-        private readonly int _indexSize;
-
-        // Used to notify the pipeline that bindings have invalidated on dispose.
-        // private readonly MetalRenderer _renderer;
-        // private Auto<DisposableBuffer> _buffer;
-
-        public TopologyConversionCacheKey(MetalRenderer renderer, IndexBufferPattern pattern, int indexSize)
-        {
-            // _renderer = renderer;
-            // _buffer = null;
-            _pattern = pattern;
-            _indexSize = indexSize;
-        }
-
-        public readonly bool KeyEqual(ICacheKey other)
-        {
-            return other is TopologyConversionCacheKey entry &&
-                   entry._pattern == _pattern &&
-                   entry._indexSize == _indexSize;
-        }
-
-        public void SetBuffer(Auto<DisposableBuffer> buffer)
-        {
-            // _buffer = buffer;
-        }
-
-        public readonly void Dispose()
-        {
-            // TODO: Tell pipeline buffer is dirty!
-            // _renderer.PipelineInternal.DirtyVertexBuffer(_buffer);
-        }
-    }
-
-    [SupportedOSPlatform("macos")]
-    readonly struct Dependency
-    {
-        private readonly BufferHolder _buffer;
-        private readonly int _offset;
-        private readonly int _size;
-        private readonly ICacheKey _key;
-
-        public Dependency(BufferHolder buffer, int offset, int size, ICacheKey key)
-        {
-            _buffer = buffer;
-            _offset = offset;
-            _size = size;
-            _key = key;
-        }
-
-        public void RemoveFromOwner()
-        {
-            _buffer.RemoveCachedConvertedBuffer(_offset, _size, _key);
-        }
-    }
-
-    [SupportedOSPlatform("macos")]
-    struct CacheByRange<T> where T : IDisposable
-    {
-        private struct Entry
-        {
-            public readonly ICacheKey Key;
-            public readonly T Value;
-            public List<Dependency> DependencyList;
-
-            public Entry(ICacheKey key, T value)
-            {
-                Key = key;
-                Value = value;
-                DependencyList = null;
-            }
-
-            public readonly void InvalidateDependencies()
-            {
-                if (DependencyList != null)
-                {
-                    foreach (Dependency dependency in DependencyList)
-                    {
-                        dependency.RemoveFromOwner();
-                    }
-
-                    DependencyList.Clear();
-                }
-            }
-        }
-
-        private Dictionary<ulong, List<Entry>> _ranges;
-
-        public void Add(int offset, int size, ICacheKey key, T value)
-        {
-            List<Entry> entries = GetEntries(offset, size);
-
-            entries.Add(new Entry(key, value));
-        }
-
-        public void AddDependency(int offset, int size, ICacheKey key, Dependency dependency)
-        {
-            List<Entry> entries = GetEntries(offset, size);
-
-            for (int i = 0; i < entries.Count; i++)
-            {
-                Entry entry = entries[i];
-
-                if (entry.Key.KeyEqual(key))
-                {
-                    if (entry.DependencyList == null)
-                    {
-                        entry.DependencyList = new List<Dependency>();
-                        entries[i] = entry;
-                    }
-
-                    entry.DependencyList.Add(dependency);
-
-                    break;
-                }
-            }
-        }
-
-        public void Remove(int offset, int size, ICacheKey key)
-        {
-            List<Entry> entries = GetEntries(offset, size);
-
-            for (int i = 0; i < entries.Count; i++)
-            {
-                Entry entry = entries[i];
-
-                if (entry.Key.KeyEqual(key))
-                {
-                    entries.RemoveAt(i--);
-
-                    DestroyEntry(entry);
-                }
-            }
-
-            if (entries.Count == 0)
-            {
-                _ranges.Remove(PackRange(offset, size));
-            }
-        }
-
-        public bool TryGetValue(int offset, int size, ICacheKey key, out T value)
-        {
-            List<Entry> entries = GetEntries(offset, size);
-
-            foreach (Entry entry in entries)
-            {
-                if (entry.Key.KeyEqual(key))
-                {
-                    value = entry.Value;
-
-                    return true;
-                }
-            }
-
-            value = default;
-            return false;
-        }
-
-        public void Clear()
-        {
-            if (_ranges != null)
-            {
-                foreach (List<Entry> entries in _ranges.Values)
-                {
-                    foreach (Entry entry in entries)
-                    {
-                        DestroyEntry(entry);
-                    }
-                }
-
-                _ranges.Clear();
-                _ranges = null;
-            }
-        }
-
-        public readonly void ClearRange(int offset, int size)
-        {
-            if (_ranges != null && _ranges.Count > 0)
-            {
-                int end = offset + size;
-
-                List<ulong> toRemove = null;
-
-                foreach (KeyValuePair<ulong, List<Entry>> range in _ranges)
-                {
-                    (int rOffset, int rSize) = UnpackRange(range.Key);
-
-                    int rEnd = rOffset + rSize;
-
-                    if (rEnd > offset && rOffset < end)
-                    {
-                        List<Entry> entries = range.Value;
-
-                        foreach (Entry entry in entries)
-                        {
-                            DestroyEntry(entry);
-                        }
-
-                        (toRemove ??= new List<ulong>()).Add(range.Key);
-                    }
-                }
-
-                if (toRemove != null)
-                {
-                    foreach (ulong range in toRemove)
-                    {
-                        _ranges.Remove(range);
-                    }
-                }
-            }
-        }
-
-        private List<Entry> GetEntries(int offset, int size)
-        {
-            _ranges ??= new Dictionary<ulong, List<Entry>>();
-
-            ulong key = PackRange(offset, size);
-
-            if (!_ranges.TryGetValue(key, out List<Entry> value))
-            {
-                value = new List<Entry>();
-                _ranges.Add(key, value);
-            }
-
-            return value;
-        }
-
-        private static void DestroyEntry(Entry entry)
-        {
-            entry.Key.Dispose();
-            entry.Value?.Dispose();
-            entry.InvalidateDependencies();
-        }
-
-        private static ulong PackRange(int offset, int size)
-        {
-            return (uint)offset | ((ulong)size << 32);
-        }
-
-        private static (int offset, int size) UnpackRange(ulong range)
-        {
-            return ((int)range, (int)(range >> 32));
-        }
-
-        public void Dispose()
-        {
-            Clear();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/CommandBufferEncoder.cs

@@ -1,170 +0,0 @@
-using Ryujinx.Graphics.Metal;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.Versioning;
-
-interface IEncoderFactory
-{
-    MTLRenderCommandEncoder CreateRenderCommandEncoder();
-    MTLComputeCommandEncoder CreateComputeCommandEncoder();
-}
-
-/// <summary>
-/// Tracks active encoder object for a command buffer.
-/// </summary>
-[SupportedOSPlatform("macos")]
-class CommandBufferEncoder
-{
-    public EncoderType CurrentEncoderType { get; private set; } = EncoderType.None;
-
-    public MTLBlitCommandEncoder BlitEncoder => new(CurrentEncoder.Value);
-
-    public MTLComputeCommandEncoder ComputeEncoder => new(CurrentEncoder.Value);
-
-    public MTLRenderCommandEncoder RenderEncoder => new(CurrentEncoder.Value);
-
-    internal MTLCommandEncoder? CurrentEncoder { get; private set; }
-
-    private MTLCommandBuffer _commandBuffer;
-    private IEncoderFactory _encoderFactory;
-
-    public void Initialize(MTLCommandBuffer commandBuffer, IEncoderFactory encoderFactory)
-    {
-        _commandBuffer = commandBuffer;
-        _encoderFactory = encoderFactory;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public MTLRenderCommandEncoder EnsureRenderEncoder()
-    {
-        if (CurrentEncoderType != EncoderType.Render)
-        {
-            return BeginRenderPass();
-        }
-
-        return RenderEncoder;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public MTLBlitCommandEncoder EnsureBlitEncoder()
-    {
-        if (CurrentEncoderType != EncoderType.Blit)
-        {
-            return BeginBlitPass();
-        }
-
-        return BlitEncoder;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public MTLComputeCommandEncoder EnsureComputeEncoder()
-    {
-        if (CurrentEncoderType != EncoderType.Compute)
-        {
-            return BeginComputePass();
-        }
-
-        return ComputeEncoder;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool TryGetRenderEncoder(out MTLRenderCommandEncoder encoder)
-    {
-        if (CurrentEncoderType != EncoderType.Render)
-        {
-            encoder = default;
-            return false;
-        }
-
-        encoder = RenderEncoder;
-        return true;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool TryGetBlitEncoder(out MTLBlitCommandEncoder encoder)
-    {
-        if (CurrentEncoderType != EncoderType.Blit)
-        {
-            encoder = default;
-            return false;
-        }
-
-        encoder = BlitEncoder;
-        return true;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool TryGetComputeEncoder(out MTLComputeCommandEncoder encoder)
-    {
-        if (CurrentEncoderType != EncoderType.Compute)
-        {
-            encoder = default;
-            return false;
-        }
-
-        encoder = ComputeEncoder;
-        return true;
-    }
-
-    public void EndCurrentPass()
-    {
-        if (CurrentEncoder != null)
-        {
-            switch (CurrentEncoderType)
-            {
-                case EncoderType.Blit:
-                    BlitEncoder.EndEncoding();
-                    CurrentEncoder = null;
-                    break;
-                case EncoderType.Compute:
-                    ComputeEncoder.EndEncoding();
-                    CurrentEncoder = null;
-                    break;
-                case EncoderType.Render:
-                    RenderEncoder.EndEncoding();
-                    CurrentEncoder = null;
-                    break;
-                default:
-                    throw new InvalidOperationException();
-            }
-
-            CurrentEncoderType = EncoderType.None;
-        }
-    }
-
-    private MTLRenderCommandEncoder BeginRenderPass()
-    {
-        EndCurrentPass();
-
-        var renderCommandEncoder = _encoderFactory.CreateRenderCommandEncoder();
-
-        CurrentEncoder = renderCommandEncoder;
-        CurrentEncoderType = EncoderType.Render;
-
-        return renderCommandEncoder;
-    }
-
-    private MTLBlitCommandEncoder BeginBlitPass()
-    {
-        EndCurrentPass();
-
-        using var descriptor = new MTLBlitPassDescriptor();
-        var blitCommandEncoder = _commandBuffer.BlitCommandEncoder(descriptor);
-
-        CurrentEncoder = blitCommandEncoder;
-        CurrentEncoderType = EncoderType.Blit;
-        return blitCommandEncoder;
-    }
-
-    private MTLComputeCommandEncoder BeginComputePass()
-    {
-        EndCurrentPass();
-
-        var computeCommandEncoder = _encoderFactory.CreateComputeCommandEncoder();
-
-        CurrentEncoder = computeCommandEncoder;
-        CurrentEncoderType = EncoderType.Compute;
-        return computeCommandEncoder;
-    }
-}

src/Ryujinx.Graphics.Metal/CommandBufferPool.cs

@@ -1,289 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.Versioning;
-using System.Threading;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class CommandBufferPool : IDisposable
-    {
-        public const int MaxCommandBuffers = 16;
-
-        private readonly int _totalCommandBuffers;
-        private readonly int _totalCommandBuffersMask;
-        private readonly MTLCommandQueue _queue;
-        private readonly Thread _owner;
-        private IEncoderFactory _defaultEncoderFactory;
-
-        public bool OwnedByCurrentThread => _owner == Thread.CurrentThread;
-
-        [SupportedOSPlatform("macos")]
-        private struct ReservedCommandBuffer
-        {
-            public bool InUse;
-            public bool InConsumption;
-            public int SubmissionCount;
-            public MTLCommandBuffer CommandBuffer;
-            public CommandBufferEncoder Encoders;
-            public FenceHolder Fence;
-
-            public List<IAuto> Dependants;
-            public List<MultiFenceHolder> Waitables;
-
-            public void Use(MTLCommandQueue queue, IEncoderFactory stateManager)
-            {
-                MTLCommandBufferDescriptor descriptor = new();
-#if DEBUG
-                descriptor.ErrorOptions = MTLCommandBufferErrorOption.EncoderExecutionStatus;
-#endif
-
-                CommandBuffer = queue.CommandBuffer(descriptor);
-                Fence = new FenceHolder(CommandBuffer);
-
-                Encoders.Initialize(CommandBuffer, stateManager);
-
-                InUse = true;
-            }
-
-            public void Initialize()
-            {
-                Dependants = new List<IAuto>();
-                Waitables = new List<MultiFenceHolder>();
-                Encoders = new CommandBufferEncoder();
-            }
-        }
-
-        private readonly ReservedCommandBuffer[] _commandBuffers;
-
-        private readonly int[] _queuedIndexes;
-        private int _queuedIndexesPtr;
-        private int _queuedCount;
-        private int _inUseCount;
-
-        public CommandBufferPool(MTLCommandQueue queue, bool isLight = false)
-        {
-            _queue = queue;
-            _owner = Thread.CurrentThread;
-
-            _totalCommandBuffers = isLight ? 2 : MaxCommandBuffers;
-            _totalCommandBuffersMask = _totalCommandBuffers - 1;
-
-            _commandBuffers = new ReservedCommandBuffer[_totalCommandBuffers];
-
-            _queuedIndexes = new int[_totalCommandBuffers];
-            _queuedIndexesPtr = 0;
-            _queuedCount = 0;
-        }
-
-        public void Initialize(IEncoderFactory encoderFactory)
-        {
-            _defaultEncoderFactory = encoderFactory;
-
-            for (int i = 0; i < _totalCommandBuffers; i++)
-            {
-                _commandBuffers[i].Initialize();
-                WaitAndDecrementRef(i);
-            }
-        }
-
-        public void AddDependant(int cbIndex, IAuto dependant)
-        {
-            dependant.IncrementReferenceCount();
-            _commandBuffers[cbIndex].Dependants.Add(dependant);
-        }
-
-        public void AddWaitable(MultiFenceHolder waitable)
-        {
-            lock (_commandBuffers)
-            {
-                for (int i = 0; i < _totalCommandBuffers; i++)
-                {
-                    ref var entry = ref _commandBuffers[i];
-
-                    if (entry.InConsumption)
-                    {
-                        AddWaitable(i, waitable);
-                    }
-                }
-            }
-        }
-
-        public void AddInUseWaitable(MultiFenceHolder waitable)
-        {
-            lock (_commandBuffers)
-            {
-                for (int i = 0; i < _totalCommandBuffers; i++)
-                {
-                    ref var entry = ref _commandBuffers[i];
-
-                    if (entry.InUse)
-                    {
-                        AddWaitable(i, waitable);
-                    }
-                }
-            }
-        }
-
-        public void AddWaitable(int cbIndex, MultiFenceHolder waitable)
-        {
-            ref var entry = ref _commandBuffers[cbIndex];
-            if (waitable.AddFence(cbIndex, entry.Fence))
-            {
-                entry.Waitables.Add(waitable);
-            }
-        }
-
-        public bool IsFenceOnRentedCommandBuffer(FenceHolder fence)
-        {
-            lock (_commandBuffers)
-            {
-                for (int i = 0; i < _totalCommandBuffers; i++)
-                {
-                    ref var entry = ref _commandBuffers[i];
-
-                    if (entry.InUse && entry.Fence == fence)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        public FenceHolder GetFence(int cbIndex)
-        {
-            return _commandBuffers[cbIndex].Fence;
-        }
-
-        public int GetSubmissionCount(int cbIndex)
-        {
-            return _commandBuffers[cbIndex].SubmissionCount;
-        }
-
-        private int FreeConsumed(bool wait)
-        {
-            int freeEntry = 0;
-
-            while (_queuedCount > 0)
-            {
-                int index = _queuedIndexes[_queuedIndexesPtr];
-
-                ref var entry = ref _commandBuffers[index];
-
-                if (wait || !entry.InConsumption || entry.Fence.IsSignaled())
-                {
-                    WaitAndDecrementRef(index);
-
-                    wait = false;
-                    freeEntry = index;
-
-                    _queuedCount--;
-                    _queuedIndexesPtr = (_queuedIndexesPtr + 1) % _totalCommandBuffers;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return freeEntry;
-        }
-
-        public CommandBufferScoped ReturnAndRent(CommandBufferScoped cbs)
-        {
-            Return(cbs);
-            return Rent();
-        }
-
-        public CommandBufferScoped Rent()
-        {
-            lock (_commandBuffers)
-            {
-                int cursor = FreeConsumed(_inUseCount + _queuedCount == _totalCommandBuffers);
-
-                for (int i = 0; i < _totalCommandBuffers; i++)
-                {
-                    ref var entry = ref _commandBuffers[cursor];
-
-                    if (!entry.InUse && !entry.InConsumption)
-                    {
-                        entry.Use(_queue, _defaultEncoderFactory);
-
-                        _inUseCount++;
-
-                        return new CommandBufferScoped(this, entry.CommandBuffer, entry.Encoders, cursor);
-                    }
-
-                    cursor = (cursor + 1) & _totalCommandBuffersMask;
-                }
-            }
-
-            throw new InvalidOperationException($"Out of command buffers (In use: {_inUseCount}, queued: {_queuedCount}, total: {_totalCommandBuffers})");
-        }
-
-        public void Return(CommandBufferScoped cbs)
-        {
-            // Ensure the encoder is committed.
-            cbs.Encoders.EndCurrentPass();
-
-            lock (_commandBuffers)
-            {
-                int cbIndex = cbs.CommandBufferIndex;
-
-                ref var entry = ref _commandBuffers[cbIndex];
-
-                Debug.Assert(entry.InUse);
-                Debug.Assert(entry.CommandBuffer.NativePtr == cbs.CommandBuffer.NativePtr);
-                entry.InUse = false;
-                entry.InConsumption = true;
-                entry.SubmissionCount++;
-                _inUseCount--;
-
-                var commandBuffer = entry.CommandBuffer;
-                commandBuffer.Commit();
-
-                int ptr = (_queuedIndexesPtr + _queuedCount) % _totalCommandBuffers;
-                _queuedIndexes[ptr] = cbIndex;
-                _queuedCount++;
-            }
-        }
-
-        private void WaitAndDecrementRef(int cbIndex)
-        {
-            ref var entry = ref _commandBuffers[cbIndex];
-
-            if (entry.InConsumption)
-            {
-                entry.Fence.Wait();
-                entry.InConsumption = false;
-            }
-
-            foreach (var dependant in entry.Dependants)
-            {
-                dependant.DecrementReferenceCount(cbIndex);
-            }
-
-            foreach (var waitable in entry.Waitables)
-            {
-                waitable.RemoveFence(cbIndex);
-                waitable.RemoveBufferUses(cbIndex);
-            }
-
-            entry.Dependants.Clear();
-            entry.Waitables.Clear();
-            entry.Fence?.Dispose();
-        }
-
-        public void Dispose()
-        {
-            for (int i = 0; i < _totalCommandBuffers; i++)
-            {
-                WaitAndDecrementRef(i);
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/CommandBufferScoped.cs

@@ -1,43 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    readonly struct CommandBufferScoped : IDisposable
-    {
-        private readonly CommandBufferPool _pool;
-        public MTLCommandBuffer CommandBuffer { get; }
-        public CommandBufferEncoder Encoders { get; }
-        public int CommandBufferIndex { get; }
-
-        public CommandBufferScoped(CommandBufferPool pool, MTLCommandBuffer commandBuffer, CommandBufferEncoder encoders, int commandBufferIndex)
-        {
-            _pool = pool;
-            CommandBuffer = commandBuffer;
-            Encoders = encoders;
-            CommandBufferIndex = commandBufferIndex;
-        }
-
-        public void AddDependant(IAuto dependant)
-        {
-            _pool.AddDependant(CommandBufferIndex, dependant);
-        }
-
-        public void AddWaitable(MultiFenceHolder waitable)
-        {
-            _pool.AddWaitable(CommandBufferIndex, waitable);
-        }
-
-        public FenceHolder GetFence()
-        {
-            return _pool.GetFence(CommandBufferIndex);
-        }
-
-        public void Dispose()
-        {
-            _pool?.Return(this);
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/Constants.cs

@@ -1,41 +0,0 @@
-namespace Ryujinx.Graphics.Metal
-{
-    static class Constants
-    {
-        public const int MaxShaderStages = 5;
-        public const int MaxVertexBuffers = 16;
-        public const int MaxUniformBuffersPerStage = 18;
-        public const int MaxStorageBuffersPerStage = 16;
-        public const int MaxTexturesPerStage = 64;
-        public const int MaxImagesPerStage = 16;
-
-        public const int MaxUniformBufferBindings = MaxUniformBuffersPerStage * MaxShaderStages;
-        public const int MaxStorageBufferBindings = MaxStorageBuffersPerStage * MaxShaderStages;
-        public const int MaxTextureBindings = MaxTexturesPerStage * MaxShaderStages;
-        public const int MaxImageBindings = MaxImagesPerStage * MaxShaderStages;
-        public const int MaxColorAttachments = 8;
-        public const int MaxViewports = 16;
-        // TODO: Check this value
-        public const int MaxVertexAttributes = 31;
-
-        public const int MinResourceAlignment = 16;
-
-        // Must match constants set in shader generation
-        public const uint ZeroBufferIndex = MaxVertexBuffers;
-        public const uint BaseSetIndex = MaxVertexBuffers + 1;
-
-        public const uint ConstantBuffersIndex = BaseSetIndex;
-        public const uint StorageBuffersIndex = BaseSetIndex + 1;
-        public const uint TexturesIndex = BaseSetIndex + 2;
-        public const uint ImagesIndex = BaseSetIndex + 3;
-
-        public const uint ConstantBuffersSetIndex = 0;
-        public const uint StorageBuffersSetIndex = 1;
-        public const uint TexturesSetIndex = 2;
-        public const uint ImagesSetIndex = 3;
-
-        public const uint MaximumBufferArgumentTableEntries = 31;
-
-        public const uint MaximumExtraSets = MaximumBufferArgumentTableEntries - ImagesIndex;
-    }
-}

src/Ryujinx.Graphics.Metal/CounterEvent.cs

@@ -1,22 +0,0 @@
-using Ryujinx.Graphics.GAL;
-
-namespace Ryujinx.Graphics.Metal
-{
-    class CounterEvent : ICounterEvent
-    {
-        public CounterEvent()
-        {
-            Invalid = false;
-        }
-
-        public bool Invalid { get; set; }
-        public bool ReserveForHostAccess()
-        {
-            return true;
-        }
-
-        public void Flush() { }
-
-        public void Dispose() { }
-    }
-}

src/Ryujinx.Graphics.Metal/DepthStencilCache.cs

@@ -1,68 +0,0 @@
-using Ryujinx.Graphics.Metal.State;
-using SharpMetal.Metal;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class DepthStencilCache : StateCache<MTLDepthStencilState, DepthStencilUid, DepthStencilUid>
-    {
-        private readonly MTLDevice _device;
-
-        public DepthStencilCache(MTLDevice device)
-        {
-            _device = device;
-        }
-
-        protected override DepthStencilUid GetHash(DepthStencilUid descriptor)
-        {
-            return descriptor;
-        }
-
-        protected override MTLDepthStencilState CreateValue(DepthStencilUid descriptor)
-        {
-            // Create descriptors
-
-            ref StencilUid frontUid = ref descriptor.FrontFace;
-
-            using var frontFaceStencil = new MTLStencilDescriptor
-            {
-                StencilFailureOperation = frontUid.StencilFailureOperation,
-                DepthFailureOperation = frontUid.DepthFailureOperation,
-                DepthStencilPassOperation = frontUid.DepthStencilPassOperation,
-                StencilCompareFunction = frontUid.StencilCompareFunction,
-                ReadMask = frontUid.ReadMask,
-                WriteMask = frontUid.WriteMask
-            };
-
-            ref StencilUid backUid = ref descriptor.BackFace;
-
-            using var backFaceStencil = new MTLStencilDescriptor
-            {
-                StencilFailureOperation = backUid.StencilFailureOperation,
-                DepthFailureOperation = backUid.DepthFailureOperation,
-                DepthStencilPassOperation = backUid.DepthStencilPassOperation,
-                StencilCompareFunction = backUid.StencilCompareFunction,
-                ReadMask = backUid.ReadMask,
-                WriteMask = backUid.WriteMask
-            };
-
-            var mtlDescriptor = new MTLDepthStencilDescriptor
-            {
-                DepthCompareFunction = descriptor.DepthCompareFunction,
-                DepthWriteEnabled = descriptor.DepthWriteEnabled
-            };
-
-            if (descriptor.StencilTestEnabled)
-            {
-                mtlDescriptor.BackFaceStencil = backFaceStencil;
-                mtlDescriptor.FrontFaceStencil = frontFaceStencil;
-            }
-
-            using (mtlDescriptor)
-            {
-                return _device.NewDepthStencilState(mtlDescriptor);
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/DisposableBuffer.cs

@@ -1,26 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    readonly struct DisposableBuffer : IDisposable
-    {
-        public MTLBuffer Value { get; }
-
-        public DisposableBuffer(MTLBuffer buffer)
-        {
-            Value = buffer;
-        }
-
-        public void Dispose()
-        {
-            if (Value != IntPtr.Zero)
-            {
-                Value.SetPurgeableState(MTLPurgeableState.Empty);
-                Value.Dispose();
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/DisposableSampler.cs

@@ -1,22 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    readonly struct DisposableSampler : IDisposable
-    {
-        public MTLSamplerState Value { get; }
-
-        public DisposableSampler(MTLSamplerState sampler)
-        {
-            Value = sampler;
-        }
-
-        public void Dispose()
-        {
-            Value.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/Effects/IPostProcessingEffect.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.Metal.Effects
-{
-    internal interface IPostProcessingEffect : IDisposable
-    {
-        const int LocalGroupSize = 64;
-        Texture Run(Texture view, int width, int height);
-    }
-}

src/Ryujinx.Graphics.Metal/Effects/IScalingFilter.cs

@@ -1,18 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System;
-
-namespace Ryujinx.Graphics.Metal.Effects
-{
-    internal interface IScalingFilter : IDisposable
-    {
-        float Level { get; set; }
-        void Run(
-            Texture view,
-            Texture destinationTexture,
-            Format format,
-            int width,
-            int height,
-            Extents2D source,
-            Extents2D destination);
-    }
-}

src/Ryujinx.Graphics.Metal/EncoderResources.cs

@@ -1,63 +0,0 @@
-using SharpMetal.Metal;
-using System.Collections.Generic;
-
-namespace Ryujinx.Graphics.Metal
-{
-    public struct RenderEncoderBindings
-    {
-        public List<Resource> Resources = new();
-        public List<BufferResource> VertexBuffers = new();
-        public List<BufferResource> FragmentBuffers = new();
-
-        public RenderEncoderBindings() { }
-
-        public readonly void Clear()
-        {
-            Resources.Clear();
-            VertexBuffers.Clear();
-            FragmentBuffers.Clear();
-        }
-    }
-
-    public struct ComputeEncoderBindings
-    {
-        public List<Resource> Resources = new();
-        public List<BufferResource> Buffers = new();
-
-        public ComputeEncoderBindings() { }
-
-        public readonly void Clear()
-        {
-            Resources.Clear();
-            Buffers.Clear();
-        }
-    }
-
-    public struct BufferResource
-    {
-        public MTLBuffer Buffer;
-        public ulong Offset;
-        public ulong Binding;
-
-        public BufferResource(MTLBuffer buffer, ulong offset, ulong binding)
-        {
-            Buffer = buffer;
-            Offset = offset;
-            Binding = binding;
-        }
-    }
-
-    public struct Resource
-    {
-        public MTLResource MtlResource;
-        public MTLResourceUsage ResourceUsage;
-        public MTLRenderStages Stages;
-
-        public Resource(MTLResource resource, MTLResourceUsage resourceUsage, MTLRenderStages stages)
-        {
-            MtlResource = resource;
-            ResourceUsage = resourceUsage;
-            Stages = stages;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/EncoderState.cs

@@ -1,206 +0,0 @@
-using Ryujinx.Common.Memory;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Metal.State;
-using Ryujinx.Graphics.Shader;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [Flags]
-    enum DirtyFlags
-    {
-        None = 0,
-        RenderPipeline = 1 << 0,
-        ComputePipeline = 1 << 1,
-        DepthStencil = 1 << 2,
-        DepthClamp = 1 << 3,
-        DepthBias = 1 << 4,
-        CullMode = 1 << 5,
-        FrontFace = 1 << 6,
-        StencilRef = 1 << 7,
-        Viewports = 1 << 8,
-        Scissors = 1 << 9,
-        Uniforms = 1 << 10,
-        Storages = 1 << 11,
-        Textures = 1 << 12,
-        Images = 1 << 13,
-
-        ArgBuffers = Uniforms | Storages | Textures | Images,
-
-        RenderAll = RenderPipeline | DepthStencil | DepthClamp | DepthBias | CullMode | FrontFace | StencilRef | Viewports | Scissors | ArgBuffers,
-        ComputeAll = ComputePipeline | ArgBuffers,
-        All = RenderAll | ComputeAll,
-    }
-
-    record struct BufferRef
-    {
-        public Auto<DisposableBuffer> Buffer;
-        public BufferRange? Range;
-
-        public BufferRef(Auto<DisposableBuffer> buffer)
-        {
-            Buffer = buffer;
-        }
-
-        public BufferRef(Auto<DisposableBuffer> buffer, ref BufferRange range)
-        {
-            Buffer = buffer;
-            Range = range;
-        }
-    }
-
-    record struct TextureRef
-    {
-        public ShaderStage Stage;
-        public TextureBase Storage;
-        public Auto<DisposableSampler> Sampler;
-        public Format ImageFormat;
-
-        public TextureRef(ShaderStage stage, TextureBase storage, Auto<DisposableSampler> sampler)
-        {
-            Stage = stage;
-            Storage = storage;
-            Sampler = sampler;
-        }
-    }
-
-    record struct ImageRef
-    {
-        public ShaderStage Stage;
-        public Texture Storage;
-
-        public ImageRef(ShaderStage stage, Texture storage)
-        {
-            Stage = stage;
-            Storage = storage;
-        }
-    }
-
-    struct PredrawState
-    {
-        public MTLCullMode CullMode;
-        public DepthStencilUid DepthStencilUid;
-        public PrimitiveTopology Topology;
-        public MTLViewport[] Viewports;
-    }
-
-    struct RenderTargetCopy
-    {
-        public MTLScissorRect[] Scissors;
-        public Texture DepthStencil;
-        public Texture[] RenderTargets;
-    }
-
-    [SupportedOSPlatform("macos")]
-    class EncoderState
-    {
-        public Program RenderProgram = null;
-        public Program ComputeProgram = null;
-
-        public PipelineState Pipeline;
-        public DepthStencilUid DepthStencilUid;
-
-        public readonly record struct ArrayRef<T>(ShaderStage Stage, T Array);
-
-        public readonly BufferRef[] UniformBufferRefs = new BufferRef[Constants.MaxUniformBufferBindings];
-        public readonly BufferRef[] StorageBufferRefs = new BufferRef[Constants.MaxStorageBufferBindings];
-        public readonly TextureRef[] TextureRefs = new TextureRef[Constants.MaxTextureBindings * 2];
-        public readonly ImageRef[] ImageRefs = new ImageRef[Constants.MaxImageBindings * 2];
-
-        public ArrayRef<TextureArray>[] TextureArrayRefs = [];
-        public ArrayRef<ImageArray>[] ImageArrayRefs = [];
-
-        public ArrayRef<TextureArray>[] TextureArrayExtraRefs = [];
-        public ArrayRef<ImageArray>[] ImageArrayExtraRefs = [];
-
-        public IndexBufferState IndexBuffer = default;
-
-        public MTLDepthClipMode DepthClipMode = MTLDepthClipMode.Clip;
-
-        public float DepthBias;
-        public float SlopeScale;
-        public float Clamp;
-
-        public int BackRefValue = 0;
-        public int FrontRefValue = 0;
-
-        public PrimitiveTopology Topology = PrimitiveTopology.Triangles;
-        public MTLCullMode CullMode = MTLCullMode.None;
-        public MTLWinding Winding = MTLWinding.CounterClockwise;
-        public bool CullBoth = false;
-
-        public MTLViewport[] Viewports = new MTLViewport[Constants.MaxViewports];
-        public MTLScissorRect[] Scissors = new MTLScissorRect[Constants.MaxViewports];
-
-        // Changes to attachments take recreation!
-        public Texture DepthStencil;
-        public Texture[] RenderTargets = new Texture[Constants.MaxColorAttachments];
-        public ITexture PreMaskDepthStencil = default;
-        public ITexture[] PreMaskRenderTargets;
-        public bool FramebufferUsingColorWriteMask;
-
-        public Array8<ColorBlendStateUid> StoredBlend;
-        public ColorF BlendColor = new();
-
-        public readonly VertexBufferState[] VertexBuffers = new VertexBufferState[Constants.MaxVertexBuffers];
-        public readonly VertexAttribDescriptor[] VertexAttribs = new VertexAttribDescriptor[Constants.MaxVertexAttributes];
-        // Dirty flags
-        public DirtyFlags Dirty = DirtyFlags.None;
-
-        // Only to be used for present
-        public bool ClearLoadAction = false;
-
-        public RenderEncoderBindings RenderEncoderBindings = new();
-        public ComputeEncoderBindings ComputeEncoderBindings = new();
-
-        public EncoderState()
-        {
-            Pipeline.Initialize();
-            DepthStencilUid.DepthCompareFunction = MTLCompareFunction.Always;
-        }
-
-        public RenderTargetCopy InheritForClear(EncoderState other, bool depth, int singleIndex = -1)
-        {
-            // Inherit render target related information without causing a render encoder split.
-
-            var oldState = new RenderTargetCopy
-            {
-                Scissors = other.Scissors,
-                RenderTargets = other.RenderTargets,
-                DepthStencil = other.DepthStencil
-            };
-
-            Scissors = other.Scissors;
-            RenderTargets = other.RenderTargets;
-            DepthStencil = other.DepthStencil;
-
-            Pipeline.ColorBlendAttachmentStateCount = other.Pipeline.ColorBlendAttachmentStateCount;
-            Pipeline.Internal.ColorBlendState = other.Pipeline.Internal.ColorBlendState;
-            Pipeline.DepthStencilFormat = other.Pipeline.DepthStencilFormat;
-
-            ref var blendStates = ref Pipeline.Internal.ColorBlendState;
-
-            // Mask out irrelevant attachments.
-            for (int i = 0; i < blendStates.Length; i++)
-            {
-                if (depth || (singleIndex != -1 && singleIndex != i))
-                {
-                    blendStates[i].WriteMask = MTLColorWriteMask.None;
-                }
-            }
-
-            return oldState;
-        }
-
-        public void Restore(RenderTargetCopy copy)
-        {
-            Scissors = copy.Scissors;
-            RenderTargets = copy.RenderTargets;
-            DepthStencil = copy.DepthStencil;
-
-            Pipeline.Internal.ResetColorState();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/EnumConversion.cs

@@ -1,293 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    static class EnumConversion
-    {
-        public static MTLSamplerAddressMode Convert(this AddressMode mode)
-        {
-            return mode switch
-            {
-                AddressMode.Clamp => MTLSamplerAddressMode.ClampToEdge, // TODO: Should be clamp.
-                AddressMode.Repeat => MTLSamplerAddressMode.Repeat,
-                AddressMode.MirrorClamp => MTLSamplerAddressMode.MirrorClampToEdge, // TODO: Should be mirror clamp.
-                AddressMode.MirroredRepeat => MTLSamplerAddressMode.MirrorRepeat,
-                AddressMode.ClampToBorder => MTLSamplerAddressMode.ClampToBorderColor,
-                AddressMode.ClampToEdge => MTLSamplerAddressMode.ClampToEdge,
-                AddressMode.MirrorClampToEdge => MTLSamplerAddressMode.MirrorClampToEdge,
-                AddressMode.MirrorClampToBorder => MTLSamplerAddressMode.ClampToBorderColor, // TODO: Should be mirror clamp to border.
-                _ => LogInvalidAndReturn(mode, nameof(AddressMode), MTLSamplerAddressMode.ClampToEdge) // TODO: Should be clamp.
-            };
-        }
-
-        public static MTLBlendFactor Convert(this BlendFactor factor)
-        {
-            return factor switch
-            {
-                BlendFactor.Zero or BlendFactor.ZeroGl => MTLBlendFactor.Zero,
-                BlendFactor.One or BlendFactor.OneGl => MTLBlendFactor.One,
-                BlendFactor.SrcColor or BlendFactor.SrcColorGl => MTLBlendFactor.SourceColor,
-                BlendFactor.OneMinusSrcColor or BlendFactor.OneMinusSrcColorGl => MTLBlendFactor.OneMinusSourceColor,
-                BlendFactor.SrcAlpha or BlendFactor.SrcAlphaGl => MTLBlendFactor.SourceAlpha,
-                BlendFactor.OneMinusSrcAlpha or BlendFactor.OneMinusSrcAlphaGl => MTLBlendFactor.OneMinusSourceAlpha,
-                BlendFactor.DstAlpha or BlendFactor.DstAlphaGl => MTLBlendFactor.DestinationAlpha,
-                BlendFactor.OneMinusDstAlpha or BlendFactor.OneMinusDstAlphaGl => MTLBlendFactor.OneMinusDestinationAlpha,
-                BlendFactor.DstColor or BlendFactor.DstColorGl => MTLBlendFactor.DestinationColor,
-                BlendFactor.OneMinusDstColor or BlendFactor.OneMinusDstColorGl => MTLBlendFactor.OneMinusDestinationColor,
-                BlendFactor.SrcAlphaSaturate or BlendFactor.SrcAlphaSaturateGl => MTLBlendFactor.SourceAlphaSaturated,
-                BlendFactor.Src1Color or BlendFactor.Src1ColorGl => MTLBlendFactor.Source1Color,
-                BlendFactor.OneMinusSrc1Color or BlendFactor.OneMinusSrc1ColorGl => MTLBlendFactor.OneMinusSource1Color,
-                BlendFactor.Src1Alpha or BlendFactor.Src1AlphaGl => MTLBlendFactor.Source1Alpha,
-                BlendFactor.OneMinusSrc1Alpha or BlendFactor.OneMinusSrc1AlphaGl => MTLBlendFactor.OneMinusSource1Alpha,
-                BlendFactor.ConstantColor => MTLBlendFactor.BlendColor,
-                BlendFactor.OneMinusConstantColor => MTLBlendFactor.OneMinusBlendColor,
-                BlendFactor.ConstantAlpha => MTLBlendFactor.BlendAlpha,
-                BlendFactor.OneMinusConstantAlpha => MTLBlendFactor.OneMinusBlendAlpha,
-                _ => LogInvalidAndReturn(factor, nameof(BlendFactor), MTLBlendFactor.Zero)
-            };
-        }
-
-        public static MTLBlendOperation Convert(this BlendOp op)
-        {
-            return op switch
-            {
-                BlendOp.Add or BlendOp.AddGl => MTLBlendOperation.Add,
-                BlendOp.Subtract or BlendOp.SubtractGl => MTLBlendOperation.Subtract,
-                BlendOp.ReverseSubtract or BlendOp.ReverseSubtractGl => MTLBlendOperation.ReverseSubtract,
-                BlendOp.Minimum => MTLBlendOperation.Min,
-                BlendOp.Maximum => MTLBlendOperation.Max,
-                _ => LogInvalidAndReturn(op, nameof(BlendOp), MTLBlendOperation.Add)
-            };
-        }
-
-        public static MTLCompareFunction Convert(this CompareOp op)
-        {
-            return op switch
-            {
-                CompareOp.Never or CompareOp.NeverGl => MTLCompareFunction.Never,
-                CompareOp.Less or CompareOp.LessGl => MTLCompareFunction.Less,
-                CompareOp.Equal or CompareOp.EqualGl => MTLCompareFunction.Equal,
-                CompareOp.LessOrEqual or CompareOp.LessOrEqualGl => MTLCompareFunction.LessEqual,
-                CompareOp.Greater or CompareOp.GreaterGl => MTLCompareFunction.Greater,
-                CompareOp.NotEqual or CompareOp.NotEqualGl => MTLCompareFunction.NotEqual,
-                CompareOp.GreaterOrEqual or CompareOp.GreaterOrEqualGl => MTLCompareFunction.GreaterEqual,
-                CompareOp.Always or CompareOp.AlwaysGl => MTLCompareFunction.Always,
-                _ => LogInvalidAndReturn(op, nameof(CompareOp), MTLCompareFunction.Never)
-            };
-        }
-
-        public static MTLCullMode Convert(this Face face)
-        {
-            return face switch
-            {
-                Face.Back => MTLCullMode.Back,
-                Face.Front => MTLCullMode.Front,
-                Face.FrontAndBack => MTLCullMode.None,
-                _ => LogInvalidAndReturn(face, nameof(Face), MTLCullMode.Back)
-            };
-        }
-
-        public static MTLWinding Convert(this FrontFace frontFace)
-        {
-            // The viewport is flipped vertically, therefore we need to switch the winding order as well
-            return frontFace switch
-            {
-                FrontFace.Clockwise => MTLWinding.CounterClockwise,
-                FrontFace.CounterClockwise => MTLWinding.Clockwise,
-                _ => LogInvalidAndReturn(frontFace, nameof(FrontFace), MTLWinding.Clockwise)
-            };
-        }
-
-        public static MTLIndexType Convert(this IndexType type)
-        {
-            return type switch
-            {
-                IndexType.UShort => MTLIndexType.UInt16,
-                IndexType.UInt => MTLIndexType.UInt32,
-                _ => LogInvalidAndReturn(type, nameof(IndexType), MTLIndexType.UInt16)
-            };
-        }
-
-        public static MTLLogicOperation Convert(this LogicalOp op)
-        {
-            return op switch
-            {
-                LogicalOp.Clear => MTLLogicOperation.Clear,
-                LogicalOp.And => MTLLogicOperation.And,
-                LogicalOp.AndReverse => MTLLogicOperation.AndReverse,
-                LogicalOp.Copy => MTLLogicOperation.Copy,
-                LogicalOp.AndInverted => MTLLogicOperation.AndInverted,
-                LogicalOp.Noop => MTLLogicOperation.Noop,
-                LogicalOp.Xor => MTLLogicOperation.Xor,
-                LogicalOp.Or => MTLLogicOperation.Or,
-                LogicalOp.Nor => MTLLogicOperation.Nor,
-                LogicalOp.Equiv => MTLLogicOperation.Equivalence,
-                LogicalOp.Invert => MTLLogicOperation.Invert,
-                LogicalOp.OrReverse => MTLLogicOperation.OrReverse,
-                LogicalOp.CopyInverted => MTLLogicOperation.CopyInverted,
-                LogicalOp.OrInverted => MTLLogicOperation.OrInverted,
-                LogicalOp.Nand => MTLLogicOperation.Nand,
-                LogicalOp.Set => MTLLogicOperation.Set,
-                _ => LogInvalidAndReturn(op, nameof(LogicalOp), MTLLogicOperation.And)
-            };
-        }
-
-        public static MTLSamplerMinMagFilter Convert(this MagFilter filter)
-        {
-            return filter switch
-            {
-                MagFilter.Nearest => MTLSamplerMinMagFilter.Nearest,
-                MagFilter.Linear => MTLSamplerMinMagFilter.Linear,
-                _ => LogInvalidAndReturn(filter, nameof(MagFilter), MTLSamplerMinMagFilter.Nearest)
-            };
-        }
-
-        public static (MTLSamplerMinMagFilter, MTLSamplerMipFilter) Convert(this MinFilter filter)
-        {
-            return filter switch
-            {
-                MinFilter.Nearest => (MTLSamplerMinMagFilter.Nearest, MTLSamplerMipFilter.Nearest),
-                MinFilter.Linear => (MTLSamplerMinMagFilter.Linear, MTLSamplerMipFilter.Linear),
-                MinFilter.NearestMipmapNearest => (MTLSamplerMinMagFilter.Nearest, MTLSamplerMipFilter.Nearest),
-                MinFilter.LinearMipmapNearest => (MTLSamplerMinMagFilter.Linear, MTLSamplerMipFilter.Nearest),
-                MinFilter.NearestMipmapLinear => (MTLSamplerMinMagFilter.Nearest, MTLSamplerMipFilter.Linear),
-                MinFilter.LinearMipmapLinear => (MTLSamplerMinMagFilter.Linear, MTLSamplerMipFilter.Linear),
-                _ => LogInvalidAndReturn(filter, nameof(MinFilter), (MTLSamplerMinMagFilter.Nearest, MTLSamplerMipFilter.Nearest))
-
-            };
-        }
-
-        public static MTLPrimitiveType Convert(this PrimitiveTopology topology)
-        {
-            return topology switch
-            {
-                PrimitiveTopology.Points => MTLPrimitiveType.Point,
-                PrimitiveTopology.Lines => MTLPrimitiveType.Line,
-                PrimitiveTopology.LineStrip => MTLPrimitiveType.LineStrip,
-                PrimitiveTopology.Triangles => MTLPrimitiveType.Triangle,
-                PrimitiveTopology.TriangleStrip => MTLPrimitiveType.TriangleStrip,
-                _ => LogInvalidAndReturn(topology, nameof(PrimitiveTopology), MTLPrimitiveType.Triangle)
-            };
-        }
-
-        public static MTLStencilOperation Convert(this StencilOp op)
-        {
-            return op switch
-            {
-                StencilOp.Keep or StencilOp.KeepGl => MTLStencilOperation.Keep,
-                StencilOp.Zero or StencilOp.ZeroGl => MTLStencilOperation.Zero,
-                StencilOp.Replace or StencilOp.ReplaceGl => MTLStencilOperation.Replace,
-                StencilOp.IncrementAndClamp or StencilOp.IncrementAndClampGl => MTLStencilOperation.IncrementClamp,
-                StencilOp.DecrementAndClamp or StencilOp.DecrementAndClampGl => MTLStencilOperation.DecrementClamp,
-                StencilOp.Invert or StencilOp.InvertGl => MTLStencilOperation.Invert,
-                StencilOp.IncrementAndWrap or StencilOp.IncrementAndWrapGl => MTLStencilOperation.IncrementWrap,
-                StencilOp.DecrementAndWrap or StencilOp.DecrementAndWrapGl => MTLStencilOperation.DecrementWrap,
-                _ => LogInvalidAndReturn(op, nameof(StencilOp), MTLStencilOperation.Keep)
-            };
-        }
-
-        public static MTLTextureType Convert(this Target target)
-        {
-            return target switch
-            {
-                Target.TextureBuffer => MTLTextureType.TextureBuffer,
-                Target.Texture1D => MTLTextureType.Type1D,
-                Target.Texture1DArray => MTLTextureType.Type1DArray,
-                Target.Texture2D => MTLTextureType.Type2D,
-                Target.Texture2DArray => MTLTextureType.Type2DArray,
-                Target.Texture2DMultisample => MTLTextureType.Type2DMultisample,
-                Target.Texture2DMultisampleArray => MTLTextureType.Type2DMultisampleArray,
-                Target.Texture3D => MTLTextureType.Type3D,
-                Target.Cubemap => MTLTextureType.Cube,
-                Target.CubemapArray => MTLTextureType.CubeArray,
-                _ => LogInvalidAndReturn(target, nameof(Target), MTLTextureType.Type2D)
-            };
-        }
-
-        public static MTLTextureSwizzle Convert(this SwizzleComponent swizzleComponent)
-        {
-            return swizzleComponent switch
-            {
-                SwizzleComponent.Zero => MTLTextureSwizzle.Zero,
-                SwizzleComponent.One => MTLTextureSwizzle.One,
-                SwizzleComponent.Red => MTLTextureSwizzle.Red,
-                SwizzleComponent.Green => MTLTextureSwizzle.Green,
-                SwizzleComponent.Blue => MTLTextureSwizzle.Blue,
-                SwizzleComponent.Alpha => MTLTextureSwizzle.Alpha,
-                _ => LogInvalidAndReturn(swizzleComponent, nameof(SwizzleComponent), MTLTextureSwizzle.Zero)
-            };
-        }
-
-        public static MTLVertexFormat Convert(this Format format)
-        {
-            return format switch
-            {
-                Format.R16Float => MTLVertexFormat.Half,
-                Format.R16G16Float => MTLVertexFormat.Half2,
-                Format.R16G16B16Float => MTLVertexFormat.Half3,
-                Format.R16G16B16A16Float => MTLVertexFormat.Half4,
-                Format.R32Float => MTLVertexFormat.Float,
-                Format.R32G32Float => MTLVertexFormat.Float2,
-                Format.R32G32B32Float => MTLVertexFormat.Float3,
-                Format.R11G11B10Float => MTLVertexFormat.FloatRG11B10,
-                Format.R32G32B32A32Float => MTLVertexFormat.Float4,
-                Format.R8Uint => MTLVertexFormat.UChar,
-                Format.R8G8Uint => MTLVertexFormat.UChar2,
-                Format.R8G8B8Uint => MTLVertexFormat.UChar3,
-                Format.R8G8B8A8Uint => MTLVertexFormat.UChar4,
-                Format.R16Uint => MTLVertexFormat.UShort,
-                Format.R16G16Uint => MTLVertexFormat.UShort2,
-                Format.R16G16B16Uint => MTLVertexFormat.UShort3,
-                Format.R16G16B16A16Uint => MTLVertexFormat.UShort4,
-                Format.R32Uint => MTLVertexFormat.UInt,
-                Format.R32G32Uint => MTLVertexFormat.UInt2,
-                Format.R32G32B32Uint => MTLVertexFormat.UInt3,
-                Format.R32G32B32A32Uint => MTLVertexFormat.UInt4,
-                Format.R8Sint => MTLVertexFormat.Char,
-                Format.R8G8Sint => MTLVertexFormat.Char2,
-                Format.R8G8B8Sint => MTLVertexFormat.Char3,
-                Format.R8G8B8A8Sint => MTLVertexFormat.Char4,
-                Format.R16Sint => MTLVertexFormat.Short,
-                Format.R16G16Sint => MTLVertexFormat.Short2,
-                Format.R16G16B16Sint => MTLVertexFormat.Short3,
-                Format.R16G16B16A16Sint => MTLVertexFormat.Short4,
-                Format.R32Sint => MTLVertexFormat.Int,
-                Format.R32G32Sint => MTLVertexFormat.Int2,
-                Format.R32G32B32Sint => MTLVertexFormat.Int3,
-                Format.R32G32B32A32Sint => MTLVertexFormat.Int4,
-                Format.R8Unorm => MTLVertexFormat.UCharNormalized,
-                Format.R8G8Unorm => MTLVertexFormat.UChar2Normalized,
-                Format.R8G8B8Unorm => MTLVertexFormat.UChar3Normalized,
-                Format.R8G8B8A8Unorm => MTLVertexFormat.UChar4Normalized,
-                Format.R16Unorm => MTLVertexFormat.UShortNormalized,
-                Format.R16G16Unorm => MTLVertexFormat.UShort2Normalized,
-                Format.R16G16B16Unorm => MTLVertexFormat.UShort3Normalized,
-                Format.R16G16B16A16Unorm => MTLVertexFormat.UShort4Normalized,
-                Format.R10G10B10A2Unorm => MTLVertexFormat.UInt1010102Normalized,
-                Format.R8Snorm => MTLVertexFormat.CharNormalized,
-                Format.R8G8Snorm => MTLVertexFormat.Char2Normalized,
-                Format.R8G8B8Snorm => MTLVertexFormat.Char3Normalized,
-                Format.R8G8B8A8Snorm => MTLVertexFormat.Char4Normalized,
-                Format.R16Snorm => MTLVertexFormat.ShortNormalized,
-                Format.R16G16Snorm => MTLVertexFormat.Short2Normalized,
-                Format.R16G16B16Snorm => MTLVertexFormat.Short3Normalized,
-                Format.R16G16B16A16Snorm => MTLVertexFormat.Short4Normalized,
-                Format.R10G10B10A2Snorm => MTLVertexFormat.Int1010102Normalized,
-
-                _ => LogInvalidAndReturn(format, nameof(Format), MTLVertexFormat.Float4)
-            };
-        }
-
-        private static T2 LogInvalidAndReturn<T1, T2>(T1 value, string name, T2 defaultValue = default)
-        {
-            Logger.Debug?.Print(LogClass.Gpu, $"Invalid {name} enum value: {value}.");
-
-            return defaultValue;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/FenceHolder.cs

@@ -1,77 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-using System.Threading;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class FenceHolder : IDisposable
-    {
-        private MTLCommandBuffer _fence;
-        private int _referenceCount;
-        private bool _disposed;
-
-        public FenceHolder(MTLCommandBuffer fence)
-        {
-            _fence = fence;
-            _referenceCount = 1;
-        }
-
-        public MTLCommandBuffer GetUnsafe()
-        {
-            return _fence;
-        }
-
-        public bool TryGet(out MTLCommandBuffer fence)
-        {
-            int lastValue;
-            do
-            {
-                lastValue = _referenceCount;
-
-                if (lastValue == 0)
-                {
-                    fence = default;
-                    return false;
-                }
-            } while (Interlocked.CompareExchange(ref _referenceCount, lastValue + 1, lastValue) != lastValue);
-
-            fence = _fence;
-            return true;
-        }
-
-        public MTLCommandBuffer Get()
-        {
-            Interlocked.Increment(ref _referenceCount);
-            return _fence;
-        }
-
-        public void Put()
-        {
-            if (Interlocked.Decrement(ref _referenceCount) == 0)
-            {
-                _fence = default;
-            }
-        }
-
-        public void Wait()
-        {
-            _fence.WaitUntilCompleted();
-        }
-
-        public bool IsSignaled()
-        {
-            return _fence.Status == MTLCommandBufferStatus.Completed;
-        }
-
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                Put();
-                _disposed = true;
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/FormatConverter.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Graphics.Metal
-{
-    class FormatConverter
-    {
-        public static void ConvertD24S8ToD32FS8(Span<byte> output, ReadOnlySpan<byte> input)
-        {
-            const float UnormToFloat = 1f / 0xffffff;
-
-            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output);
-            ReadOnlySpan<uint> inputUint = MemoryMarshal.Cast<byte, uint>(input);
-
-            int i = 0;
-
-            for (; i < inputUint.Length; i++)
-            {
-                uint depthStencil = inputUint[i];
-                uint depth = depthStencil >> 8;
-                uint stencil = depthStencil & 0xff;
-
-                int j = i * 2;
-
-                outputUint[j] = (uint)BitConverter.SingleToInt32Bits(depth * UnormToFloat);
-                outputUint[j + 1] = stencil;
-            }
-        }
-
-        public static void ConvertD32FS8ToD24S8(Span<byte> output, ReadOnlySpan<byte> input)
-        {
-            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output);
-            ReadOnlySpan<uint> inputUint = MemoryMarshal.Cast<byte, uint>(input);
-
-            int i = 0;
-
-            for (; i < inputUint.Length; i += 2)
-            {
-                float depth = BitConverter.Int32BitsToSingle((int)inputUint[i]);
-                uint stencil = inputUint[i + 1];
-                uint depthStencil = (Math.Clamp((uint)(depth * 0xffffff), 0, 0xffffff) << 8) | (stencil & 0xff);
-
-                int j = i >> 1;
-
-                outputUint[j] = depthStencil;
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/FormatTable.cs

@@ -1,196 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    static class FormatTable
-    {
-        private static readonly MTLPixelFormat[] _table;
-
-        static FormatTable()
-        {
-            _table = new MTLPixelFormat[Enum.GetNames(typeof(Format)).Length];
-
-            Add(Format.R8Unorm, MTLPixelFormat.R8Unorm);
-            Add(Format.R8Snorm, MTLPixelFormat.R8Snorm);
-            Add(Format.R8Uint, MTLPixelFormat.R8Uint);
-            Add(Format.R8Sint, MTLPixelFormat.R8Sint);
-            Add(Format.R16Float, MTLPixelFormat.R16Float);
-            Add(Format.R16Unorm, MTLPixelFormat.R16Unorm);
-            Add(Format.R16Snorm, MTLPixelFormat.R16Snorm);
-            Add(Format.R16Uint, MTLPixelFormat.R16Uint);
-            Add(Format.R16Sint, MTLPixelFormat.R16Sint);
-            Add(Format.R32Float, MTLPixelFormat.R32Float);
-            Add(Format.R32Uint, MTLPixelFormat.R32Uint);
-            Add(Format.R32Sint, MTLPixelFormat.R32Sint);
-            Add(Format.R8G8Unorm, MTLPixelFormat.RG8Unorm);
-            Add(Format.R8G8Snorm, MTLPixelFormat.RG8Snorm);
-            Add(Format.R8G8Uint, MTLPixelFormat.RG8Uint);
-            Add(Format.R8G8Sint, MTLPixelFormat.RG8Sint);
-            Add(Format.R16G16Float, MTLPixelFormat.RG16Float);
-            Add(Format.R16G16Unorm, MTLPixelFormat.RG16Unorm);
-            Add(Format.R16G16Snorm, MTLPixelFormat.RG16Snorm);
-            Add(Format.R16G16Uint, MTLPixelFormat.RG16Uint);
-            Add(Format.R16G16Sint, MTLPixelFormat.RG16Sint);
-            Add(Format.R32G32Float, MTLPixelFormat.RG32Float);
-            Add(Format.R32G32Uint, MTLPixelFormat.RG32Uint);
-            Add(Format.R32G32Sint, MTLPixelFormat.RG32Sint);
-            // Add(Format.R8G8B8Unorm,         MTLPixelFormat.R8G8B8Unorm);
-            // Add(Format.R8G8B8Snorm,         MTLPixelFormat.R8G8B8Snorm);
-            // Add(Format.R8G8B8Uint,          MTLPixelFormat.R8G8B8Uint);
-            // Add(Format.R8G8B8Sint,          MTLPixelFormat.R8G8B8Sint);
-            // Add(Format.R16G16B16Float,      MTLPixelFormat.R16G16B16Float);
-            // Add(Format.R16G16B16Unorm,      MTLPixelFormat.R16G16B16Unorm);
-            // Add(Format.R16G16B16Snorm,      MTLPixelFormat.R16G16B16SNorm);
-            // Add(Format.R16G16B16Uint,       MTLPixelFormat.R16G16B16Uint);
-            // Add(Format.R16G16B16Sint,       MTLPixelFormat.R16G16B16Sint);
-            // Add(Format.R32G32B32Float,      MTLPixelFormat.R32G32B32Sfloat);
-            // Add(Format.R32G32B32Uint,       MTLPixelFormat.R32G32B32Uint);
-            // Add(Format.R32G32B32Sint,       MTLPixelFormat.R32G32B32Sint);
-            Add(Format.R8G8B8A8Unorm, MTLPixelFormat.RGBA8Unorm);
-            Add(Format.R8G8B8A8Snorm, MTLPixelFormat.RGBA8Snorm);
-            Add(Format.R8G8B8A8Uint, MTLPixelFormat.RGBA8Uint);
-            Add(Format.R8G8B8A8Sint, MTLPixelFormat.RGBA8Sint);
-            Add(Format.R16G16B16A16Float, MTLPixelFormat.RGBA16Float);
-            Add(Format.R16G16B16A16Unorm, MTLPixelFormat.RGBA16Unorm);
-            Add(Format.R16G16B16A16Snorm, MTLPixelFormat.RGBA16Snorm);
-            Add(Format.R16G16B16A16Uint, MTLPixelFormat.RGBA16Uint);
-            Add(Format.R16G16B16A16Sint, MTLPixelFormat.RGBA16Sint);
-            Add(Format.R32G32B32A32Float, MTLPixelFormat.RGBA32Float);
-            Add(Format.R32G32B32A32Uint, MTLPixelFormat.RGBA32Uint);
-            Add(Format.R32G32B32A32Sint, MTLPixelFormat.RGBA32Sint);
-            Add(Format.S8Uint, MTLPixelFormat.Stencil8);
-            Add(Format.D16Unorm, MTLPixelFormat.Depth16Unorm);
-            Add(Format.S8UintD24Unorm, MTLPixelFormat.Depth24UnormStencil8);
-            Add(Format.X8UintD24Unorm, MTLPixelFormat.Depth24UnormStencil8);
-            Add(Format.D32Float, MTLPixelFormat.Depth32Float);
-            Add(Format.D24UnormS8Uint, MTLPixelFormat.Depth24UnormStencil8);
-            Add(Format.D32FloatS8Uint, MTLPixelFormat.Depth32FloatStencil8);
-            Add(Format.R8G8B8A8Srgb, MTLPixelFormat.RGBA8UnormsRGB);
-            // Add(Format.R4G4Unorm,           MTLPixelFormat.R4G4Unorm);
-            Add(Format.R4G4B4A4Unorm, MTLPixelFormat.RGBA8Unorm);
-            // Add(Format.R5G5B5X1Unorm,       MTLPixelFormat.R5G5B5X1Unorm);
-            Add(Format.R5G5B5A1Unorm, MTLPixelFormat.BGR5A1Unorm);
-            Add(Format.R5G6B5Unorm, MTLPixelFormat.B5G6R5Unorm);
-            Add(Format.R10G10B10A2Unorm, MTLPixelFormat.RGB10A2Unorm);
-            Add(Format.R10G10B10A2Uint, MTLPixelFormat.RGB10A2Uint);
-            Add(Format.R11G11B10Float, MTLPixelFormat.RG11B10Float);
-            Add(Format.R9G9B9E5Float, MTLPixelFormat.RGB9E5Float);
-            Add(Format.Bc1RgbaUnorm, MTLPixelFormat.BC1RGBA);
-            Add(Format.Bc2Unorm, MTLPixelFormat.BC2RGBA);
-            Add(Format.Bc3Unorm, MTLPixelFormat.BC3RGBA);
-            Add(Format.Bc1RgbaSrgb, MTLPixelFormat.BC1RGBAsRGB);
-            Add(Format.Bc2Srgb, MTLPixelFormat.BC2RGBAsRGB);
-            Add(Format.Bc3Srgb, MTLPixelFormat.BC3RGBAsRGB);
-            Add(Format.Bc4Unorm, MTLPixelFormat.BC4RUnorm);
-            Add(Format.Bc4Snorm, MTLPixelFormat.BC4RSnorm);
-            Add(Format.Bc5Unorm, MTLPixelFormat.BC5RGUnorm);
-            Add(Format.Bc5Snorm, MTLPixelFormat.BC5RGSnorm);
-            Add(Format.Bc7Unorm, MTLPixelFormat.BC7RGBAUnorm);
-            Add(Format.Bc7Srgb, MTLPixelFormat.BC7RGBAUnormsRGB);
-            Add(Format.Bc6HSfloat, MTLPixelFormat.BC6HRGBFloat);
-            Add(Format.Bc6HUfloat, MTLPixelFormat.BC6HRGBUfloat);
-            Add(Format.Etc2RgbUnorm, MTLPixelFormat.ETC2RGB8);
-            // Add(Format.Etc2RgbaUnorm, MTLPixelFormat.ETC2RGBA8);
-            Add(Format.Etc2RgbPtaUnorm, MTLPixelFormat.ETC2RGB8A1);
-            Add(Format.Etc2RgbSrgb, MTLPixelFormat.ETC2RGB8sRGB);
-            // Add(Format.Etc2RgbaSrgb, MTLPixelFormat.ETC2RGBA8sRGB);
-            Add(Format.Etc2RgbPtaSrgb, MTLPixelFormat.ETC2RGB8A1sRGB);
-            // Add(Format.R8Uscaled,           MTLPixelFormat.R8Uscaled);
-            // Add(Format.R8Sscaled,           MTLPixelFormat.R8Sscaled);
-            // Add(Format.R16Uscaled,          MTLPixelFormat.R16Uscaled);
-            // Add(Format.R16Sscaled,          MTLPixelFormat.R16Sscaled);
-            // Add(Format.R32Uscaled,          MTLPixelFormat.R32Uscaled);
-            // Add(Format.R32Sscaled,          MTLPixelFormat.R32Sscaled);
-            // Add(Format.R8G8Uscaled,         MTLPixelFormat.R8G8Uscaled);
-            // Add(Format.R8G8Sscaled,         MTLPixelFormat.R8G8Sscaled);
-            // Add(Format.R16G16Uscaled,       MTLPixelFormat.R16G16Uscaled);
-            // Add(Format.R16G16Sscaled,       MTLPixelFormat.R16G16Sscaled);
-            // Add(Format.R32G32Uscaled,       MTLPixelFormat.R32G32Uscaled);
-            // Add(Format.R32G32Sscaled,       MTLPixelFormat.R32G32Sscaled);
-            // Add(Format.R8G8B8Uscaled,       MTLPixelFormat.R8G8B8Uscaled);
-            // Add(Format.R8G8B8Sscaled,       MTLPixelFormat.R8G8B8Sscaled);
-            // Add(Format.R16G16B16Uscaled,    MTLPixelFormat.R16G16B16Uscaled);
-            // Add(Format.R16G16B16Sscaled,    MTLPixelFormat.R16G16B16Sscaled);
-            // Add(Format.R32G32B32Uscaled,    MTLPixelFormat.R32G32B32Uscaled);
-            // Add(Format.R32G32B32Sscaled,    MTLPixelFormat.R32G32B32Sscaled);
-            // Add(Format.R8G8B8A8Uscaled,     MTLPixelFormat.R8G8B8A8Uscaled);
-            // Add(Format.R8G8B8A8Sscaled,     MTLPixelFormat.R8G8B8A8Sscaled);
-            // Add(Format.R16G16B16A16Uscaled, MTLPixelFormat.R16G16B16A16Uscaled);
-            // Add(Format.R16G16B16A16Sscaled, MTLPixelFormat.R16G16B16A16Sscaled);
-            // Add(Format.R32G32B32A32Uscaled, MTLPixelFormat.R32G32B32A32Uscaled);
-            // Add(Format.R32G32B32A32Sscaled, MTLPixelFormat.R32G32B32A32Sscaled);
-            // Add(Format.R10G10B10A2Snorm,    MTLPixelFormat.A2B10G10R10SNormPack32);
-            // Add(Format.R10G10B10A2Sint,     MTLPixelFormat.A2B10G10R10SintPack32);
-            // Add(Format.R10G10B10A2Uscaled,  MTLPixelFormat.A2B10G10R10UscaledPack32);
-            // Add(Format.R10G10B10A2Sscaled,  MTLPixelFormat.A2B10G10R10SscaledPack32);
-            Add(Format.Astc4x4Unorm, MTLPixelFormat.ASTC4x4LDR);
-            Add(Format.Astc5x4Unorm, MTLPixelFormat.ASTC5x4LDR);
-            Add(Format.Astc5x5Unorm, MTLPixelFormat.ASTC5x5LDR);
-            Add(Format.Astc6x5Unorm, MTLPixelFormat.ASTC6x5LDR);
-            Add(Format.Astc6x6Unorm, MTLPixelFormat.ASTC6x6LDR);
-            Add(Format.Astc8x5Unorm, MTLPixelFormat.ASTC8x5LDR);
-            Add(Format.Astc8x6Unorm, MTLPixelFormat.ASTC8x6LDR);
-            Add(Format.Astc8x8Unorm, MTLPixelFormat.ASTC8x8LDR);
-            Add(Format.Astc10x5Unorm, MTLPixelFormat.ASTC10x5LDR);
-            Add(Format.Astc10x6Unorm, MTLPixelFormat.ASTC10x6LDR);
-            Add(Format.Astc10x8Unorm, MTLPixelFormat.ASTC10x8LDR);
-            Add(Format.Astc10x10Unorm, MTLPixelFormat.ASTC10x10LDR);
-            Add(Format.Astc12x10Unorm, MTLPixelFormat.ASTC12x10LDR);
-            Add(Format.Astc12x12Unorm, MTLPixelFormat.ASTC12x12LDR);
-            Add(Format.Astc4x4Srgb, MTLPixelFormat.ASTC4x4sRGB);
-            Add(Format.Astc5x4Srgb, MTLPixelFormat.ASTC5x4sRGB);
-            Add(Format.Astc5x5Srgb, MTLPixelFormat.ASTC5x5sRGB);
-            Add(Format.Astc6x5Srgb, MTLPixelFormat.ASTC6x5sRGB);
-            Add(Format.Astc6x6Srgb, MTLPixelFormat.ASTC6x6sRGB);
-            Add(Format.Astc8x5Srgb, MTLPixelFormat.ASTC8x5sRGB);
-            Add(Format.Astc8x6Srgb, MTLPixelFormat.ASTC8x6sRGB);
-            Add(Format.Astc8x8Srgb, MTLPixelFormat.ASTC8x8sRGB);
-            Add(Format.Astc10x5Srgb, MTLPixelFormat.ASTC10x5sRGB);
-            Add(Format.Astc10x6Srgb, MTLPixelFormat.ASTC10x6sRGB);
-            Add(Format.Astc10x8Srgb, MTLPixelFormat.ASTC10x8sRGB);
-            Add(Format.Astc10x10Srgb, MTLPixelFormat.ASTC10x10sRGB);
-            Add(Format.Astc12x10Srgb, MTLPixelFormat.ASTC12x10sRGB);
-            Add(Format.Astc12x12Srgb, MTLPixelFormat.ASTC12x12sRGB);
-            Add(Format.B5G6R5Unorm, MTLPixelFormat.B5G6R5Unorm);
-            Add(Format.B5G5R5A1Unorm, MTLPixelFormat.BGR5A1Unorm);
-            Add(Format.A1B5G5R5Unorm, MTLPixelFormat.A1BGR5Unorm);
-            Add(Format.B8G8R8A8Unorm, MTLPixelFormat.BGRA8Unorm);
-            Add(Format.B8G8R8A8Srgb, MTLPixelFormat.BGRA8UnormsRGB);
-        }
-
-        private static void Add(Format format, MTLPixelFormat mtlFormat)
-        {
-            _table[(int)format] = mtlFormat;
-        }
-
-        public static MTLPixelFormat GetFormat(Format format)
-        {
-            var mtlFormat = _table[(int)format];
-
-            if (IsD24S8(format))
-            {
-                if (!MTLDevice.CreateSystemDefaultDevice().Depth24Stencil8PixelFormatSupported)
-                {
-                    mtlFormat = MTLPixelFormat.Depth32FloatStencil8;
-                }
-            }
-
-            if (mtlFormat == MTLPixelFormat.Invalid)
-            {
-                Logger.Error?.PrintMsg(LogClass.Gpu, $"Format {format} is not supported by the host.");
-            }
-
-            return mtlFormat;
-        }
-
-        public static bool IsD24S8(Format format)
-        {
-            return format == Format.D24UnormS8Uint || format == Format.S8UintD24Unorm || format == Format.X8UintD24Unorm;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/HardwareInfo.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Graphics.Metal
-{
-    static partial class HardwareInfoTools
-    {
-
-        private readonly static IntPtr _kCFAllocatorDefault = IntPtr.Zero;
-        private readonly static UInt32 _kCFStringEncodingASCII = 0x0600;
-        private const string IOKit = "/System/Library/Frameworks/IOKit.framework/IOKit";
-        private const string CoreFoundation = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
-
-        [LibraryImport(IOKit, StringMarshalling = StringMarshalling.Utf8)]
-        private static partial IntPtr IOServiceMatching(string name);
-
-        [LibraryImport(IOKit)]
-        private static partial IntPtr IOServiceGetMatchingService(IntPtr mainPort, IntPtr matching);
-
-        [LibraryImport(IOKit)]
-        private static partial IntPtr IORegistryEntryCreateCFProperty(IntPtr entry, IntPtr key, IntPtr allocator, UInt32 options);
-
-        [LibraryImport(CoreFoundation, StringMarshalling = StringMarshalling.Utf8)]
-        private static partial IntPtr CFStringCreateWithCString(IntPtr allocator, string cString, UInt32 encoding);
-
-        [LibraryImport(CoreFoundation)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static partial bool CFStringGetCString(IntPtr theString, IntPtr buffer, long bufferSizes, UInt32 encoding);
-
-        [LibraryImport(CoreFoundation)]
-        public static partial IntPtr CFDataGetBytePtr(IntPtr theData);
-
-        static string GetNameFromId(uint id)
-        {
-            return id switch
-            {
-                0x1002 => "AMD",
-                0x106B => "Apple",
-                0x10DE => "NVIDIA",
-                0x13B5 => "ARM",
-                0x8086 => "Intel",
-                _ => $"0x{id:X}"
-            };
-        }
-
-        public static string GetVendor()
-        {
-            var serviceDict = IOServiceMatching("IOGPU");
-            var service = IOServiceGetMatchingService(IntPtr.Zero, serviceDict);
-            var cfString = CFStringCreateWithCString(_kCFAllocatorDefault, "vendor-id", _kCFStringEncodingASCII);
-            var cfProperty = IORegistryEntryCreateCFProperty(service, cfString, _kCFAllocatorDefault, 0);
-
-            byte[] buffer = new byte[4];
-            var bufferPtr = CFDataGetBytePtr(cfProperty);
-            Marshal.Copy(bufferPtr, buffer, 0, buffer.Length);
-
-            var vendorId = BitConverter.ToUInt32(buffer);
-
-            return GetNameFromId(vendorId);
-        }
-
-        public static string GetModel()
-        {
-            var serviceDict = IOServiceMatching("IOGPU");
-            var service = IOServiceGetMatchingService(IntPtr.Zero, serviceDict);
-            var cfString = CFStringCreateWithCString(_kCFAllocatorDefault, "model", _kCFStringEncodingASCII);
-            var cfProperty = IORegistryEntryCreateCFProperty(service, cfString, _kCFAllocatorDefault, 0);
-
-            char[] buffer = new char[64];
-            IntPtr bufferPtr = Marshal.AllocHGlobal(buffer.Length);
-
-            if (CFStringGetCString(cfProperty, bufferPtr, buffer.Length, _kCFStringEncodingASCII))
-            {
-                var model = Marshal.PtrToStringUTF8(bufferPtr);
-                Marshal.FreeHGlobal(bufferPtr);
-                return model;
-            }
-
-            return "";
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/HashTableSlim.cs

@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Graphics.Metal
-{
-    interface IRefEquatable<T>
-    {
-        bool Equals(ref T other);
-    }
-
-    class HashTableSlim<TKey, TValue> where TKey : IRefEquatable<TKey>
-    {
-        private const int TotalBuckets = 16; // Must be power of 2
-        private const int TotalBucketsMask = TotalBuckets - 1;
-
-        private struct Entry
-        {
-            public int Hash;
-            public TKey Key;
-            public TValue Value;
-        }
-
-        private struct Bucket
-        {
-            public int Length;
-            public Entry[] Entries;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public readonly Span<Entry> AsSpan()
-            {
-                return Entries == null ? Span<Entry>.Empty : Entries.AsSpan(0, Length);
-            }
-        }
-
-        private readonly Bucket[] _hashTable = new Bucket[TotalBuckets];
-
-        public IEnumerable<TKey> Keys
-        {
-            get
-            {
-                foreach (Bucket bucket in _hashTable)
-                {
-                    for (int i = 0; i < bucket.Length; i++)
-                    {
-                        yield return bucket.Entries[i].Key;
-                    }
-                }
-            }
-        }
-
-        public IEnumerable<TValue> Values
-        {
-            get
-            {
-                foreach (Bucket bucket in _hashTable)
-                {
-                    for (int i = 0; i < bucket.Length; i++)
-                    {
-                        yield return bucket.Entries[i].Value;
-                    }
-                }
-            }
-        }
-
-        public void Add(ref TKey key, TValue value)
-        {
-            var entry = new Entry
-            {
-                Hash = key.GetHashCode(),
-                Key = key,
-                Value = value,
-            };
-
-            int hashCode = key.GetHashCode();
-            int bucketIndex = hashCode & TotalBucketsMask;
-
-            ref var bucket = ref _hashTable[bucketIndex];
-            if (bucket.Entries != null)
-            {
-                int index = bucket.Length;
-
-                if (index >= bucket.Entries.Length)
-                {
-                    Array.Resize(ref bucket.Entries, index + 1);
-                }
-
-                bucket.Entries[index] = entry;
-            }
-            else
-            {
-                bucket.Entries = new[]
-                {
-                    entry,
-                };
-            }
-
-            bucket.Length++;
-        }
-
-        public bool Remove(ref TKey key)
-        {
-            int hashCode = key.GetHashCode();
-
-            ref var bucket = ref _hashTable[hashCode & TotalBucketsMask];
-            var entries = bucket.AsSpan();
-            for (int i = 0; i < entries.Length; i++)
-            {
-                ref var entry = ref entries[i];
-
-                if (entry.Hash == hashCode && entry.Key.Equals(ref key))
-                {
-                    entries[(i + 1)..].CopyTo(entries[i..]);
-                    bucket.Length--;
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public bool TryGetValue(ref TKey key, out TValue value)
-        {
-            int hashCode = key.GetHashCode();
-
-            var entries = _hashTable[hashCode & TotalBucketsMask].AsSpan();
-            for (int i = 0; i < entries.Length; i++)
-            {
-                ref var entry = ref entries[i];
-
-                if (entry.Hash == hashCode && entry.Key.Equals(ref key))
-                {
-                    value = entry.Value;
-                    return true;
-                }
-            }
-
-            value = default;
-            return false;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/HelperShader.cs

@@ -1,868 +0,0 @@
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Shader;
-using Ryujinx.Graphics.Shader.Translation;
-using SharpMetal.Metal;
-using System;
-using System.Collections.Generic;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class HelperShader : IDisposable
-    {
-        private const int ConvertElementsPerWorkgroup = 32 * 100; // Work group size of 32 times 100 elements.
-        private const string ShadersSourcePath = "/Ryujinx.Graphics.Metal/Shaders";
-        private readonly MetalRenderer _renderer;
-        private readonly Pipeline _pipeline;
-        private MTLDevice _device;
-
-        private readonly ISampler _samplerLinear;
-        private readonly ISampler _samplerNearest;
-        private readonly IProgram _programColorBlitF;
-        private readonly IProgram _programColorBlitI;
-        private readonly IProgram _programColorBlitU;
-        private readonly IProgram _programColorBlitMsF;
-        private readonly IProgram _programColorBlitMsI;
-        private readonly IProgram _programColorBlitMsU;
-        private readonly List<IProgram> _programsColorClearF = new();
-        private readonly List<IProgram> _programsColorClearI = new();
-        private readonly List<IProgram> _programsColorClearU = new();
-        private readonly IProgram _programDepthStencilClear;
-        private readonly IProgram _programStrideChange;
-        private readonly IProgram _programConvertD32S8ToD24S8;
-        private readonly IProgram _programConvertIndexBuffer;
-        private readonly IProgram _programDepthBlit;
-        private readonly IProgram _programDepthBlitMs;
-        private readonly IProgram _programStencilBlit;
-        private readonly IProgram _programStencilBlitMs;
-
-        private readonly EncoderState _helperShaderState = new();
-
-        public HelperShader(MTLDevice device, MetalRenderer renderer, Pipeline pipeline)
-        {
-            _device = device;
-            _renderer = renderer;
-            _pipeline = pipeline;
-
-            _samplerNearest = new SamplerHolder(renderer, _device, SamplerCreateInfo.Create(MinFilter.Nearest, MagFilter.Nearest));
-            _samplerLinear = new SamplerHolder(renderer, _device, SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear));
-
-            var blitResourceLayout = new ResourceLayoutBuilder()
-                .Add(ResourceStages.Vertex, ResourceType.UniformBuffer, 0)
-                .Add(ResourceStages.Fragment, ResourceType.TextureAndSampler, 0).Build();
-
-            var blitSource = ReadMsl("Blit.metal");
-
-            var blitSourceF = blitSource.Replace("FORMAT", "float", StringComparison.Ordinal);
-            _programColorBlitF = new Program(renderer, device, [
-                new ShaderSource(blitSourceF, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var blitSourceI = blitSource.Replace("FORMAT", "int");
-            _programColorBlitI = new Program(renderer, device, [
-                new ShaderSource(blitSourceI, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceI, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var blitSourceU = blitSource.Replace("FORMAT", "uint");
-            _programColorBlitU = new Program(renderer, device, [
-                new ShaderSource(blitSourceU, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceU, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var blitMsSource = ReadMsl("BlitMs.metal");
-
-            var blitMsSourceF = blitMsSource.Replace("FORMAT", "float");
-            _programColorBlitMsF = new Program(renderer, device, [
-                new ShaderSource(blitMsSourceF, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitMsSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var blitMsSourceI = blitMsSource.Replace("FORMAT", "int");
-            _programColorBlitMsI = new Program(renderer, device, [
-                new ShaderSource(blitMsSourceI, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitMsSourceI, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var blitMsSourceU = blitMsSource.Replace("FORMAT", "uint");
-            _programColorBlitMsU = new Program(renderer, device, [
-                new ShaderSource(blitMsSourceU, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitMsSourceU, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var colorClearResourceLayout = new ResourceLayoutBuilder()
-                .Add(ResourceStages.Fragment, ResourceType.UniformBuffer, 0).Build();
-
-            var colorClearSource = ReadMsl("ColorClear.metal");
-
-            for (int i = 0; i < Constants.MaxColorAttachments; i++)
-            {
-                var crntSource = colorClearSource.Replace("COLOR_ATTACHMENT_INDEX", i.ToString()).Replace("FORMAT", "float");
-                _programsColorClearF.Add(new Program(renderer, device, [
-                    new ShaderSource(crntSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                    new ShaderSource(crntSource, ShaderStage.Vertex, TargetLanguage.Msl)
-                ], colorClearResourceLayout));
-            }
-
-            for (int i = 0; i < Constants.MaxColorAttachments; i++)
-            {
-                var crntSource = colorClearSource.Replace("COLOR_ATTACHMENT_INDEX", i.ToString()).Replace("FORMAT", "int");
-                _programsColorClearI.Add(new Program(renderer, device, [
-                    new ShaderSource(crntSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                    new ShaderSource(crntSource, ShaderStage.Vertex, TargetLanguage.Msl)
-                ], colorClearResourceLayout));
-            }
-
-            for (int i = 0; i < Constants.MaxColorAttachments; i++)
-            {
-                var crntSource = colorClearSource.Replace("COLOR_ATTACHMENT_INDEX", i.ToString()).Replace("FORMAT", "uint");
-                _programsColorClearU.Add(new Program(renderer, device, [
-                    new ShaderSource(crntSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                    new ShaderSource(crntSource, ShaderStage.Vertex, TargetLanguage.Msl)
-                ], colorClearResourceLayout));
-            }
-
-            var depthStencilClearSource = ReadMsl("DepthStencilClear.metal");
-            _programDepthStencilClear = new Program(renderer, device, [
-                new ShaderSource(depthStencilClearSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(depthStencilClearSource, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], colorClearResourceLayout);
-
-            var strideChangeResourceLayout = new ResourceLayoutBuilder()
-                .Add(ResourceStages.Compute, ResourceType.UniformBuffer, 0)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 1)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 2, true).Build();
-
-            var strideChangeSource = ReadMsl("ChangeBufferStride.metal");
-            _programStrideChange = new Program(renderer, device, [
-                new ShaderSource(strideChangeSource, ShaderStage.Compute, TargetLanguage.Msl)
-            ], strideChangeResourceLayout, new ComputeSize(64, 1, 1));
-
-            var convertD32S8ToD24S8ResourceLayout = new ResourceLayoutBuilder()
-                .Add(ResourceStages.Compute, ResourceType.UniformBuffer, 0)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 1)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 2, true).Build();
-
-            var convertD32S8ToD24S8Source = ReadMsl("ConvertD32S8ToD24S8.metal");
-            _programConvertD32S8ToD24S8 = new Program(renderer, device, [
-                new ShaderSource(convertD32S8ToD24S8Source, ShaderStage.Compute, TargetLanguage.Msl)
-            ], convertD32S8ToD24S8ResourceLayout, new ComputeSize(64, 1, 1));
-
-            var convertIndexBufferLayout = new ResourceLayoutBuilder()
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 1)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 2, true)
-                .Add(ResourceStages.Compute, ResourceType.StorageBuffer, 3).Build();
-
-            var convertIndexBufferSource = ReadMsl("ConvertIndexBuffer.metal");
-            _programConvertIndexBuffer = new Program(renderer, device, [
-                new ShaderSource(convertIndexBufferSource, ShaderStage.Compute, TargetLanguage.Msl)
-            ], convertIndexBufferLayout, new ComputeSize(16, 1, 1));
-
-            var depthBlitSource = ReadMsl("DepthBlit.metal");
-            _programDepthBlit = new Program(renderer, device, [
-                new ShaderSource(depthBlitSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var depthBlitMsSource = ReadMsl("DepthBlitMs.metal");
-            _programDepthBlitMs = new Program(renderer, device, [
-                new ShaderSource(depthBlitMsSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var stencilBlitSource = ReadMsl("StencilBlit.metal");
-            _programStencilBlit = new Program(renderer, device, [
-                new ShaderSource(stencilBlitSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-
-            var stencilBlitMsSource = ReadMsl("StencilBlitMs.metal");
-            _programStencilBlitMs = new Program(renderer, device, [
-                new ShaderSource(stencilBlitMsSource, ShaderStage.Fragment, TargetLanguage.Msl),
-                new ShaderSource(blitSourceF, ShaderStage.Vertex, TargetLanguage.Msl)
-            ], blitResourceLayout);
-        }
-
-        private static string ReadMsl(string fileName)
-        {
-            var msl = EmbeddedResources.ReadAllText(string.Join('/', ShadersSourcePath, fileName));
-
-#pragma warning disable IDE0055 // Disable formatting
-            msl = msl.Replace("CONSTANT_BUFFERS_INDEX", $"{Constants.ConstantBuffersIndex}")
-                     .Replace("STORAGE_BUFFERS_INDEX", $"{Constants.StorageBuffersIndex}")
-                     .Replace("TEXTURES_INDEX", $"{Constants.TexturesIndex}")
-                     .Replace("IMAGES_INDEX", $"{Constants.ImagesIndex}");
-#pragma warning restore IDE0055
-
-            return msl;
-        }
-
-        public unsafe void BlitColor(
-            CommandBufferScoped cbs,
-            Texture src,
-            Texture dst,
-            Extents2D srcRegion,
-            Extents2D dstRegion,
-            bool linearFilter,
-            bool clear = false)
-        {
-            _pipeline.SwapState(_helperShaderState);
-
-            const int RegionBufferSize = 16;
-
-            var sampler = linearFilter ? _samplerLinear : _samplerNearest;
-
-            _pipeline.SetTextureAndSampler(ShaderStage.Fragment, 0, src, sampler);
-
-            Span<float> region = stackalloc float[RegionBufferSize / sizeof(float)];
-
-            region[0] = srcRegion.X1 / (float)src.Width;
-            region[1] = srcRegion.X2 / (float)src.Width;
-            region[2] = srcRegion.Y1 / (float)src.Height;
-            region[3] = srcRegion.Y2 / (float)src.Height;
-
-            if (dstRegion.X1 > dstRegion.X2)
-            {
-                (region[0], region[1]) = (region[1], region[0]);
-            }
-
-            if (dstRegion.Y1 > dstRegion.Y2)
-            {
-                (region[2], region[3]) = (region[3], region[2]);
-            }
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(cbs, RegionBufferSize);
-            buffer.Holder.SetDataUnchecked<float>(buffer.Offset, region);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            var rect = new Rectangle<float>(
-                MathF.Min(dstRegion.X1, dstRegion.X2),
-                MathF.Min(dstRegion.Y1, dstRegion.Y2),
-                MathF.Abs(dstRegion.X2 - dstRegion.X1),
-                MathF.Abs(dstRegion.Y2 - dstRegion.Y1));
-
-            Span<Viewport> viewports = stackalloc Viewport[16];
-
-            viewports[0] = new Viewport(
-                rect,
-                ViewportSwizzle.PositiveX,
-                ViewportSwizzle.PositiveY,
-                ViewportSwizzle.PositiveZ,
-                ViewportSwizzle.PositiveW,
-                0f,
-                1f);
-
-            bool dstIsDepthOrStencil = dst.Info.Format.IsDepthOrStencil();
-
-            if (dstIsDepthOrStencil)
-            {
-                // TODO: Depth & stencil blit!
-                Logger.Warning?.PrintMsg(LogClass.Gpu, "Requested a depth or stencil blit!");
-                _pipeline.SwapState(null);
-                return;
-            }
-
-            var debugGroupName = "Blit Color ";
-
-            if (src.Info.Target.IsMultisample())
-            {
-                if (dst.Info.Format.IsSint())
-                {
-                    debugGroupName += "MS Int";
-                    _pipeline.SetProgram(_programColorBlitMsI);
-                }
-                else if (dst.Info.Format.IsUint())
-                {
-                    debugGroupName += "MS UInt";
-                    _pipeline.SetProgram(_programColorBlitMsU);
-                }
-                else
-                {
-                    debugGroupName += "MS Float";
-                    _pipeline.SetProgram(_programColorBlitMsF);
-                }
-            }
-            else
-            {
-                if (dst.Info.Format.IsSint())
-                {
-                    debugGroupName += "Int";
-                    _pipeline.SetProgram(_programColorBlitI);
-                }
-                else if (dst.Info.Format.IsUint())
-                {
-                    debugGroupName += "UInt";
-                    _pipeline.SetProgram(_programColorBlitU);
-                }
-                else
-                {
-                    debugGroupName += "Float";
-                    _pipeline.SetProgram(_programColorBlitF);
-                }
-            }
-
-            int dstWidth = dst.Width;
-            int dstHeight = dst.Height;
-
-            Span<Rectangle<int>> scissors = stackalloc Rectangle<int>[16];
-
-            scissors[0] = new Rectangle<int>(0, 0, dstWidth, dstHeight);
-
-            _pipeline.SetRenderTargets([dst], null);
-            _pipeline.SetScissors(scissors);
-
-            _pipeline.SetClearLoadAction(clear);
-
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-            _pipeline.Draw(4, 1, 0, 0, debugGroupName);
-
-            // Cleanup
-            if (clear)
-            {
-                _pipeline.SetClearLoadAction(false);
-            }
-
-            // Restore previous state
-            _pipeline.SwapState(null);
-        }
-
-        public unsafe void BlitDepthStencil(
-            CommandBufferScoped cbs,
-            Texture src,
-            Texture dst,
-            Extents2D srcRegion,
-            Extents2D dstRegion)
-        {
-            _pipeline.SwapState(_helperShaderState);
-
-            const int RegionBufferSize = 16;
-
-            Span<float> region = stackalloc float[RegionBufferSize / sizeof(float)];
-
-            region[0] = srcRegion.X1 / (float)src.Width;
-            region[1] = srcRegion.X2 / (float)src.Width;
-            region[2] = srcRegion.Y1 / (float)src.Height;
-            region[3] = srcRegion.Y2 / (float)src.Height;
-
-            if (dstRegion.X1 > dstRegion.X2)
-            {
-                (region[0], region[1]) = (region[1], region[0]);
-            }
-
-            if (dstRegion.Y1 > dstRegion.Y2)
-            {
-                (region[2], region[3]) = (region[3], region[2]);
-            }
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(cbs, RegionBufferSize);
-            buffer.Holder.SetDataUnchecked<float>(buffer.Offset, region);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            Span<Viewport> viewports = stackalloc Viewport[16];
-
-            var rect = new Rectangle<float>(
-                MathF.Min(dstRegion.X1, dstRegion.X2),
-                MathF.Min(dstRegion.Y1, dstRegion.Y2),
-                MathF.Abs(dstRegion.X2 - dstRegion.X1),
-                MathF.Abs(dstRegion.Y2 - dstRegion.Y1));
-
-            viewports[0] = new Viewport(
-                rect,
-                ViewportSwizzle.PositiveX,
-                ViewportSwizzle.PositiveY,
-                ViewportSwizzle.PositiveZ,
-                ViewportSwizzle.PositiveW,
-                0f,
-                1f);
-
-            int dstWidth = dst.Width;
-            int dstHeight = dst.Height;
-
-            Span<Rectangle<int>> scissors = stackalloc Rectangle<int>[16];
-
-            scissors[0] = new Rectangle<int>(0, 0, dstWidth, dstHeight);
-
-            _pipeline.SetRenderTargets([], dst);
-            _pipeline.SetScissors(scissors);
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-
-            if (src.Info.Format is
-                Format.D16Unorm or
-                Format.D32Float or
-                Format.X8UintD24Unorm or
-                Format.D24UnormS8Uint or
-                Format.D32FloatS8Uint or
-                Format.S8UintD24Unorm)
-            {
-                var depthTexture = CreateDepthOrStencilView(src, DepthStencilMode.Depth);
-
-                BlitDepthStencilDraw(depthTexture, isDepth: true);
-
-                if (depthTexture != src)
-                {
-                    depthTexture.Release();
-                }
-            }
-
-            if (src.Info.Format is
-                Format.S8Uint or
-                Format.D24UnormS8Uint or
-                Format.D32FloatS8Uint or
-                Format.S8UintD24Unorm)
-            {
-                var stencilTexture = CreateDepthOrStencilView(src, DepthStencilMode.Stencil);
-
-                BlitDepthStencilDraw(stencilTexture, isDepth: false);
-
-                if (stencilTexture != src)
-                {
-                    stencilTexture.Release();
-                }
-            }
-
-            // Restore previous state
-            _pipeline.SwapState(null);
-        }
-
-        private static Texture CreateDepthOrStencilView(Texture depthStencilTexture, DepthStencilMode depthStencilMode)
-        {
-            if (depthStencilTexture.Info.DepthStencilMode == depthStencilMode)
-            {
-                return depthStencilTexture;
-            }
-
-            return (Texture)depthStencilTexture.CreateView(new TextureCreateInfo(
-                depthStencilTexture.Info.Width,
-                depthStencilTexture.Info.Height,
-                depthStencilTexture.Info.Depth,
-                depthStencilTexture.Info.Levels,
-                depthStencilTexture.Info.Samples,
-                depthStencilTexture.Info.BlockWidth,
-                depthStencilTexture.Info.BlockHeight,
-                depthStencilTexture.Info.BytesPerPixel,
-                depthStencilTexture.Info.Format,
-                depthStencilMode,
-                depthStencilTexture.Info.Target,
-                SwizzleComponent.Red,
-                SwizzleComponent.Green,
-                SwizzleComponent.Blue,
-                SwizzleComponent.Alpha), 0, 0);
-        }
-
-        private void BlitDepthStencilDraw(Texture src, bool isDepth)
-        {
-            // TODO: Check this https://github.com/Ryujinx/Ryujinx/pull/5003/
-            _pipeline.SetTextureAndSampler(ShaderStage.Fragment, 0, src, _samplerNearest);
-
-            string debugGroupName;
-
-            if (isDepth)
-            {
-                debugGroupName = "Depth Blit";
-                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
-                _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
-            }
-            else
-            {
-                debugGroupName = "Stencil Blit";
-                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programStencilBlitMs : _programStencilBlit);
-                _pipeline.SetStencilTest(CreateStencilTestDescriptor(true));
-            }
-
-            _pipeline.Draw(4, 1, 0, 0, debugGroupName);
-
-            if (isDepth)
-            {
-                _pipeline.SetDepthTest(new DepthTestDescriptor(false, false, CompareOp.Always));
-            }
-            else
-            {
-                _pipeline.SetStencilTest(CreateStencilTestDescriptor(false));
-            }
-        }
-
-        public unsafe void DrawTexture(
-            ITexture src,
-            ISampler srcSampler,
-            Extents2DF srcRegion,
-            Extents2DF dstRegion)
-        {
-            // Save current state
-            var state = _pipeline.SavePredrawState();
-
-            _pipeline.SetFaceCulling(false, Face.Front);
-            _pipeline.SetStencilTest(new StencilTestDescriptor());
-            _pipeline.SetDepthTest(new DepthTestDescriptor());
-
-            const int RegionBufferSize = 16;
-
-            _pipeline.SetTextureAndSampler(ShaderStage.Fragment, 0, src, srcSampler);
-
-            Span<float> region = stackalloc float[RegionBufferSize / sizeof(float)];
-
-            region[0] = srcRegion.X1 / src.Width;
-            region[1] = srcRegion.X2 / src.Width;
-            region[2] = srcRegion.Y1 / src.Height;
-            region[3] = srcRegion.Y2 / src.Height;
-
-            if (dstRegion.X1 > dstRegion.X2)
-            {
-                (region[0], region[1]) = (region[1], region[0]);
-            }
-
-            if (dstRegion.Y1 > dstRegion.Y2)
-            {
-                (region[2], region[3]) = (region[3], region[2]);
-            }
-
-            var bufferHandle = _renderer.BufferManager.CreateWithHandle(RegionBufferSize);
-            _renderer.BufferManager.SetData<float>(bufferHandle, 0, region);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, new BufferRange(bufferHandle, 0, RegionBufferSize))]);
-
-            Span<Viewport> viewports = stackalloc Viewport[16];
-
-            var rect = new Rectangle<float>(
-                MathF.Min(dstRegion.X1, dstRegion.X2),
-                MathF.Min(dstRegion.Y1, dstRegion.Y2),
-                MathF.Abs(dstRegion.X2 - dstRegion.X1),
-                MathF.Abs(dstRegion.Y2 - dstRegion.Y1));
-
-            viewports[0] = new Viewport(
-                rect,
-                ViewportSwizzle.PositiveX,
-                ViewportSwizzle.PositiveY,
-                ViewportSwizzle.PositiveZ,
-                ViewportSwizzle.PositiveW,
-                0f,
-                1f);
-
-            _pipeline.SetProgram(_programColorBlitF);
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-            _pipeline.Draw(4, 1, 0, 0, "Draw Texture");
-
-            _renderer.BufferManager.Delete(bufferHandle);
-
-            // Restore previous state
-            _pipeline.RestorePredrawState(state);
-        }
-
-        public void ConvertI8ToI16(CommandBufferScoped cbs, BufferHolder src, BufferHolder dst, int srcOffset, int size)
-        {
-            ChangeStride(cbs, src, dst, srcOffset, size, 1, 2);
-        }
-
-        public unsafe void ChangeStride(
-            CommandBufferScoped cbs,
-            BufferHolder src,
-            BufferHolder dst,
-            int srcOffset,
-            int size,
-            int stride,
-            int newStride)
-        {
-            int elems = size / stride;
-
-            var srcBuffer = src.GetBuffer();
-            var dstBuffer = dst.GetBuffer();
-
-            const int ParamsBufferSize = 4 * sizeof(int);
-
-            // Save current state
-            _pipeline.SwapState(_helperShaderState);
-
-            Span<int> shaderParams = stackalloc int[ParamsBufferSize / sizeof(int)];
-
-            shaderParams[0] = stride;
-            shaderParams[1] = newStride;
-            shaderParams[2] = size;
-            shaderParams[3] = srcOffset;
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(cbs, ParamsBufferSize);
-            buffer.Holder.SetDataUnchecked<int>(buffer.Offset, shaderParams);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            Span<Auto<DisposableBuffer>> sbRanges = new Auto<DisposableBuffer>[2];
-
-            sbRanges[0] = srcBuffer;
-            sbRanges[1] = dstBuffer;
-            _pipeline.SetStorageBuffers(1, sbRanges);
-
-            _pipeline.SetProgram(_programStrideChange);
-            _pipeline.DispatchCompute(1 + elems / ConvertElementsPerWorkgroup, 1, 1, "Change Stride");
-
-            // Restore previous state
-            _pipeline.SwapState(null);
-        }
-
-        public unsafe void ConvertD32S8ToD24S8(CommandBufferScoped cbs, BufferHolder src, Auto<DisposableBuffer> dstBuffer, int pixelCount, int dstOffset)
-        {
-            int inSize = pixelCount * 2 * sizeof(int);
-
-            var srcBuffer = src.GetBuffer();
-
-            const int ParamsBufferSize = sizeof(int) * 2;
-
-            // Save current state
-            _pipeline.SwapState(_helperShaderState);
-
-            Span<int> shaderParams = stackalloc int[2];
-
-            shaderParams[0] = pixelCount;
-            shaderParams[1] = dstOffset;
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(cbs, ParamsBufferSize);
-            buffer.Holder.SetDataUnchecked<int>(buffer.Offset, shaderParams);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            Span<Auto<DisposableBuffer>> sbRanges = new Auto<DisposableBuffer>[2];
-
-            sbRanges[0] = srcBuffer;
-            sbRanges[1] = dstBuffer;
-            _pipeline.SetStorageBuffers(1, sbRanges);
-
-            _pipeline.SetProgram(_programConvertD32S8ToD24S8);
-            _pipeline.DispatchCompute(1 + inSize / ConvertElementsPerWorkgroup, 1, 1, "D32S8 to D24S8 Conversion");
-
-            // Restore previous state
-            _pipeline.SwapState(null);
-        }
-
-        public void ConvertIndexBuffer(
-            CommandBufferScoped cbs,
-            BufferHolder src,
-            BufferHolder dst,
-            IndexBufferPattern pattern,
-            int indexSize,
-            int srcOffset,
-            int indexCount)
-        {
-            // TODO: Support conversion with primitive restart enabled.
-
-            int primitiveCount = pattern.GetPrimitiveCount(indexCount);
-            int outputIndexSize = 4;
-
-            var srcBuffer = src.GetBuffer();
-            var dstBuffer = dst.GetBuffer();
-
-            const int ParamsBufferSize = 16 * sizeof(int);
-
-            // Save current state
-            _pipeline.SwapState(_helperShaderState);
-
-            Span<int> shaderParams = stackalloc int[ParamsBufferSize / sizeof(int)];
-
-            shaderParams[8] = pattern.PrimitiveVertices;
-            shaderParams[9] = pattern.PrimitiveVerticesOut;
-            shaderParams[10] = indexSize;
-            shaderParams[11] = outputIndexSize;
-            shaderParams[12] = pattern.BaseIndex;
-            shaderParams[13] = pattern.IndexStride;
-            shaderParams[14] = srcOffset;
-            shaderParams[15] = primitiveCount;
-
-            pattern.OffsetIndex.CopyTo(shaderParams[..pattern.OffsetIndex.Length]);
-
-            using var patternScoped = _renderer.BufferManager.ReserveOrCreate(cbs, ParamsBufferSize);
-            patternScoped.Holder.SetDataUnchecked<int>(patternScoped.Offset, shaderParams);
-
-            Span<Auto<DisposableBuffer>> sbRanges = new Auto<DisposableBuffer>[2];
-
-            sbRanges[0] = srcBuffer;
-            sbRanges[1] = dstBuffer;
-            _pipeline.SetStorageBuffers(1, sbRanges);
-            _pipeline.SetStorageBuffers([new BufferAssignment(3, patternScoped.Range)]);
-
-            _pipeline.SetProgram(_programConvertIndexBuffer);
-            _pipeline.DispatchCompute(BitUtils.DivRoundUp(primitiveCount, 16), 1, 1, "Convert Index Buffer");
-
-            // Restore previous state
-            _pipeline.SwapState(null);
-        }
-
-        public unsafe void ClearColor(
-            int index,
-            ReadOnlySpan<float> clearColor,
-            uint componentMask,
-            int dstWidth,
-            int dstHeight,
-            Format format)
-        {
-            // Keep original scissor
-            DirtyFlags clearFlags = DirtyFlags.All & (~DirtyFlags.Scissors);
-
-            // Save current state
-            EncoderState originalState = _pipeline.SwapState(_helperShaderState, clearFlags, false);
-
-            // Inherit some state without fully recreating render pipeline.
-            RenderTargetCopy save = _helperShaderState.InheritForClear(originalState, false, index);
-
-            const int ClearColorBufferSize = 16;
-
-            // TODO: Flush
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(_pipeline.Cbs, ClearColorBufferSize);
-            buffer.Holder.SetDataUnchecked(buffer.Offset, clearColor);
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            Span<Viewport> viewports = stackalloc Viewport[16];
-
-            // TODO: Set exact viewport!
-            viewports[0] = new Viewport(
-                new Rectangle<float>(0, 0, dstWidth, dstHeight),
-                ViewportSwizzle.PositiveX,
-                ViewportSwizzle.PositiveY,
-                ViewportSwizzle.PositiveZ,
-                ViewportSwizzle.PositiveW,
-                0f,
-                1f);
-
-            Span<uint> componentMasks = stackalloc uint[index + 1];
-            componentMasks[index] = componentMask;
-
-            var debugGroupName = "Clear Color ";
-
-            if (format.IsSint())
-            {
-                debugGroupName += "Int";
-                _pipeline.SetProgram(_programsColorClearI[index]);
-            }
-            else if (format.IsUint())
-            {
-                debugGroupName += "UInt";
-                _pipeline.SetProgram(_programsColorClearU[index]);
-            }
-            else
-            {
-                debugGroupName += "Float";
-                _pipeline.SetProgram(_programsColorClearF[index]);
-            }
-
-            _pipeline.SetBlendState(index, new BlendDescriptor());
-            _pipeline.SetFaceCulling(false, Face.Front);
-            _pipeline.SetDepthTest(new DepthTestDescriptor(false, false, CompareOp.Always));
-            _pipeline.SetRenderTargetColorMasks(componentMasks);
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-            _pipeline.Draw(4, 1, 0, 0, debugGroupName);
-
-            // Restore previous state
-            _pipeline.SwapState(null, clearFlags, false);
-
-            _helperShaderState.Restore(save);
-        }
-
-        public unsafe void ClearDepthStencil(
-            float depthValue,
-            bool depthMask,
-            int stencilValue,
-            int stencilMask,
-            int dstWidth,
-            int dstHeight)
-        {
-            // Keep original scissor
-            DirtyFlags clearFlags = DirtyFlags.All & (~DirtyFlags.Scissors);
-            var helperScissors = _helperShaderState.Scissors;
-
-            // Save current state
-            EncoderState originalState = _pipeline.SwapState(_helperShaderState, clearFlags, false);
-
-            // Inherit some state without fully recreating render pipeline.
-            RenderTargetCopy save = _helperShaderState.InheritForClear(originalState, true);
-
-            const int ClearDepthBufferSize = 16;
-
-            using var buffer = _renderer.BufferManager.ReserveOrCreate(_pipeline.Cbs, ClearDepthBufferSize);
-            buffer.Holder.SetDataUnchecked(buffer.Offset, new ReadOnlySpan<float>(ref depthValue));
-            _pipeline.SetUniformBuffers([new BufferAssignment(0, buffer.Range)]);
-
-            Span<Viewport> viewports = stackalloc Viewport[1];
-
-            viewports[0] = new Viewport(
-                new Rectangle<float>(0, 0, dstWidth, dstHeight),
-                ViewportSwizzle.PositiveX,
-                ViewportSwizzle.PositiveY,
-                ViewportSwizzle.PositiveZ,
-                ViewportSwizzle.PositiveW,
-                0f,
-                1f);
-
-            _pipeline.SetProgram(_programDepthStencilClear);
-            _pipeline.SetFaceCulling(false, Face.Front);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetDepthTest(new DepthTestDescriptor(true, depthMask, CompareOp.Always));
-            _pipeline.SetStencilTest(CreateStencilTestDescriptor(stencilMask != 0, stencilValue, 0xFF, stencilMask));
-            _pipeline.Draw(4, 1, 0, 0, "Clear Depth Stencil");
-
-            // Cleanup
-            _pipeline.SetDepthTest(new DepthTestDescriptor(false, false, CompareOp.Always));
-            _pipeline.SetStencilTest(CreateStencilTestDescriptor(false));
-
-            // Restore previous state
-            _pipeline.SwapState(null, clearFlags, false);
-
-            _helperShaderState.Restore(save);
-        }
-
-        private static StencilTestDescriptor CreateStencilTestDescriptor(
-            bool enabled,
-            int refValue = 0,
-            int compareMask = 0xff,
-            int writeMask = 0xff)
-        {
-            return new StencilTestDescriptor(
-                enabled,
-                CompareOp.Always,
-                StencilOp.Replace,
-                StencilOp.Replace,
-                StencilOp.Replace,
-                refValue,
-                compareMask,
-                writeMask,
-                CompareOp.Always,
-                StencilOp.Replace,
-                StencilOp.Replace,
-                StencilOp.Replace,
-                refValue,
-                compareMask,
-                writeMask);
-        }
-
-        public void Dispose()
-        {
-            _programColorBlitF.Dispose();
-            _programColorBlitI.Dispose();
-            _programColorBlitU.Dispose();
-            _programColorBlitMsF.Dispose();
-            _programColorBlitMsI.Dispose();
-            _programColorBlitMsU.Dispose();
-
-            foreach (var programColorClear in _programsColorClearF)
-            {
-                programColorClear.Dispose();
-            }
-
-            foreach (var programColorClear in _programsColorClearU)
-            {
-                programColorClear.Dispose();
-            }
-
-            foreach (var programColorClear in _programsColorClearI)
-            {
-                programColorClear.Dispose();
-            }
-
-            _programDepthStencilClear.Dispose();
-            _pipeline.Dispose();
-            _samplerLinear.Dispose();
-            _samplerNearest.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/IdList.cs

@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Graphics.Metal
-{
-    class IdList<T> where T : class
-    {
-        private readonly List<T> _list;
-        private int _freeMin;
-
-        public IdList()
-        {
-            _list = new List<T>();
-            _freeMin = 0;
-        }
-
-        public int Add(T value)
-        {
-            int id;
-            int count = _list.Count;
-            id = _list.IndexOf(null, _freeMin);
-
-            if ((uint)id < (uint)count)
-            {
-                _list[id] = value;
-            }
-            else
-            {
-                id = count;
-                _freeMin = id + 1;
-
-                _list.Add(value);
-            }
-
-            return id + 1;
-        }
-
-        public void Remove(int id)
-        {
-            id--;
-
-            int count = _list.Count;
-
-            if ((uint)id >= (uint)count)
-            {
-                return;
-            }
-
-            if (id + 1 == count)
-            {
-                // Trim unused items.
-                int removeIndex = id;
-
-                while (removeIndex > 0 && _list[removeIndex - 1] == null)
-                {
-                    removeIndex--;
-                }
-
-                _list.RemoveRange(removeIndex, count - removeIndex);
-
-                if (_freeMin > removeIndex)
-                {
-                    _freeMin = removeIndex;
-                }
-            }
-            else
-            {
-                _list[id] = null;
-
-                if (_freeMin > id)
-                {
-                    _freeMin = id;
-                }
-            }
-        }
-
-        public bool TryGetValue(int id, out T value)
-        {
-            id--;
-
-            try
-            {
-                if ((uint)id < (uint)_list.Count)
-                {
-                    value = _list[id];
-                    return value != null;
-                }
-
-                value = null;
-                return false;
-            }
-            catch (ArgumentOutOfRangeException)
-            {
-                value = null;
-                return false;
-            }
-            catch (IndexOutOfRangeException)
-            {
-                value = null;
-                return false;
-            }
-        }
-
-        public void Clear()
-        {
-            _list.Clear();
-            _freeMin = 0;
-        }
-
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = 0; i < _list.Count; i++)
-            {
-                if (_list[i] != null)
-                {
-                    yield return _list[i];
-                }
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/ImageArray.cs

@@ -1,74 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    internal class ImageArray : IImageArray
-    {
-        private readonly TextureRef[] _textureRefs;
-        private readonly TextureBuffer[] _bufferTextureRefs;
-
-        private readonly bool _isBuffer;
-        private readonly Pipeline _pipeline;
-
-        public ImageArray(int size, bool isBuffer, Pipeline pipeline)
-        {
-            if (isBuffer)
-            {
-                _bufferTextureRefs = new TextureBuffer[size];
-            }
-            else
-            {
-                _textureRefs = new TextureRef[size];
-            }
-
-            _isBuffer = isBuffer;
-            _pipeline = pipeline;
-        }
-
-        public void SetImages(int index, ITexture[] images)
-        {
-            for (int i = 0; i < images.Length; i++)
-            {
-                ITexture image = images[i];
-
-                if (image is TextureBuffer textureBuffer)
-                {
-                    _bufferTextureRefs[index + i] = textureBuffer;
-                }
-                else if (image is Texture texture)
-                {
-                    _textureRefs[index + i].Storage = texture;
-                }
-                else if (!_isBuffer)
-                {
-                    _textureRefs[index + i].Storage = null;
-                }
-                else
-                {
-                    _bufferTextureRefs[index + i] = null;
-                }
-            }
-
-            SetDirty();
-        }
-
-        public TextureRef[] GetTextureRefs()
-        {
-            return _textureRefs;
-        }
-
-        public TextureBuffer[] GetBufferTextureRefs()
-        {
-            return _bufferTextureRefs;
-        }
-
-        private void SetDirty()
-        {
-            _pipeline.DirtyImages();
-        }
-
-        public void Dispose() { }
-    }
-}

src/Ryujinx.Graphics.Metal/IndexBufferPattern.cs

@@ -1,118 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    internal class IndexBufferPattern : IDisposable
-    {
-        public int PrimitiveVertices { get; }
-        public int PrimitiveVerticesOut { get; }
-        public int BaseIndex { get; }
-        public int[] OffsetIndex { get; }
-        public int IndexStride { get; }
-        public bool RepeatStart { get; }
-
-        private readonly MetalRenderer _renderer;
-        private int _currentSize;
-        private BufferHandle _repeatingBuffer;
-
-        public IndexBufferPattern(MetalRenderer renderer,
-            int primitiveVertices,
-            int primitiveVerticesOut,
-            int baseIndex,
-            int[] offsetIndex,
-            int indexStride,
-            bool repeatStart)
-        {
-            PrimitiveVertices = primitiveVertices;
-            PrimitiveVerticesOut = primitiveVerticesOut;
-            BaseIndex = baseIndex;
-            OffsetIndex = offsetIndex;
-            IndexStride = indexStride;
-            RepeatStart = repeatStart;
-
-            _renderer = renderer;
-        }
-
-        public int GetPrimitiveCount(int vertexCount)
-        {
-            return Math.Max(0, (vertexCount - BaseIndex) / IndexStride);
-        }
-
-        public int GetConvertedCount(int indexCount)
-        {
-            int primitiveCount = GetPrimitiveCount(indexCount);
-            return primitiveCount * OffsetIndex.Length;
-        }
-
-        public BufferHandle GetRepeatingBuffer(int vertexCount, out int indexCount)
-        {
-            int primitiveCount = GetPrimitiveCount(vertexCount);
-            indexCount = primitiveCount * PrimitiveVerticesOut;
-
-            int expectedSize = primitiveCount * OffsetIndex.Length;
-
-            if (expectedSize <= _currentSize && _repeatingBuffer != BufferHandle.Null)
-            {
-                return _repeatingBuffer;
-            }
-
-            // Expand the repeating pattern to the number of requested primitives.
-            BufferHandle newBuffer = _renderer.BufferManager.CreateWithHandle(expectedSize * sizeof(int));
-
-            // Copy the old data to the new one.
-            if (_repeatingBuffer != BufferHandle.Null)
-            {
-                _renderer.Pipeline.CopyBuffer(_repeatingBuffer, newBuffer, 0, 0, _currentSize * sizeof(int));
-                _renderer.BufferManager.Delete(_repeatingBuffer);
-            }
-
-            _repeatingBuffer = newBuffer;
-
-            // Add the additional repeats on top.
-            int newPrimitives = primitiveCount;
-            int oldPrimitives = (_currentSize) / OffsetIndex.Length;
-
-            int[] newData;
-
-            newPrimitives -= oldPrimitives;
-            newData = new int[expectedSize - _currentSize];
-
-            int outOffset = 0;
-            int index = oldPrimitives * IndexStride + BaseIndex;
-
-            for (int i = 0; i < newPrimitives; i++)
-            {
-                if (RepeatStart)
-                {
-                    // Used for triangle fan
-                    newData[outOffset++] = 0;
-                }
-
-                for (int j = RepeatStart ? 1 : 0; j < OffsetIndex.Length; j++)
-                {
-                    newData[outOffset++] = index + OffsetIndex[j];
-                }
-
-                index += IndexStride;
-            }
-
-            _renderer.SetBufferData(newBuffer, _currentSize * sizeof(int), MemoryMarshal.Cast<int, byte>(newData));
-            _currentSize = expectedSize;
-
-            return newBuffer;
-        }
-
-        public void Dispose()
-        {
-            if (_repeatingBuffer != BufferHandle.Null)
-            {
-                _renderer.BufferManager.Delete(_repeatingBuffer);
-                _repeatingBuffer = BufferHandle.Null;
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/IndexBufferState.cs

@@ -1,103 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    readonly internal struct IndexBufferState
-    {
-        public static IndexBufferState Null => new(BufferHandle.Null, 0, 0);
-
-        private readonly int _offset;
-        private readonly int _size;
-        private readonly IndexType _type;
-
-        private readonly BufferHandle _handle;
-
-        public IndexBufferState(BufferHandle handle, int offset, int size, IndexType type = IndexType.UInt)
-        {
-            _handle = handle;
-            _offset = offset;
-            _size = size;
-            _type = type;
-        }
-
-        public (MTLBuffer, int, MTLIndexType) GetIndexBuffer(MetalRenderer renderer, CommandBufferScoped cbs)
-        {
-            Auto<DisposableBuffer> autoBuffer;
-            int offset, size;
-            MTLIndexType type;
-
-            if (_type == IndexType.UByte)
-            {
-                // Index type is not supported. Convert to I16.
-                autoBuffer = renderer.BufferManager.GetBufferI8ToI16(cbs, _handle, _offset, _size);
-
-                type = MTLIndexType.UInt16;
-                offset = 0;
-                size = _size * 2;
-            }
-            else
-            {
-                autoBuffer = renderer.BufferManager.GetBuffer(_handle, false, out int bufferSize);
-
-                if (_offset >= bufferSize)
-                {
-                    autoBuffer = null;
-                }
-
-                type = _type.Convert();
-                offset = _offset;
-                size = _size;
-            }
-
-            if (autoBuffer != null)
-            {
-                DisposableBuffer buffer = autoBuffer.Get(cbs, offset, size);
-
-                return (buffer.Value, offset, type);
-            }
-
-            return (new MTLBuffer(IntPtr.Zero), 0, MTLIndexType.UInt16);
-        }
-
-        public (MTLBuffer, int, MTLIndexType) GetConvertedIndexBuffer(
-            MetalRenderer renderer,
-            CommandBufferScoped cbs,
-            int firstIndex,
-            int indexCount,
-            int convertedCount,
-            IndexBufferPattern pattern)
-        {
-            // Convert the index buffer using the given pattern.
-            int indexSize = GetIndexSize();
-
-            int firstIndexOffset = firstIndex * indexSize;
-
-            var autoBuffer = renderer.BufferManager.GetBufferTopologyConversion(cbs, _handle, _offset + firstIndexOffset, indexCount * indexSize, pattern, indexSize);
-
-            int size = convertedCount * 4;
-
-            if (autoBuffer != null)
-            {
-                DisposableBuffer buffer = autoBuffer.Get(cbs, 0, size);
-
-                return (buffer.Value, 0, MTLIndexType.UInt32);
-            }
-
-            return (new MTLBuffer(IntPtr.Zero), 0, MTLIndexType.UInt32);
-        }
-
-        private int GetIndexSize()
-        {
-            return _type switch
-            {
-                IndexType.UInt => 4,
-                IndexType.UShort => 2,
-                _ => 1,
-            };
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/MetalRenderer.cs

@@ -1,306 +0,0 @@
-using Ryujinx.Common.Configuration;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Shader.Translation;
-using SharpMetal.Metal;
-using SharpMetal.QuartzCore;
-using System;
-using System.Collections.Generic;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    public sealed class MetalRenderer : IRenderer
-    {
-        public const int TotalSets = 4;
-
-        private readonly MTLDevice _device;
-        private readonly MTLCommandQueue _queue;
-        private readonly Func<CAMetalLayer> _getMetalLayer;
-
-        private Pipeline _pipeline;
-        private Window _window;
-
-        public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
-        public bool PreferThreading => true;
-        public IPipeline Pipeline => _pipeline;
-        public IWindow Window => _window;
-
-        internal MTLCommandQueue BackgroundQueue { get; private set; }
-        internal HelperShader HelperShader { get; private set; }
-        internal BufferManager BufferManager { get; private set; }
-        internal CommandBufferPool CommandBufferPool { get; private set; }
-        internal BackgroundResources BackgroundResources { get; private set; }
-        internal Action<Action> InterruptAction { get; private set; }
-        internal SyncManager SyncManager { get; private set; }
-
-        internal HashSet<Program> Programs { get; }
-        internal HashSet<SamplerHolder> Samplers { get; }
-
-        public MetalRenderer(Func<CAMetalLayer> metalLayer)
-        {
-            _device = MTLDevice.CreateSystemDefaultDevice();
-            Programs = new HashSet<Program>();
-            Samplers = new HashSet<SamplerHolder>();
-
-            if (_device.ArgumentBuffersSupport != MTLArgumentBuffersTier.Tier2)
-            {
-                throw new NotSupportedException("Metal backend requires Tier 2 Argument Buffer support.");
-            }
-
-            _queue = _device.NewCommandQueue(CommandBufferPool.MaxCommandBuffers + 1);
-            BackgroundQueue = _device.NewCommandQueue(CommandBufferPool.MaxCommandBuffers);
-
-            _getMetalLayer = metalLayer;
-        }
-
-        public void Initialize(GraphicsDebugLevel logLevel)
-        {
-            var layer = _getMetalLayer();
-            layer.Device = _device;
-            layer.FramebufferOnly = false;
-
-            CommandBufferPool = new CommandBufferPool(_queue);
-            _window = new Window(this, layer);
-            _pipeline = new Pipeline(_device, this);
-            BufferManager = new BufferManager(_device, this, _pipeline);
-
-            _pipeline.InitEncoderStateManager(BufferManager);
-
-            BackgroundResources = new BackgroundResources(this);
-            HelperShader = new HelperShader(_device, this, _pipeline);
-            SyncManager = new SyncManager(this);
-        }
-
-        public void BackgroundContextAction(Action action, bool alwaysBackground = false)
-        {
-            // GetData methods should be thread safe, so we can call this directly.
-            // Texture copy (scaled) may also happen in here, so that should also be thread safe.
-
-            action();
-        }
-
-        public BufferHandle CreateBuffer(int size, BufferAccess access)
-        {
-            return BufferManager.CreateWithHandle(size);
-        }
-
-        public BufferHandle CreateBuffer(IntPtr pointer, int size)
-        {
-            return BufferManager.Create(pointer, size);
-        }
-
-        public BufferHandle CreateBufferSparse(ReadOnlySpan<BufferRange> storageBuffers)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IImageArray CreateImageArray(int size, bool isBuffer)
-        {
-            return new ImageArray(size, isBuffer, _pipeline);
-        }
-
-        public IProgram CreateProgram(ShaderSource[] shaders, ShaderInfo info)
-        {
-            return new Program(this, _device, shaders, info.ResourceLayout, info.ComputeLocalSize);
-        }
-
-        public ISampler CreateSampler(SamplerCreateInfo info)
-        {
-            return new SamplerHolder(this, _device, info);
-        }
-
-        public ITexture CreateTexture(TextureCreateInfo info)
-        {
-            if (info.Target == Target.TextureBuffer)
-            {
-                return new TextureBuffer(_device, this, _pipeline, info);
-            }
-
-            return new Texture(_device, this, _pipeline, info);
-        }
-
-        public ITextureArray CreateTextureArray(int size, bool isBuffer)
-        {
-            return new TextureArray(size, isBuffer, _pipeline);
-        }
-
-        public bool PrepareHostMapping(IntPtr address, ulong size)
-        {
-            // TODO: Metal Host Mapping
-            return false;
-        }
-
-        public void CreateSync(ulong id, bool strict)
-        {
-            SyncManager.Create(id, strict);
-        }
-
-        public void DeleteBuffer(BufferHandle buffer)
-        {
-            BufferManager.Delete(buffer);
-        }
-
-        public PinnedSpan<byte> GetBufferData(BufferHandle buffer, int offset, int size)
-        {
-            return BufferManager.GetData(buffer, offset, size);
-        }
-
-        public Capabilities GetCapabilities()
-        {
-            // TODO: Finalize these values
-            return new Capabilities(
-                api: TargetApi.Metal,
-                vendorName: HardwareInfoTools.GetVendor(),
-                SystemMemoryType.UnifiedMemory,
-                hasFrontFacingBug: false,
-                hasVectorIndexingBug: false,
-                needsFragmentOutputSpecialization: true,
-                reduceShaderPrecision: true,
-                supportsAstcCompression: true,
-                supportsBc123Compression: true,
-                supportsBc45Compression: true,
-                supportsBc67Compression: true,
-                supportsEtc2Compression: true,
-                supports3DTextureCompression: true,
-                supportsBgraFormat: true,
-                supportsR4G4Format: false,
-                supportsR4G4B4A4Format: true,
-                supportsScaledVertexFormats: false,
-                supportsSnormBufferTextureFormat: true,
-                supportsSparseBuffer: false,
-                supports5BitComponentFormat: true,
-                supportsBlendEquationAdvanced: false,
-                supportsFragmentShaderInterlock: true,
-                supportsFragmentShaderOrderingIntel: false,
-                supportsGeometryShader: false,
-                supportsGeometryShaderPassthrough: false,
-                supportsTransformFeedback: false,
-                supportsImageLoadFormatted: false,
-                supportsLayerVertexTessellation: false,
-                supportsMismatchingViewFormat: true,
-                supportsCubemapView: true,
-                supportsNonConstantTextureOffset: false,
-                supportsQuads: false,
-                supportsSeparateSampler: true,
-                supportsShaderBallot: false,
-                supportsShaderBarrierDivergence: false,
-                supportsShaderFloat64: false,
-                supportsTextureGatherOffsets: false,
-                supportsTextureShadowLod: false,
-                supportsVertexStoreAndAtomics: false,
-                supportsViewportIndexVertexTessellation: false,
-                supportsViewportMask: false,
-                supportsViewportSwizzle: false,
-                supportsIndirectParameters: true,
-                supportsDepthClipControl: false,
-                uniformBufferSetIndex: (int)Constants.ConstantBuffersSetIndex,
-                storageBufferSetIndex: (int)Constants.StorageBuffersSetIndex,
-                textureSetIndex: (int)Constants.TexturesSetIndex,
-                imageSetIndex: (int)Constants.ImagesSetIndex,
-                extraSetBaseIndex: TotalSets,
-                maximumExtraSets: (int)Constants.MaximumExtraSets,
-                maximumUniformBuffersPerStage: Constants.MaxUniformBuffersPerStage,
-                maximumStorageBuffersPerStage: Constants.MaxStorageBuffersPerStage,
-                maximumTexturesPerStage: Constants.MaxTexturesPerStage,
-                maximumImagesPerStage: Constants.MaxImagesPerStage,
-                maximumComputeSharedMemorySize: (int)_device.MaxThreadgroupMemoryLength,
-                maximumSupportedAnisotropy: 16,
-                shaderSubgroupSize: 256,
-                storageBufferOffsetAlignment: 16,
-                textureBufferOffsetAlignment: 16,
-                gatherBiasPrecision: 0,
-                maximumGpuMemory: 0
-            );
-        }
-
-        public ulong GetCurrentSync()
-        {
-            return SyncManager.GetCurrent();
-        }
-
-        public HardwareInfo GetHardwareInfo()
-        {
-            return new HardwareInfo(HardwareInfoTools.GetVendor(), HardwareInfoTools.GetModel(), "Apple");
-        }
-
-        public IProgram LoadProgramBinary(byte[] programBinary, bool hasFragmentShader, ShaderInfo info)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data)
-        {
-            BufferManager.SetData(buffer, offset, data, _pipeline.Cbs);
-        }
-
-        public void UpdateCounters()
-        {
-            // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
-        }
-
-        public void PreFrame()
-        {
-            SyncManager.Cleanup();
-        }
-
-        public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler, float divisor, bool hostReserved)
-        {
-            // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
-            var counterEvent = new CounterEvent();
-            resultHandler?.Invoke(counterEvent, type == CounterType.SamplesPassed ? (ulong)1 : 0);
-            return counterEvent;
-        }
-
-        public void ResetCounter(CounterType type)
-        {
-            // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
-        }
-
-        public void WaitSync(ulong id)
-        {
-            SyncManager.Wait(id);
-        }
-
-        public void FlushAllCommands()
-        {
-            _pipeline.FlushCommandsImpl();
-        }
-
-        public void RegisterFlush()
-        {
-            SyncManager.RegisterFlush();
-
-            // Periodically free unused regions of the staging buffer to avoid doing it all at once.
-            BufferManager.StagingBuffer.FreeCompleted();
-        }
-
-        public void SetInterruptAction(Action<Action> interruptAction)
-        {
-            InterruptAction = interruptAction;
-        }
-
-        public void Screenshot()
-        {
-            // TODO: Screenshots
-        }
-
-        public void Dispose()
-        {
-            BackgroundResources.Dispose();
-
-            foreach (var program in Programs)
-            {
-                program.Dispose();
-            }
-
-            foreach (var sampler in Samplers)
-            {
-                sampler.Dispose();
-            }
-
-            _pipeline.Dispose();
-            _window.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/MultiFenceHolder.cs

@@ -1,262 +0,0 @@
-using SharpMetal.Metal;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    /// <summary>
-    /// Holder for multiple host GPU fences.
-    /// </summary>
-    [SupportedOSPlatform("macos")]
-    class MultiFenceHolder
-    {
-        private const int BufferUsageTrackingGranularity = 4096;
-
-        private readonly FenceHolder[] _fences;
-        private readonly BufferUsageBitmap _bufferUsageBitmap;
-
-        /// <summary>
-        /// Creates a new instance of the multiple fence holder.
-        /// </summary>
-        public MultiFenceHolder()
-        {
-            _fences = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
-        }
-
-        /// <summary>
-        /// Creates a new instance of the multiple fence holder, with a given buffer size in mind.
-        /// </summary>
-        /// <param name="size">Size of the buffer</param>
-        public MultiFenceHolder(int size)
-        {
-            _fences = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
-            _bufferUsageBitmap = new BufferUsageBitmap(size, BufferUsageTrackingGranularity);
-        }
-
-        /// <summary>
-        /// Adds read/write buffer usage information to the uses list.
-        /// </summary>
-        /// <param name="cbIndex">Index of the command buffer where the buffer is used</param>
-        /// <param name="offset">Offset of the buffer being used</param>
-        /// <param name="size">Size of the buffer region being used, in bytes</param>
-        /// <param name="write">Whether the access is a write or not</param>
-        public void AddBufferUse(int cbIndex, int offset, int size, bool write)
-        {
-            _bufferUsageBitmap.Add(cbIndex, offset, size, false);
-
-            if (write)
-            {
-                _bufferUsageBitmap.Add(cbIndex, offset, size, true);
-            }
-        }
-
-        /// <summary>
-        /// Removes all buffer usage information for a given command buffer.
-        /// </summary>
-        /// <param name="cbIndex">Index of the command buffer where the buffer is used</param>
-        public void RemoveBufferUses(int cbIndex)
-        {
-            _bufferUsageBitmap?.Clear(cbIndex);
-        }
-
-        /// <summary>
-        /// Checks if a given range of a buffer is being used by a command buffer still being processed by the GPU.
-        /// </summary>
-        /// <param name="cbIndex">Index of the command buffer where the buffer is used</param>
-        /// <param name="offset">Offset of the buffer being used</param>
-        /// <param name="size">Size of the buffer region being used, in bytes</param>
-        /// <returns>True if in use, false otherwise</returns>
-        public bool IsBufferRangeInUse(int cbIndex, int offset, int size)
-        {
-            return _bufferUsageBitmap.OverlapsWith(cbIndex, offset, size);
-        }
-
-        /// <summary>
-        /// Checks if a given range of a buffer is being used by any command buffer still being processed by the GPU.
-        /// </summary>
-        /// <param name="offset">Offset of the buffer being used</param>
-        /// <param name="size">Size of the buffer region being used, in bytes</param>
-        /// <param name="write">True if only write usages should count</param>
-        /// <returns>True if in use, false otherwise</returns>
-        public bool IsBufferRangeInUse(int offset, int size, bool write)
-        {
-            return _bufferUsageBitmap.OverlapsWith(offset, size, write);
-        }
-
-        /// <summary>
-        /// Adds a fence to the holder.
-        /// </summary>
-        /// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
-        /// <param name="fence">Fence to be added</param>
-        /// <returns>True if the command buffer's previous fence value was null</returns>
-        public bool AddFence(int cbIndex, FenceHolder fence)
-        {
-            ref FenceHolder fenceRef = ref _fences[cbIndex];
-
-            if (fenceRef == null)
-            {
-                fenceRef = fence;
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Removes a fence from the holder.
-        /// </summary>
-        /// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
-        public void RemoveFence(int cbIndex)
-        {
-            _fences[cbIndex] = null;
-        }
-
-        /// <summary>
-        /// Determines if a fence referenced on the given command buffer.
-        /// </summary>
-        /// <param name="cbIndex">Index of the command buffer to check if it's used</param>
-        /// <returns>True if referenced, false otherwise</returns>
-        public bool HasFence(int cbIndex)
-        {
-            return _fences[cbIndex] != null;
-        }
-
-        /// <summary>
-        /// Wait until all the fences on the holder are signaled.
-        /// </summary>
-        public void WaitForFences()
-        {
-            WaitForFencesImpl(0, 0, true);
-        }
-
-        /// <summary>
-        /// Wait until all the fences on the holder with buffer uses overlapping the specified range are signaled.
-        /// </summary>
-        /// <param name="offset">Start offset of the buffer range</param>
-        /// <param name="size">Size of the buffer range in bytes</param>
-        public void WaitForFences(int offset, int size)
-        {
-            WaitForFencesImpl(offset, size, true);
-        }
-
-        /// <summary>
-        /// Wait until all the fences on the holder with buffer uses overlapping the specified range are signaled.
-        /// </summary>
-
-        // TODO: Add a proper timeout!
-        public bool WaitForFences(bool indefinite)
-        {
-            return WaitForFencesImpl(0, 0, indefinite);
-        }
-
-        /// <summary>
-        /// Wait until all the fences on the holder with buffer uses overlapping the specified range are signaled.
-        /// </summary>
-        /// <param name="offset">Start offset of the buffer range</param>
-        /// <param name="size">Size of the buffer range in bytes</param>
-        /// <param name="indefinite">Indicates if this should wait indefinitely</param>
-        /// <returns>True if all fences were signaled before the timeout expired, false otherwise</returns>
-        private bool WaitForFencesImpl(int offset, int size, bool indefinite)
-        {
-            Span<FenceHolder> fenceHolders = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
-
-            int count = size != 0 ? GetOverlappingFences(fenceHolders, offset, size) : GetFences(fenceHolders);
-            Span<MTLCommandBuffer> fences = stackalloc MTLCommandBuffer[count];
-
-            int fenceCount = 0;
-
-            for (int i = 0; i < count; i++)
-            {
-                if (fenceHolders[i].TryGet(out MTLCommandBuffer fence))
-                {
-                    fences[fenceCount] = fence;
-
-                    if (fenceCount < i)
-                    {
-                        fenceHolders[fenceCount] = fenceHolders[i];
-                    }
-
-                    fenceCount++;
-                }
-            }
-
-            if (fenceCount == 0)
-            {
-                return true;
-            }
-
-            bool signaled = true;
-
-            if (indefinite)
-            {
-                foreach (var fence in fences)
-                {
-                    fence.WaitUntilCompleted();
-                }
-            }
-            else
-            {
-                foreach (var fence in fences)
-                {
-                    if (fence.Status != MTLCommandBufferStatus.Completed)
-                    {
-                        signaled = false;
-                    }
-                }
-            }
-
-            for (int i = 0; i < fenceCount; i++)
-            {
-                fenceHolders[i].Put();
-            }
-
-            return signaled;
-        }
-
-        /// <summary>
-        /// Gets fences to wait for.
-        /// </summary>
-        /// <param name="storage">Span to store fences in</param>
-        /// <returns>Number of fences placed in storage</returns>
-        private int GetFences(Span<FenceHolder> storage)
-        {
-            int count = 0;
-
-            for (int i = 0; i < _fences.Length; i++)
-            {
-                var fence = _fences[i];
-
-                if (fence != null)
-                {
-                    storage[count++] = fence;
-                }
-            }
-
-            return count;
-        }
-
-        /// <summary>
-        /// Gets fences to wait for use of a given buffer region.
-        /// </summary>
-        /// <param name="storage">Span to store overlapping fences in</param>
-        /// <param name="offset">Offset of the range</param>
-        /// <param name="size">Size of the range in bytes</param>
-        /// <returns>Number of fences for the specified region placed in storage</returns>
-        private int GetOverlappingFences(Span<FenceHolder> storage, int offset, int size)
-        {
-            int count = 0;
-
-            for (int i = 0; i < _fences.Length; i++)
-            {
-                var fence = _fences[i];
-
-                if (fence != null && _bufferUsageBitmap.OverlapsWith(i, offset, size))
-                {
-                    storage[count++] = fence;
-                }
-            }
-
-            return count;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/PersistentFlushBuffer.cs

@@ -1,99 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    internal class PersistentFlushBuffer : IDisposable
-    {
-        private readonly MetalRenderer _renderer;
-
-        private BufferHolder _flushStorage;
-
-        public PersistentFlushBuffer(MetalRenderer renderer)
-        {
-            _renderer = renderer;
-        }
-
-        private BufferHolder ResizeIfNeeded(int size)
-        {
-            var flushStorage = _flushStorage;
-
-            if (flushStorage == null || size > _flushStorage.Size)
-            {
-                flushStorage?.Dispose();
-
-                flushStorage = _renderer.BufferManager.Create(size);
-                _flushStorage = flushStorage;
-            }
-
-            return flushStorage;
-        }
-
-        public Span<byte> GetBufferData(CommandBufferPool cbp, BufferHolder buffer, int offset, int size)
-        {
-            var flushStorage = ResizeIfNeeded(size);
-            Auto<DisposableBuffer> srcBuffer;
-
-            using (var cbs = cbp.Rent())
-            {
-                srcBuffer = buffer.GetBuffer();
-                var dstBuffer = flushStorage.GetBuffer();
-
-                if (srcBuffer.TryIncrementReferenceCount())
-                {
-                    BufferHolder.Copy(cbs, srcBuffer, dstBuffer, offset, 0, size, registerSrcUsage: false);
-                }
-                else
-                {
-                    // Source buffer is no longer alive, don't copy anything to flush storage.
-                    srcBuffer = null;
-                }
-            }
-
-            flushStorage.WaitForFences();
-            srcBuffer?.DecrementReferenceCount();
-            return flushStorage.GetDataStorage(0, size);
-        }
-
-        public Span<byte> GetTextureData(CommandBufferPool cbp, Texture view, int size)
-        {
-            TextureCreateInfo info = view.Info;
-
-            var flushStorage = ResizeIfNeeded(size);
-
-            using (var cbs = cbp.Rent())
-            {
-                var buffer = flushStorage.GetBuffer().Get(cbs).Value;
-                var image = view.GetHandle();
-
-                view.CopyFromOrToBuffer(cbs, buffer, image, size, true, 0, 0, info.GetLayers(), info.Levels, singleSlice: false);
-            }
-
-            flushStorage.WaitForFences();
-            return flushStorage.GetDataStorage(0, size);
-        }
-
-        public Span<byte> GetTextureData(CommandBufferPool cbp, Texture view, int size, int layer, int level)
-        {
-            var flushStorage = ResizeIfNeeded(size);
-
-            using (var cbs = cbp.Rent())
-            {
-                var buffer = flushStorage.GetBuffer().Get(cbs).Value;
-                var image = view.GetHandle();
-
-                view.CopyFromOrToBuffer(cbs, buffer, image, size, true, layer, level, 1, 1, singleSlice: true);
-            }
-
-            flushStorage.WaitForFences();
-            return flushStorage.GetDataStorage(0, size);
-        }
-
-        public void Dispose()
-        {
-            _flushStorage.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/Pipeline.cs

@@ -1,877 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Shader;
-using SharpMetal.Foundation;
-using SharpMetal.Metal;
-using SharpMetal.QuartzCore;
-using System;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    public enum EncoderType
-    {
-        Blit,
-        Compute,
-        Render,
-        None
-    }
-
-    [SupportedOSPlatform("macos")]
-    class Pipeline : IPipeline, IEncoderFactory, IDisposable
-    {
-        private const ulong MinByteWeightForFlush = 256 * 1024 * 1024; // MiB
-
-        private readonly MTLDevice _device;
-        private readonly MetalRenderer _renderer;
-        private EncoderStateManager _encoderStateManager;
-        private ulong _byteWeight;
-
-        public MTLCommandBuffer CommandBuffer;
-
-        public IndexBufferPattern QuadsToTrisPattern;
-        public IndexBufferPattern TriFanToTrisPattern;
-
-        internal CommandBufferScoped? PreloadCbs { get; private set; }
-        internal CommandBufferScoped Cbs { get; private set; }
-        internal CommandBufferEncoder Encoders => Cbs.Encoders;
-        internal EncoderType CurrentEncoderType => Encoders.CurrentEncoderType;
-
-        public Pipeline(MTLDevice device, MetalRenderer renderer)
-        {
-            _device = device;
-            _renderer = renderer;
-
-            renderer.CommandBufferPool.Initialize(this);
-
-            CommandBuffer = (Cbs = _renderer.CommandBufferPool.Rent()).CommandBuffer;
-        }
-
-        internal void InitEncoderStateManager(BufferManager bufferManager)
-        {
-            _encoderStateManager = new EncoderStateManager(_device, bufferManager, this);
-
-            QuadsToTrisPattern = new IndexBufferPattern(_renderer, 4, 6, 0, [0, 1, 2, 0, 2, 3], 4, false);
-            TriFanToTrisPattern = new IndexBufferPattern(_renderer, 3, 3, 2, [int.MinValue, -1, 0], 1, true);
-        }
-
-        public EncoderState SwapState(EncoderState state, DirtyFlags flags = DirtyFlags.All, bool endRenderPass = true)
-        {
-            if (endRenderPass && CurrentEncoderType == EncoderType.Render)
-            {
-                EndCurrentPass();
-            }
-
-            return _encoderStateManager.SwapState(state, flags);
-        }
-
-        public PredrawState SavePredrawState()
-        {
-            return _encoderStateManager.SavePredrawState();
-        }
-
-        public void RestorePredrawState(PredrawState state)
-        {
-            _encoderStateManager.RestorePredrawState(state);
-        }
-
-        public void SetClearLoadAction(bool clear)
-        {
-            _encoderStateManager.SetClearLoadAction(clear);
-        }
-
-        public MTLRenderCommandEncoder GetOrCreateRenderEncoder(bool forDraw = false)
-        {
-            // Mark all state as dirty to ensure it is set on the new encoder
-            if (Cbs.Encoders.CurrentEncoderType != EncoderType.Render)
-            {
-                _encoderStateManager.SignalRenderDirty();
-            }
-
-            if (forDraw)
-            {
-                _encoderStateManager.RenderResourcesPrepass();
-            }
-
-            MTLRenderCommandEncoder renderCommandEncoder = Cbs.Encoders.EnsureRenderEncoder();
-
-            if (forDraw)
-            {
-                _encoderStateManager.RebindRenderState(renderCommandEncoder);
-            }
-
-            return renderCommandEncoder;
-        }
-
-        public MTLBlitCommandEncoder GetOrCreateBlitEncoder()
-        {
-            return Cbs.Encoders.EnsureBlitEncoder();
-        }
-
-        public MTLComputeCommandEncoder GetOrCreateComputeEncoder(bool forDispatch = false)
-        {
-            // Mark all state as dirty to ensure it is set on the new encoder
-            if (Cbs.Encoders.CurrentEncoderType != EncoderType.Compute)
-            {
-                _encoderStateManager.SignalComputeDirty();
-            }
-
-            if (forDispatch)
-            {
-                _encoderStateManager.ComputeResourcesPrepass();
-            }
-
-            MTLComputeCommandEncoder computeCommandEncoder = Cbs.Encoders.EnsureComputeEncoder();
-
-            if (forDispatch)
-            {
-                _encoderStateManager.RebindComputeState(computeCommandEncoder);
-            }
-
-            return computeCommandEncoder;
-        }
-
-        public void EndCurrentPass()
-        {
-            Cbs.Encoders.EndCurrentPass();
-        }
-
-        public MTLRenderCommandEncoder CreateRenderCommandEncoder()
-        {
-            return _encoderStateManager.CreateRenderCommandEncoder();
-        }
-
-        public MTLComputeCommandEncoder CreateComputeCommandEncoder()
-        {
-            return _encoderStateManager.CreateComputeCommandEncoder();
-        }
-
-        public void Present(CAMetalDrawable drawable, Texture src, Extents2D srcRegion, Extents2D dstRegion, bool isLinear)
-        {
-            // TODO: Clean this up
-            var textureInfo = new TextureCreateInfo((int)drawable.Texture.Width, (int)drawable.Texture.Height, (int)drawable.Texture.Depth, (int)drawable.Texture.MipmapLevelCount, (int)drawable.Texture.SampleCount, 0, 0, 0, Format.B8G8R8A8Unorm, 0, Target.Texture2D, SwizzleComponent.Red, SwizzleComponent.Green, SwizzleComponent.Blue, SwizzleComponent.Alpha);
-            var dst = new Texture(_device, _renderer, this, textureInfo, drawable.Texture, 0, 0);
-
-            _renderer.HelperShader.BlitColor(Cbs, src, dst, srcRegion, dstRegion, isLinear, true);
-
-            EndCurrentPass();
-
-            Cbs.CommandBuffer.PresentDrawable(drawable);
-
-            FlushCommandsImpl();
-
-            // TODO: Auto flush counting
-            _renderer.SyncManager.GetAndResetWaitTicks();
-
-            // Cleanup
-            dst.Dispose();
-        }
-
-        public CommandBufferScoped GetPreloadCommandBuffer()
-        {
-            PreloadCbs ??= _renderer.CommandBufferPool.Rent();
-
-            return PreloadCbs.Value;
-        }
-
-        public void FlushCommandsIfWeightExceeding(IAuto disposedResource, ulong byteWeight)
-        {
-            bool usedByCurrentCb = disposedResource.HasCommandBufferDependency(Cbs);
-
-            if (PreloadCbs != null && !usedByCurrentCb)
-            {
-                usedByCurrentCb = disposedResource.HasCommandBufferDependency(PreloadCbs.Value);
-            }
-
-            if (usedByCurrentCb)
-            {
-                // Since we can only free memory after the command buffer that uses a given resource was executed,
-                // keeping the command buffer might cause a high amount of memory to be in use.
-                // To prevent that, we force submit command buffers if the memory usage by resources
-                // in use by the current command buffer is above a given limit, and those resources were disposed.
-                _byteWeight += byteWeight;
-
-                if (_byteWeight >= MinByteWeightForFlush)
-                {
-                    FlushCommandsImpl();
-                }
-            }
-        }
-
-        public void FlushCommandsImpl()
-        {
-            EndCurrentPass();
-
-            _byteWeight = 0;
-
-            if (PreloadCbs != null)
-            {
-                PreloadCbs.Value.Dispose();
-                PreloadCbs = null;
-            }
-
-            CommandBuffer = (Cbs = _renderer.CommandBufferPool.ReturnAndRent(Cbs)).CommandBuffer;
-            _renderer.RegisterFlush();
-        }
-
-        public void DirtyTextures()
-        {
-            _encoderStateManager.DirtyTextures();
-        }
-
-        public void DirtyImages()
-        {
-            _encoderStateManager.DirtyImages();
-        }
-
-        public void Blit(
-            Texture src,
-            Texture dst,
-            Extents2D srcRegion,
-            Extents2D dstRegion,
-            bool isDepthOrStencil,
-            bool linearFilter)
-        {
-            if (isDepthOrStencil)
-            {
-                _renderer.HelperShader.BlitDepthStencil(Cbs, src, dst, srcRegion, dstRegion);
-            }
-            else
-            {
-                _renderer.HelperShader.BlitColor(Cbs, src, dst, srcRegion, dstRegion, linearFilter);
-            }
-        }
-
-        public void Barrier()
-        {
-            switch (CurrentEncoderType)
-            {
-                case EncoderType.Render:
-                    {
-                        var scope = MTLBarrierScope.Buffers | MTLBarrierScope.Textures | MTLBarrierScope.RenderTargets;
-                        MTLRenderStages stages = MTLRenderStages.RenderStageVertex | MTLRenderStages.RenderStageFragment;
-                        Encoders.RenderEncoder.MemoryBarrier(scope, stages, stages);
-                        break;
-                    }
-                case EncoderType.Compute:
-                    {
-                        var scope = MTLBarrierScope.Buffers | MTLBarrierScope.Textures | MTLBarrierScope.RenderTargets;
-                        Encoders.ComputeEncoder.MemoryBarrier(scope);
-                        break;
-                    }
-            }
-        }
-
-        public void ClearBuffer(BufferHandle destination, int offset, int size, uint value)
-        {
-            var blitCommandEncoder = GetOrCreateBlitEncoder();
-
-            var mtlBuffer = _renderer.BufferManager.GetBuffer(destination, offset, size, true).Get(Cbs, offset, size, true).Value;
-
-            // Might need a closer look, range's count, lower, and upper bound
-            // must be a multiple of 4
-            blitCommandEncoder.FillBuffer(mtlBuffer,
-                new NSRange
-                {
-                    location = (ulong)offset,
-                    length = (ulong)size
-                },
-                (byte)value);
-        }
-
-        public void ClearRenderTargetColor(int index, int layer, int layerCount, uint componentMask, ColorF color)
-        {
-            float[] colors = [color.Red, color.Green, color.Blue, color.Alpha];
-            var dst = _encoderStateManager.RenderTargets[index];
-
-            // TODO: Remove workaround for Wonder which has an invalid texture due to unsupported format
-            if (dst == null)
-            {
-                Logger.Warning?.PrintMsg(LogClass.Gpu, "Attempted to clear invalid render target!");
-                return;
-            }
-
-            _renderer.HelperShader.ClearColor(index, colors, componentMask, dst.Width, dst.Height, dst.Info.Format);
-        }
-
-        public void ClearRenderTargetDepthStencil(int layer, int layerCount, float depthValue, bool depthMask, int stencilValue, int stencilMask)
-        {
-            var depthStencil = _encoderStateManager.DepthStencil;
-
-            if (depthStencil == null)
-            {
-                return;
-            }
-
-            _renderer.HelperShader.ClearDepthStencil(depthValue, depthMask, stencilValue, stencilMask, depthStencil.Width, depthStencil.Height);
-        }
-
-        public void CommandBufferBarrier()
-        {
-            Barrier();
-        }
-
-        public void CopyBuffer(BufferHandle src, BufferHandle dst, int srcOffset, int dstOffset, int size)
-        {
-            var srcBuffer = _renderer.BufferManager.GetBuffer(src, srcOffset, size, false);
-            var dstBuffer = _renderer.BufferManager.GetBuffer(dst, dstOffset, size, true);
-
-            BufferHolder.Copy(Cbs, srcBuffer, dstBuffer, srcOffset, dstOffset, size);
-        }
-
-        public void PushDebugGroup(string name)
-        {
-            var encoder = Encoders.CurrentEncoder;
-            var debugGroupName = StringHelper.NSString(name);
-
-            if (encoder == null)
-            {
-                return;
-            }
-
-            switch (Encoders.CurrentEncoderType)
-            {
-                case EncoderType.Render:
-                    encoder.Value.PushDebugGroup(debugGroupName);
-                    break;
-                case EncoderType.Blit:
-                    encoder.Value.PushDebugGroup(debugGroupName);
-                    break;
-                case EncoderType.Compute:
-                    encoder.Value.PushDebugGroup(debugGroupName);
-                    break;
-            }
-        }
-
-        public void PopDebugGroup()
-        {
-            var encoder = Encoders.CurrentEncoder;
-
-            if (encoder == null)
-            {
-                return;
-            }
-
-            switch (Encoders.CurrentEncoderType)
-            {
-                case EncoderType.Render:
-                    encoder.Value.PopDebugGroup();
-                    break;
-                case EncoderType.Blit:
-                    encoder.Value.PopDebugGroup();
-                    break;
-                case EncoderType.Compute:
-                    encoder.Value.PopDebugGroup();
-                    break;
-            }
-        }
-
-        public void DispatchCompute(int groupsX, int groupsY, int groupsZ)
-        {
-            DispatchCompute(groupsX, groupsY, groupsZ, String.Empty);
-        }
-
-        public void DispatchCompute(int groupsX, int groupsY, int groupsZ, string debugGroupName)
-        {
-            var computeCommandEncoder = GetOrCreateComputeEncoder(true);
-
-            ComputeSize localSize = _encoderStateManager.ComputeLocalSize;
-
-            if (debugGroupName != String.Empty)
-            {
-                PushDebugGroup(debugGroupName);
-            }
-
-            computeCommandEncoder.DispatchThreadgroups(
-                new MTLSize { width = (ulong)groupsX, height = (ulong)groupsY, depth = (ulong)groupsZ },
-                new MTLSize { width = (ulong)localSize.X, height = (ulong)localSize.Y, depth = (ulong)localSize.Z });
-
-            if (debugGroupName != String.Empty)
-            {
-                PopDebugGroup();
-            }
-        }
-
-        public void Draw(int vertexCount, int instanceCount, int firstVertex, int firstInstance)
-        {
-            Draw(vertexCount, instanceCount, firstVertex, firstInstance, String.Empty);
-        }
-
-        public void Draw(int vertexCount, int instanceCount, int firstVertex, int firstInstance, string debugGroupName)
-        {
-            if (vertexCount == 0)
-            {
-                return;
-            }
-
-            var primitiveType = TopologyRemap(_encoderStateManager.Topology).Convert();
-
-            if (TopologyUnsupported(_encoderStateManager.Topology))
-            {
-                var pattern = GetIndexBufferPattern();
-
-                BufferHandle handle = pattern.GetRepeatingBuffer(vertexCount, out int indexCount);
-                var buffer = _renderer.BufferManager.GetBuffer(handle, false);
-                var mtlBuffer = buffer.Get(Cbs, 0, indexCount * sizeof(int)).Value;
-
-                var renderCommandEncoder = GetOrCreateRenderEncoder(true);
-
-                renderCommandEncoder.DrawIndexedPrimitives(
-                    primitiveType,
-                    (ulong)indexCount,
-                    MTLIndexType.UInt32,
-                    mtlBuffer,
-                    0);
-            }
-            else
-            {
-                var renderCommandEncoder = GetOrCreateRenderEncoder(true);
-
-                if (debugGroupName != String.Empty)
-                {
-                    PushDebugGroup(debugGroupName);
-                }
-
-                renderCommandEncoder.DrawPrimitives(
-                    primitiveType,
-                    (ulong)firstVertex,
-                    (ulong)vertexCount,
-                    (ulong)instanceCount,
-                    (ulong)firstInstance);
-
-                if (debugGroupName != String.Empty)
-                {
-                    PopDebugGroup();
-                }
-            }
-        }
-
-        private IndexBufferPattern GetIndexBufferPattern()
-        {
-            return _encoderStateManager.Topology switch
-            {
-                PrimitiveTopology.Quads => QuadsToTrisPattern,
-                PrimitiveTopology.TriangleFan or PrimitiveTopology.Polygon => TriFanToTrisPattern,
-                _ => throw new NotSupportedException($"Unsupported topology: {_encoderStateManager.Topology}"),
-            };
-        }
-
-        private PrimitiveTopology TopologyRemap(PrimitiveTopology topology)
-        {
-            return topology switch
-            {
-                PrimitiveTopology.Quads => PrimitiveTopology.Triangles,
-                PrimitiveTopology.QuadStrip => PrimitiveTopology.TriangleStrip,
-                PrimitiveTopology.TriangleFan or PrimitiveTopology.Polygon => PrimitiveTopology.Triangles,
-                _ => topology,
-            };
-        }
-
-        private bool TopologyUnsupported(PrimitiveTopology topology)
-        {
-            return topology switch
-            {
-                PrimitiveTopology.Quads or PrimitiveTopology.TriangleFan or PrimitiveTopology.Polygon => true,
-                _ => false,
-            };
-        }
-
-        public void DrawIndexed(int indexCount, int instanceCount, int firstIndex, int firstVertex, int firstInstance)
-        {
-            if (indexCount == 0)
-            {
-                return;
-            }
-
-            MTLBuffer mtlBuffer;
-            int offset;
-            MTLIndexType type;
-            int finalIndexCount = indexCount;
-
-            var primitiveType = TopologyRemap(_encoderStateManager.Topology).Convert();
-
-            if (TopologyUnsupported(_encoderStateManager.Topology))
-            {
-                var pattern = GetIndexBufferPattern();
-                int convertedCount = pattern.GetConvertedCount(indexCount);
-
-                finalIndexCount = convertedCount;
-
-                (mtlBuffer, offset, type) = _encoderStateManager.IndexBuffer.GetConvertedIndexBuffer(_renderer, Cbs, firstIndex, indexCount, convertedCount, pattern);
-            }
-            else
-            {
-                (mtlBuffer, offset, type) = _encoderStateManager.IndexBuffer.GetIndexBuffer(_renderer, Cbs);
-            }
-
-            if (mtlBuffer.NativePtr != IntPtr.Zero)
-            {
-                var renderCommandEncoder = GetOrCreateRenderEncoder(true);
-
-                renderCommandEncoder.DrawIndexedPrimitives(
-                    primitiveType,
-                    (ulong)finalIndexCount,
-                    type,
-                    mtlBuffer,
-                    (ulong)offset,
-                    (ulong)instanceCount,
-                    firstVertex,
-                    (ulong)firstInstance);
-            }
-        }
-
-        public void DrawIndexedIndirect(BufferRange indirectBuffer)
-        {
-            DrawIndexedIndirectOffset(indirectBuffer);
-        }
-
-        public void DrawIndexedIndirectOffset(BufferRange indirectBuffer, int offset = 0)
-        {
-            // TODO: Reindex unsupported topologies
-            if (TopologyUnsupported(_encoderStateManager.Topology))
-            {
-                Logger.Warning?.Print(LogClass.Gpu, $"Drawing indexed with unsupported topology: {_encoderStateManager.Topology}");
-            }
-
-            var buffer = _renderer.BufferManager
-                .GetBuffer(indirectBuffer.Handle, indirectBuffer.Offset, indirectBuffer.Size, false)
-                .Get(Cbs, indirectBuffer.Offset, indirectBuffer.Size).Value;
-
-            var primitiveType = TopologyRemap(_encoderStateManager.Topology).Convert();
-
-            (MTLBuffer indexBuffer, int indexOffset, MTLIndexType type) = _encoderStateManager.IndexBuffer.GetIndexBuffer(_renderer, Cbs);
-
-            if (indexBuffer.NativePtr != IntPtr.Zero && buffer.NativePtr != IntPtr.Zero)
-            {
-                var renderCommandEncoder = GetOrCreateRenderEncoder(true);
-
-                renderCommandEncoder.DrawIndexedPrimitives(
-                    primitiveType,
-                    type,
-                    indexBuffer,
-                    (ulong)indexOffset,
-                    buffer,
-                    (ulong)(indirectBuffer.Offset + offset));
-            }
-        }
-
-        public void DrawIndexedIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride)
-        {
-            for (int i = 0; i < maxDrawCount; i++)
-            {
-                DrawIndexedIndirectOffset(indirectBuffer, stride * i);
-            }
-        }
-
-        public void DrawIndirect(BufferRange indirectBuffer)
-        {
-            DrawIndirectOffset(indirectBuffer);
-        }
-
-        public void DrawIndirectOffset(BufferRange indirectBuffer, int offset = 0)
-        {
-            if (TopologyUnsupported(_encoderStateManager.Topology))
-            {
-                // TODO: Reindex unsupported topologies
-                Logger.Warning?.Print(LogClass.Gpu, $"Drawing indirect with unsupported topology: {_encoderStateManager.Topology}");
-            }
-
-            var buffer = _renderer.BufferManager
-                .GetBuffer(indirectBuffer.Handle, indirectBuffer.Offset, indirectBuffer.Size, false)
-                .Get(Cbs, indirectBuffer.Offset, indirectBuffer.Size).Value;
-
-            var primitiveType = TopologyRemap(_encoderStateManager.Topology).Convert();
-            var renderCommandEncoder = GetOrCreateRenderEncoder(true);
-
-            renderCommandEncoder.DrawPrimitives(
-                primitiveType,
-                buffer,
-                (ulong)(indirectBuffer.Offset + offset));
-        }
-
-        public void DrawIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride)
-        {
-            for (int i = 0; i < maxDrawCount; i++)
-            {
-                DrawIndirectOffset(indirectBuffer, stride * i);
-            }
-        }
-
-        public void DrawTexture(ITexture texture, ISampler sampler, Extents2DF srcRegion, Extents2DF dstRegion)
-        {
-            _renderer.HelperShader.DrawTexture(texture, sampler, srcRegion, dstRegion);
-        }
-
-        public void SetAlphaTest(bool enable, float reference, CompareOp op)
-        {
-            // This is currently handled using shader specialization, as Metal does not support alpha test.
-            // In the future, we may want to use this to write the reference value into the support buffer,
-            // to avoid creating one version of the shader per reference value used.
-        }
-
-        public void SetBlendState(AdvancedBlendDescriptor blend)
-        {
-            // Metal does not support advanced blend.
-        }
-
-        public void SetBlendState(int index, BlendDescriptor blend)
-        {
-            _encoderStateManager.UpdateBlendDescriptors(index, blend);
-        }
-
-        public void SetDepthBias(PolygonModeMask enables, float factor, float units, float clamp)
-        {
-            if (enables == 0)
-            {
-                _encoderStateManager.UpdateDepthBias(0, 0, 0);
-            }
-            else
-            {
-                _encoderStateManager.UpdateDepthBias(units, factor, clamp);
-            }
-        }
-
-        public void SetDepthClamp(bool clamp)
-        {
-            _encoderStateManager.UpdateDepthClamp(clamp);
-        }
-
-        public void SetDepthMode(DepthMode mode)
-        {
-            // Metal does not support depth clip control.
-        }
-
-        public void SetDepthTest(DepthTestDescriptor depthTest)
-        {
-            _encoderStateManager.UpdateDepthState(depthTest);
-        }
-
-        public void SetFaceCulling(bool enable, Face face)
-        {
-            _encoderStateManager.UpdateCullMode(enable, face);
-        }
-
-        public void SetFrontFace(FrontFace frontFace)
-        {
-            _encoderStateManager.UpdateFrontFace(frontFace);
-        }
-
-        public void SetIndexBuffer(BufferRange buffer, IndexType type)
-        {
-            _encoderStateManager.UpdateIndexBuffer(buffer, type);
-        }
-
-        public void SetImage(ShaderStage stage, int binding, ITexture image)
-        {
-            if (image is TextureBase img)
-            {
-                _encoderStateManager.UpdateImage(stage, binding, img);
-            }
-        }
-
-        public void SetImageArray(ShaderStage stage, int binding, IImageArray array)
-        {
-            if (array is ImageArray imageArray)
-            {
-                _encoderStateManager.UpdateImageArray(stage, binding, imageArray);
-            }
-        }
-
-        public void SetImageArraySeparate(ShaderStage stage, int setIndex, IImageArray array)
-        {
-            if (array is ImageArray imageArray)
-            {
-                _encoderStateManager.UpdateImageArraySeparate(stage, setIndex, imageArray);
-            }
-        }
-
-        public void SetLineParameters(float width, bool smooth)
-        {
-            // Metal does not support wide-lines.
-        }
-
-        public void SetLogicOpState(bool enable, LogicalOp op)
-        {
-            _encoderStateManager.UpdateLogicOpState(enable, op);
-        }
-
-        public void SetMultisampleState(MultisampleDescriptor multisample)
-        {
-            _encoderStateManager.UpdateMultisampleState(multisample);
-        }
-
-        public void SetPatchParameters(int vertices, ReadOnlySpan<float> defaultOuterLevel, ReadOnlySpan<float> defaultInnerLevel)
-        {
-            Logger.Warning?.Print(LogClass.Gpu, "Not Implemented!");
-        }
-
-        public void SetPointParameters(float size, bool isProgramPointSize, bool enablePointSprite, Origin origin)
-        {
-            Logger.Warning?.Print(LogClass.Gpu, "Not Implemented!");
-        }
-
-        public void SetPolygonMode(PolygonMode frontMode, PolygonMode backMode)
-        {
-            // Metal does not support polygon mode.
-        }
-
-        public void SetPrimitiveRestart(bool enable, int index)
-        {
-            // Always active for LineStrip and TriangleStrip
-            // https://github.com/gpuweb/gpuweb/issues/1220#issuecomment-732483263
-            // https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1515520-drawindexedprimitives
-            // https://stackoverflow.com/questions/70813665/how-to-render-multiple-trianglestrips-using-metal
-
-            // Emulating disabling this is very difficult. It's unlikely for an index buffer to use the largest possible index,
-            // so it's fine nearly all of the time.
-        }
-
-        public void SetPrimitiveTopology(PrimitiveTopology topology)
-        {
-            _encoderStateManager.UpdatePrimitiveTopology(topology);
-        }
-
-        public void SetProgram(IProgram program)
-        {
-            _encoderStateManager.UpdateProgram(program);
-        }
-
-        public void SetRasterizerDiscard(bool discard)
-        {
-            _encoderStateManager.UpdateRasterizerDiscard(discard);
-        }
-
-        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask)
-        {
-            _encoderStateManager.UpdateRenderTargetColorMasks(componentMask);
-        }
-
-        public void SetRenderTargets(ITexture[] colors, ITexture depthStencil)
-        {
-            _encoderStateManager.UpdateRenderTargets(colors, depthStencil);
-        }
-
-        public void SetScissors(ReadOnlySpan<Rectangle<int>> regions)
-        {
-            _encoderStateManager.UpdateScissors(regions);
-        }
-
-        public void SetStencilTest(StencilTestDescriptor stencilTest)
-        {
-            _encoderStateManager.UpdateStencilState(stencilTest);
-        }
-
-        public void SetUniformBuffers(ReadOnlySpan<BufferAssignment> buffers)
-        {
-            _encoderStateManager.UpdateUniformBuffers(buffers);
-        }
-
-        public void SetStorageBuffers(ReadOnlySpan<BufferAssignment> buffers)
-        {
-            _encoderStateManager.UpdateStorageBuffers(buffers);
-        }
-
-        internal void SetStorageBuffers(int first, ReadOnlySpan<Auto<DisposableBuffer>> buffers)
-        {
-            _encoderStateManager.UpdateStorageBuffers(first, buffers);
-        }
-
-        public void SetTextureAndSampler(ShaderStage stage, int binding, ITexture texture, ISampler sampler)
-        {
-            if (texture is TextureBase tex)
-            {
-                if (sampler == null || sampler is SamplerHolder)
-                {
-                    _encoderStateManager.UpdateTextureAndSampler(stage, binding, tex, (SamplerHolder)sampler);
-                }
-            }
-        }
-
-        public void SetTextureArray(ShaderStage stage, int binding, ITextureArray array)
-        {
-            if (array is TextureArray textureArray)
-            {
-                _encoderStateManager.UpdateTextureArray(stage, binding, textureArray);
-            }
-        }
-
-        public void SetTextureArraySeparate(ShaderStage stage, int setIndex, ITextureArray array)
-        {
-            if (array is TextureArray textureArray)
-            {
-                _encoderStateManager.UpdateTextureArraySeparate(stage, setIndex, textureArray);
-            }
-        }
-
-        public void SetUserClipDistance(int index, bool enableClip)
-        {
-            // TODO. Same as Vulkan
-        }
-
-        public void SetVertexAttribs(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs)
-        {
-            _encoderStateManager.UpdateVertexAttribs(vertexAttribs);
-        }
-
-        public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
-        {
-            _encoderStateManager.UpdateVertexBuffers(vertexBuffers);
-        }
-
-        public void SetViewports(ReadOnlySpan<Viewport> viewports)
-        {
-            _encoderStateManager.UpdateViewports(viewports);
-        }
-
-        public void TextureBarrier()
-        {
-            if (CurrentEncoderType == EncoderType.Render)
-            {
-                Encoders.RenderEncoder.MemoryBarrier(MTLBarrierScope.Textures, MTLRenderStages.RenderStageFragment, MTLRenderStages.RenderStageFragment);
-            }
-        }
-
-        public void TextureBarrierTiled()
-        {
-            TextureBarrier();
-        }
-
-        public bool TryHostConditionalRendering(ICounterEvent value, ulong compare, bool isEqual)
-        {
-            // TODO: Implementable via indirect draw commands
-            return false;
-        }
-
-        public bool TryHostConditionalRendering(ICounterEvent value, ICounterEvent compare, bool isEqual)
-        {
-            // TODO: Implementable via indirect draw commands
-            return false;
-        }
-
-        public void EndHostConditionalRendering()
-        {
-            // TODO: Implementable via indirect draw commands
-        }
-
-        public void BeginTransformFeedback(PrimitiveTopology topology)
-        {
-            // Metal does not support transform feedback.
-        }
-
-        public void EndTransformFeedback()
-        {
-            // Metal does not support transform feedback.
-        }
-
-        public void SetTransformFeedbackBuffers(ReadOnlySpan<BufferRange> buffers)
-        {
-            // Metal does not support transform feedback.
-        }
-
-        public void Dispose()
-        {
-            EndCurrentPass();
-            _encoderStateManager.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/Program.cs

@@ -1,286 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Shader;
-using SharpMetal.Foundation;
-using SharpMetal.Metal;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class Program : IProgram
-    {
-        private ProgramLinkStatus _status;
-        private readonly ShaderSource[] _shaders;
-        private readonly GCHandle[] _handles;
-        private int _successCount;
-
-        private readonly MetalRenderer _renderer;
-
-        public MTLFunction VertexFunction;
-        public MTLFunction FragmentFunction;
-        public MTLFunction ComputeFunction;
-        public ComputeSize ComputeLocalSize { get; }
-
-        private HashTableSlim<PipelineUid, MTLRenderPipelineState> _graphicsPipelineCache;
-        private MTLComputePipelineState? _computePipelineCache;
-        private bool _firstBackgroundUse;
-
-        public ResourceBindingSegment[][] BindingSegments { get; }
-        // Argument buffer sizes for Vertex or Compute stages
-        public int[] ArgumentBufferSizes { get; }
-        // Argument buffer sizes for Fragment stage
-        public int[] FragArgumentBufferSizes { get; }
-
-        public Program(
-            MetalRenderer renderer,
-            MTLDevice device,
-            ShaderSource[] shaders,
-            ResourceLayout resourceLayout,
-            ComputeSize computeLocalSize = default)
-        {
-            _renderer = renderer;
-            renderer.Programs.Add(this);
-
-            ComputeLocalSize = computeLocalSize;
-            _shaders = shaders;
-            _handles = new GCHandle[_shaders.Length];
-
-            _status = ProgramLinkStatus.Incomplete;
-
-            for (int i = 0; i < _shaders.Length; i++)
-            {
-                ShaderSource shader = _shaders[i];
-
-                using var compileOptions = new MTLCompileOptions
-                {
-                    PreserveInvariance = true,
-                    LanguageVersion = MTLLanguageVersion.Version31,
-                };
-                var index = i;
-
-                _handles[i] = device.NewLibrary(StringHelper.NSString(shader.Code), compileOptions, (library, error) => CompilationResultHandler(library, error, index));
-            }
-
-            (BindingSegments, ArgumentBufferSizes, FragArgumentBufferSizes) = BuildBindingSegments(resourceLayout.SetUsages);
-        }
-
-        public void CompilationResultHandler(MTLLibrary library, NSError error, int index)
-        {
-            var shader = _shaders[index];
-
-            if (_handles[index].IsAllocated)
-            {
-                _handles[index].Free();
-            }
-
-            if (error != IntPtr.Zero)
-            {
-                Logger.Warning?.PrintMsg(LogClass.Gpu, shader.Code);
-                Logger.Warning?.Print(LogClass.Gpu, $"{shader.Stage} shader linking failed: \n{StringHelper.String(error.LocalizedDescription)}");
-                _status = ProgramLinkStatus.Failure;
-                return;
-            }
-
-            switch (shader.Stage)
-            {
-                case ShaderStage.Compute:
-                    ComputeFunction = library.NewFunction(StringHelper.NSString("kernelMain"));
-                    break;
-                case ShaderStage.Vertex:
-                    VertexFunction = library.NewFunction(StringHelper.NSString("vertexMain"));
-                    break;
-                case ShaderStage.Fragment:
-                    FragmentFunction = library.NewFunction(StringHelper.NSString("fragmentMain"));
-                    break;
-                default:
-                    Logger.Warning?.Print(LogClass.Gpu, $"Cannot handle stage {shader.Stage}!");
-                    break;
-            }
-
-            _successCount++;
-
-            if (_successCount >= _shaders.Length && _status != ProgramLinkStatus.Failure)
-            {
-                _status = ProgramLinkStatus.Success;
-            }
-        }
-
-        private static (ResourceBindingSegment[][], int[], int[]) BuildBindingSegments(ReadOnlyCollection<ResourceUsageCollection> setUsages)
-        {
-            ResourceBindingSegment[][] segments = new ResourceBindingSegment[setUsages.Count][];
-            int[] argBufferSizes = new int[setUsages.Count];
-            int[] fragArgBufferSizes = new int[setUsages.Count];
-
-            for (int setIndex = 0; setIndex < setUsages.Count; setIndex++)
-            {
-                List<ResourceBindingSegment> currentSegments = new();
-
-                ResourceUsage currentUsage = default;
-                int currentCount = 0;
-
-                for (int index = 0; index < setUsages[setIndex].Usages.Count; index++)
-                {
-                    ResourceUsage usage = setUsages[setIndex].Usages[index];
-
-                    if (currentUsage.Binding + currentCount != usage.Binding ||
-                        currentUsage.Type != usage.Type ||
-                        currentUsage.Stages != usage.Stages ||
-                        currentUsage.ArrayLength > 1 ||
-                        usage.ArrayLength > 1)
-                    {
-                        if (currentCount != 0)
-                        {
-                            currentSegments.Add(new ResourceBindingSegment(
-                                currentUsage.Binding,
-                                currentCount,
-                                currentUsage.Type,
-                                currentUsage.Stages,
-                                currentUsage.ArrayLength > 1));
-
-                            var size = currentCount * ResourcePointerSize(currentUsage.Type);
-                            if (currentUsage.Stages.HasFlag(ResourceStages.Fragment))
-                            {
-                                fragArgBufferSizes[setIndex] += size;
-                            }
-
-                            if (currentUsage.Stages.HasFlag(ResourceStages.Vertex) ||
-                                currentUsage.Stages.HasFlag(ResourceStages.Compute))
-                            {
-                                argBufferSizes[setIndex] += size;
-                            }
-                        }
-
-                        currentUsage = usage;
-                        currentCount = usage.ArrayLength;
-                    }
-                    else
-                    {
-                        currentCount++;
-                    }
-                }
-
-                if (currentCount != 0)
-                {
-                    currentSegments.Add(new ResourceBindingSegment(
-                        currentUsage.Binding,
-                        currentCount,
-                        currentUsage.Type,
-                        currentUsage.Stages,
-                        currentUsage.ArrayLength > 1));
-
-                    var size = currentCount * ResourcePointerSize(currentUsage.Type);
-                    if (currentUsage.Stages.HasFlag(ResourceStages.Fragment))
-                    {
-                        fragArgBufferSizes[setIndex] += size;
-                    }
-
-                    if (currentUsage.Stages.HasFlag(ResourceStages.Vertex) ||
-                        currentUsage.Stages.HasFlag(ResourceStages.Compute))
-                    {
-                        argBufferSizes[setIndex] += size;
-                    }
-                }
-
-                segments[setIndex] = currentSegments.ToArray();
-            }
-
-            return (segments, argBufferSizes, fragArgBufferSizes);
-        }
-
-        private static int ResourcePointerSize(ResourceType type)
-        {
-            return (type == ResourceType.TextureAndSampler ? 2 : 1);
-        }
-
-        public ProgramLinkStatus CheckProgramLink(bool blocking)
-        {
-            if (blocking)
-            {
-                while (_status == ProgramLinkStatus.Incomplete)
-                { }
-
-                return _status;
-            }
-
-            return _status;
-        }
-
-        public byte[] GetBinary()
-        {
-            return [];
-        }
-
-        public void AddGraphicsPipeline(ref PipelineUid key, MTLRenderPipelineState pipeline)
-        {
-            (_graphicsPipelineCache ??= new()).Add(ref key, pipeline);
-        }
-
-        public void AddComputePipeline(MTLComputePipelineState pipeline)
-        {
-            _computePipelineCache = pipeline;
-        }
-
-        public bool TryGetGraphicsPipeline(ref PipelineUid key, out MTLRenderPipelineState pipeline)
-        {
-            if (_graphicsPipelineCache == null)
-            {
-                pipeline = default;
-                return false;
-            }
-
-            if (!_graphicsPipelineCache.TryGetValue(ref key, out pipeline))
-            {
-                if (_firstBackgroundUse)
-                {
-                    Logger.Warning?.Print(LogClass.Gpu, "Background pipeline compile missed on draw - incorrect pipeline state?");
-                    _firstBackgroundUse = false;
-                }
-
-                return false;
-            }
-
-            _firstBackgroundUse = false;
-
-            return true;
-        }
-
-        public bool TryGetComputePipeline(out MTLComputePipelineState pipeline)
-        {
-            if (_computePipelineCache.HasValue)
-            {
-                pipeline = _computePipelineCache.Value;
-                return true;
-            }
-
-            pipeline = default;
-            return false;
-        }
-
-        public void Dispose()
-        {
-            if (!_renderer.Programs.Remove(this))
-            {
-                return;
-            }
-
-            if (_graphicsPipelineCache != null)
-            {
-                foreach (MTLRenderPipelineState pipeline in _graphicsPipelineCache.Values)
-                {
-                    pipeline.Dispose();
-                }
-            }
-
-            _computePipelineCache?.Dispose();
-
-            VertexFunction.Dispose();
-            FragmentFunction.Dispose();
-            ComputeFunction.Dispose();
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/ResourceBindingSegment.cs

@@ -1,22 +0,0 @@
-using Ryujinx.Graphics.GAL;
-
-namespace Ryujinx.Graphics.Metal
-{
-    readonly struct ResourceBindingSegment
-    {
-        public readonly int Binding;
-        public readonly int Count;
-        public readonly ResourceType Type;
-        public readonly ResourceStages Stages;
-        public readonly bool IsArray;
-
-        public ResourceBindingSegment(int binding, int count, ResourceType type, ResourceStages stages, bool isArray)
-        {
-            Binding = binding;
-            Count = count;
-            Type = type;
-            Stages = stages;
-            IsArray = isArray;
-        }
-    }
-}

src/Ryujinx.Graphics.Metal/ResourceLayoutBuilder.cs

@@ -1,59 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System;
-using System.Collections.Generic;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Metal
-{
-    [SupportedOSPlatform("macos")]
-    class ResourceLayoutBuilder
-    {
-        private const int TotalSets = MetalRenderer.TotalSets;
-
-        private readonly List<ResourceDescriptor>[] _resourceDescriptors;
-        private readonly List<ResourceUsage>[] _resourceUsages;
-
-        public ResourceLayoutBuilder()
-        {
-            _resourceDescriptors = new List<ResourceDescriptor>[TotalSets];
-            _resourceUsages = new List<ResourceUsage>[TotalSets];
-
-            for (int index = 0; index < TotalSets; index++)
-            {
-                _resourceDescriptors[index] = new();
-                _resourceUsages[index] = new();
-            }
-        }
-
-        public ResourceLayoutBuilder Add(ResourceStages stages, ResourceType type, int binding, bool write = false)
-        {
-            uint setIndex = type switch
-            {
-                ResourceType.UniformBuffer => Constants.ConstantBuffersSetIndex,
-                ResourceType.StorageBuffer => Constants.StorageBuffersSetIndex,
-                ResourceType.TextureAndSampler or ResourceType.BufferTexture => Constants.TexturesSetIndex,
-                ResourceType.Image or ResourceType.BufferImage => Constants.ImagesSetIndex,
-                _ => throw new ArgumentException($"Invalid resource type \"{type}\"."),
-            };
-
-            _resourceDescriptors[setIndex].Add(new ResourceDescriptor(binding, 1, type, stages));
-            _resourceUsages[setIndex].Add(new ResourceUsage(binding, 1, type, stages, write));
-
-            return this;
-        }
-
-        public ResourceLayout Build()
-        {
-            var descriptors = new ResourceDescriptorCollection[TotalSets];
-            var usages = new ResourceUsageCollection[TotalSets];
-
-            for (int index = 0; index < TotalSets; index++)
-            {
-                descriptors[index] = new ResourceDescriptorCollection(_resourceDescriptors[index].ToArray().AsReadOnly());
-                usages[index] = new ResourceUsageCollection(_resourceUsages[index].ToArray().AsReadOnly());
-            }
-
-            return new ResourceLayout(descriptors.AsReadOnly(), usages.AsReadOnly());
-        }
-    }
-}