Merge branch 'GreemDev:master' into master

Update NpadController.cs
add ?
2024-12-23 22:13:47 +08:00 · 2024-12-23 18:55:49 +08:00 · 2024-12-23 18:54:11 +08:00 · 2024-12-23 17:57:55 +08:00
416 changed files with 6067 additions and 26181 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,7 +22,7 @@ body:
    id: log
    attributes:
      label: Log file
-      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
+      description: A log file will help our developers to better diagnose and fix the issue.
      placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
    validations:
      required: true
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -32,7 +32,7 @@ kernel:

 infra:
 - changed-files:
-  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props', 'src/Ryujinx.BuildValidationTasks/**']
+  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props']

 documentation:
 - changed-files:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,9 +64,14 @@ jobs:
        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'

+      - name: Publish Ryujinx.Headless.SDL2
+        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
+        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
        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'

      - name: Build AppImage
@@ -114,6 +119,13 @@ jobs:
          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
          path: publish_appimage

+      - name: Upload Ryujinx.Headless.SDL2 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
+          path: publish_sdl2_headless
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
  build_macos:
    name: macOS Universal (${{ matrix.configuration }})
    runs-on: ubuntu-latest
@@ -129,11 +141,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 14
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 14

      - name: Install rcodesign
        run: |
@@ -159,9 +171,20 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp publish ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"
+
      - name: Upload Ryujinx artifact
        uses: actions/upload-artifact@v4
        with:
          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
          path: "publish/*.tar.gz"
        if: github.event_name == 'pull_request'
+
+      - name: Upload Ryujinx.Headless.SDL2 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          path: "publish_headless/*.tar.gz"
+        if: github.event_name == 'pull_request'
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -21,9 +21,9 @@ env:
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Canary-Releases"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
  RELEASE: 1

 jobs:
@@ -43,8 +43,8 @@ jobs:
        with:
          script: |
            github.rest.git.createRef({
-              owner: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}",
-              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}",
+              owner: context.repo.owner,
+              repo: context.repo.repo,
              ref: 'refs/tags/Canary-${{ steps.version_info.outputs.build_version }}',
              sha: context.sha
            })
@@ -64,7 +64,7 @@ jobs:
            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            | macOS | [Canary macOS artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
@@ -108,7 +108,6 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/Ryujinx.desktop          
        shell: bash

      - name: Create output dir
@@ -116,83 +115,97 @@ jobs:

      - name: Publish
        run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
        run: |
-          pushd publish
-          rm libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
+          pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
          popd
        shell: bash

      - name: Packing Linux builds
        if: matrix.platform.os == 'ubuntu-latest'
        run: |
-          pushd publish
-          rm libarmeilleure-jitsupport.dylib
-          chmod +x Ryujinx.sh Ryujinx
-          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx
+          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
          popd
        shell: bash
      
-      - name: Build AppImage (Linux)
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
+      #- name: Build AppImage (Linux)
+      #  if: matrix.platform.os == 'ubuntu-latest'
+      #  run: |
+      #    BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
+      #    PLATFORM_NAME="${{ matrix.platform.name }}"

-          sudo apt install -y zsync desktop-file-utils appstream
+      #    sudo apt install -y zsync desktop-file-utils appstream

-          mkdir -p tools
-          export PATH="$PATH:$(readlink -f tools)"
+      #    mkdir -p tools
+      #    export PATH="$PATH:$(readlink -f tools)"

          # Setup appimagetool
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-          chmod +x tools/appimagetool
-          chmod +x distribution/linux/appimage/build-appimage.sh
+      #    wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+      #    chmod +x tools/appimagetool
+      #    chmod +x distribution/linux/appimage/build-appimage.sh

          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            ARCH_NAME=x64
-            export ARCH=x86_64
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-            ARCH_NAME=arm64
-            export ARCH=aarch64
-          else
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-            exit 1
-          fi
+      #    if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+      #      ARCH_NAME=x64
+      #      export ARCH=x86_64
+      #    elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+      #      ARCH_NAME=arm64
+      #      export ARCH=aarch64
+      #    else
+      #      echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+      #      exit 1
+      #    fi

-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|Canary-Releases|latest|*-$ARCH_NAME.AppImage.zsync"
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+      #    export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+      #    BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh

-          pushd publish_appimage
-          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
-          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
-          popd          
-        shell: bash 
+          # Add to release output
+      #    pushd publish_ava_appimage
+      #    mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+      #    mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+      #    popd
+      #  shell: bash

      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
+          artifacts: "release_output/*.tar.gz,release_output/*.zip"
+          #artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: |
            # Canary builds:
            
-            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ github.repository }}/releases/latest) instead if that sounds like something you don't want to deal with.
-            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/GreemDev/Ryujinx/releases/latest) instead if that sounds like something you don't want to deal with.
+
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
+            "**Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -202,7 +215,7 @@ jobs:

  macos_release:
    name: Release MacOS universal
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4

@@ -210,11 +223,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15

      - name: Install rcodesign
        run: |
@@ -249,11 +262,15 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+
      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: "Canary ${{ steps.version_info.outputs.build_version }}"
-          artifacts: "publish_ava/*.tar.gz"
+          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: ""
          omitBodyDuringUpdate: true
--- a/.github/workflows/nightly_pr_comment.yml
+++ b/.github/workflows/nightly_pr_comment.yml
@@ -38,16 +38,20 @@ jobs:
              return core.error(`No artifacts found`);
            }
            let body = `Download the artifacts for this pull request:\n`;
+            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less</summary>\n`;
            let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
            for (const art of artifacts) {
-              const url = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
-              if (art.name.includes('Debug')) {
-                hidden_debug_artifacts += `\n* [${art.name}](${url})`;
+              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('nogui-ryujinx')) {
+                hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
              } else {
-                body += `\n* [${art.name}](${url})`;
+                body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
              }
            }
+            hidden_headless_artifacts += `\n</details>`;
            hidden_debug_artifacts += `\n</details>`;
+            body += hidden_headless_artifacts;
            body += hidden_debug_artifacts;

            const {data: comments} = await github.rest.issues.listComments({repo, owner, issue_number});
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,6 +3,16 @@ name: Release job
 on:
  workflow_dispatch:
    inputs: {}
+  push:
+    branches: [ release ]
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - 'assets/**'
+      - '*.yml'
+      - '*.json'
+      - '*.config'
+      - '*.md'

 concurrency: release

@@ -11,7 +21,7 @@ env:
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
  RELEASE: 1

@@ -32,8 +42,8 @@ jobs:
        with:
          script: |
            github.rest.git.createRef({
-              owner: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}",
-              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}",
+              owner: context.repo.owner,
+              repo: context.repo.repo,
              ref: 'refs/tags/${{ steps.version_info.outputs.build_version }}',
              sha: context.sha
            })
@@ -44,13 +54,13 @@ jobs:
          name: ${{ steps.version_info.outputs.build_version }}
          tag: ${{ steps.version_info.outputs.build_version }}
          body: |
-            # Stable builds:
+            # Regular builds:
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | [Stable Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            | Windows 64-bit | [Release Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64-bit | [Release Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux ARM 64-bit | [Release Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Release macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
@@ -102,6 +112,7 @@ jobs:
      - name: Publish
        run: |
          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
@@ -110,14 +121,10 @@ jobs:
          rm libarmeilleure-jitsupport.dylib
          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
-        shell: bash

-      - name: Packing Linux builds
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          pushd publish
-          chmod +x Ryujinx.sh Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          pushd publish_sdl2_headless
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash
      
@@ -156,6 +163,20 @@ jobs:
          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
          popd
+        shell: bash        
+
+      - name: Packing Linux builds
+        if: matrix.platform.os == 'ubuntu-latest'
+        run: |
+          pushd publish
+          chmod +x Ryujinx.sh Ryujinx
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          popd
+
+          pushd publish_sdl2_headless
+          chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          popd
        shell: bash

      - name: Pushing new release
@@ -165,15 +186,15 @@ jobs:
          artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: |
-            # Stable builds:
+            # Regular builds:
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | [Stable Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
-            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
+            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+          
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -183,7 +204,7 @@ jobs:

  macos_release:
    name: Release MacOS universal
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4

@@ -191,11 +212,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15

      - name: Install rcodesign
        run: |
@@ -230,11 +251,15 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
+
      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "publish/*.tar.gz"
+          artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: ""
          omitBodyDuringUpdate: true
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,13 +3,13 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -17,8 +17,7 @@
    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.2" />
+    <PackageVersion Include="Concentus" Version="2.2.0" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +25,7 @@
    <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" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -42,17 +41,15 @@
    <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.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0.2" />
+    <PackageVersion Include="Gommon" Version="2.6.8" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="Sep" Version="0.6.0" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -57,10 +57,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Headless.SDL2", "src\Ryujinx.Headless.SDL2\Ryujinx.Headless.SDL2.csproj", "{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.UI.Common", "src\Ryujinx.UI.Common\Ryujinx.UI.Common.csproj", "{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Generators", "src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj", "{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vulkan", "src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj", "{D4D09B08-D580-4D69-B886-C35D2853F6C8}"
@@ -77,15 +81,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Gene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
-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
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal.SharpMetalExtensions", "src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj", "{81EA598C-DBA1-40B0-8DA4-4796B78F2037}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -95,6 +90,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -209,6 +206,10 @@ Global
 		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -217,6 +218,10 @@ Global
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -249,16 +254,9 @@ 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
 		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/distribution/linux/appimage/build-appimage.sh
+++ b/distribution/linux/appimage/build-appimage.sh
@@ -6,14 +6,14 @@ cd "$ROOTDIR"

 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
-UFLAG=${UFLAG:-"gh-releases-zsync|Ryubing|ryujinx|latest|*-x64.AppImage.zsync"}
+UFLAG=${UFLAG:-"gh-releases-zsync|GreemDev|ryujinx|latest|*-x64.AppImage.zsync"}

 rm -rf AppDir
 mkdir -p AppDir/usr/bin

 cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
 cp distribution/linux/appimage/AppRun AppDir/AppRun
-cp distribution/misc/Logo.svg AppDir/Ryujinx.svg
+cp src/Ryujinx.UI.Common/Resources/Logo_Ryujinx.png AppDir/Ryujinx.svg


 cp -r "$BUILDDIR"/* AppDir/usr/bin/
--- a/distribution/macos/bundle_fix_up.py
+++ b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
    OTOOL = shutil.which("llvm-otool")
    if OTOOL is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
            otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
            if otool_path is not None:
                OTOOL = otool_path
--- a/distribution/macos/construct_universal_dylib.py
+++ b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@ else:
    LIPO = shutil.which("llvm-lipo")

    if LIPO is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
            lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
            if lipo_path is not None:
                LIPO = lipo_path
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
    fi
 else
    LIPO=lipo
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
    fi
 else
    LIPO=lipo
--- a/distribution/macos/shortcut-template.plist
+++ b/distribution/macos/shortcut-template.plist
@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
--- a/src/ARMeilleure/Instructions/InstEmitSimdArithmetic.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdArithmetic.cs
@@ -406,7 +406,7 @@ namespace ARMeilleure.Instructions
                {
                    Operand res = EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub), op1, op2);

-                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), res);
+                    return EmitUnaryMathCall(context, nameof(Math.Abs), res);
                });
            }
        }
@@ -451,7 +451,7 @@ namespace ARMeilleure.Instructions
                {
                    Operand res = EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub), op1, op2);

-                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), res);
+                    return EmitUnaryMathCall(context, nameof(Math.Abs), res);
                });
            }
        }
@@ -483,7 +483,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Abs), op1);
                });
            }
        }
@@ -522,7 +522,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Abs), op1);
                });
            }
        }
@@ -2246,7 +2246,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Floor), op1);
                });
            }
        }
@@ -2265,7 +2265,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Floor), op1);
                });
            }
        }
@@ -2322,7 +2322,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Ceiling), op1);
                });
            }
        }
@@ -2341,7 +2341,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Ceiling), op1);
                });
            }
        }
@@ -2390,7 +2390,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Truncate), op1);
                });
            }
        }
@@ -2409,7 +2409,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1);
+                    return EmitUnaryMathCall(context, nameof(Math.Truncate), op1);
                });
            }
        }
--- a/src/ARMeilleure/Instructions/InstEmitSimdArithmetic32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdArithmetic32.cs
@@ -43,7 +43,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1));
+                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Abs), op1));
            }
        }

@@ -66,7 +66,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    EmitVectorUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1));
+                    EmitVectorUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Abs), op1));
                }
            }
            else
--- a/src/ARMeilleure/Instructions/InstEmitSimdCmp.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCmp.cs
@@ -726,8 +726,8 @@ namespace ARMeilleure.Instructions

                if (absolute)
                {
-                    ne = EmitUnaryMathCall(context, nameof(MathHelper.Abs), ne);
-                    me = EmitUnaryMathCall(context, nameof(MathHelper.Abs), me);
+                    ne = EmitUnaryMathCall(context, nameof(Math.Abs), ne);
+                    me = EmitUnaryMathCall(context, nameof(Math.Abs), me);
                }

                Operand e = EmitSoftFloatCall(context, name, ne, me);
--- a/src/ARMeilleure/Instructions/InstEmitSimdCvt.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCvt.cs
@@ -333,7 +333,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1));
+                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1));
            }
        }

@@ -349,7 +349,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1), signed: true, scalar: false);
+                EmitFcvt(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1), signed: true, scalar: false);
            }
        }

@@ -365,7 +365,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1));
+                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1));
            }
        }

@@ -538,7 +538,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1));
+                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Ceiling), op1));
            }
        }

@@ -554,7 +554,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1));
+                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Ceiling), op1));
            }
        }

--- a/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
@@ -357,10 +357,10 @@ namespace ARMeilleure.Instructions
                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
                        break;
                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
                        break;
                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Floor), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
                        break;
                }

@@ -494,10 +494,10 @@ namespace ARMeilleure.Instructions
                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
                        break;
                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
                        break;
                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Floor), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
                        break;
                }

@@ -534,7 +534,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), m));
+                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Floor), m));
            }
        }

@@ -574,7 +574,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), m));
+                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Ceiling), m));
            }
        }

@@ -613,7 +613,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1));
+                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Truncate), op1));
            }
        }

--- a/src/ARMeilleure/Instructions/InstEmitSimdHelper.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdHelper.cs
@@ -460,8 +460,8 @@ namespace ARMeilleure.Instructions
            IOpCodeSimd op = (IOpCodeSimd)context.CurrOp;

            MethodInfo info = (op.Size & 1) == 0
-                ? typeof(MathHelperF).GetMethod(name, new Type[] { typeof(float) })
-                : typeof(MathHelper).GetMethod(name, new Type[] { typeof(double) });
+                ? typeof(MathF).GetMethod(name, new Type[] { typeof(float) })
+                : typeof(Math).GetMethod(name, new Type[] { typeof(double) });

            return context.Call(info, n);
        }
@@ -470,11 +470,11 @@ namespace ARMeilleure.Instructions
        {
            IOpCodeSimd op = (IOpCodeSimd)context.CurrOp;

-            string name = nameof(MathHelper.Round);
+            string name = nameof(Math.Round);

            MethodInfo info = (op.Size & 1) == 0
-                ? typeof(MathHelperF).GetMethod(name, new Type[] { typeof(float), typeof(int) })
-                : typeof(MathHelper).GetMethod(name, new Type[] { typeof(double), typeof(int) });
+                ? typeof(MathF).GetMethod(name, new Type[] { typeof(float), typeof(MidpointRounding) })
+                : typeof(Math).GetMethod(name, new Type[] { typeof(double), typeof(MidpointRounding) });

            return context.Call(info, n, Const((int)roundMode));
        }
@@ -510,16 +510,16 @@ namespace ARMeilleure.Instructions

            context.MarkLabel(lbl1);
            context.BranchIf(lbl2, rMode, rP, Comparison.NotEqual);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Ceiling), op));
            context.Branch(lblEnd);

            context.MarkLabel(lbl2);
            context.BranchIf(lbl3, rMode, rM, Comparison.NotEqual);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Floor), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Floor), op));
            context.Branch(lblEnd);

            context.MarkLabel(lbl3);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Truncate), op));
            context.Branch(lblEnd);

            context.MarkLabel(lblEnd);
--- a/src/ARMeilleure/Instructions/MathHelper.cs
+++ b/src/ARMeilleure/Instructions/MathHelper.cs
@@ -1,71 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace ARMeilleure.Instructions
-{
-    static class MathHelper
-    {
-        [UnmanagedCallersOnly]
-        public static double Abs(double value)
-        {
-            return Math.Abs(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static double Ceiling(double value)
-        {
-            return Math.Ceiling(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static double Floor(double value)
-        {
-            return Math.Floor(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static double Round(double value, int mode)
-        {
-            return Math.Round(value, (MidpointRounding)mode);
-        }
-
-        [UnmanagedCallersOnly]
-        public static double Truncate(double value)
-        {
-            return Math.Truncate(value);
-        }
-    }
-
-    static class MathHelperF
-    {
-        [UnmanagedCallersOnly]
-        public static float Abs(float value)
-        {
-            return MathF.Abs(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static float Ceiling(float value)
-        {
-            return MathF.Ceiling(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static float Floor(float value)
-        {
-            return MathF.Floor(value);
-        }
-
-        [UnmanagedCallersOnly]
-        public static float Round(float value, int mode)
-        {
-            return MathF.Round(value, (MidpointRounding)mode);
-        }
-
-        [UnmanagedCallersOnly]
-        public static float Truncate(float value)
-        {
-            return MathF.Truncate(value);
-        }
-    }
-}
--- a/src/ARMeilleure/Instructions/NativeInterface.cs
+++ b/src/ARMeilleure/Instructions/NativeInterface.cs
@@ -2,7 +2,6 @@ using ARMeilleure.Memory;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
 using System;
-using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
@@ -35,7 +34,6 @@ namespace ARMeilleure.Instructions
            Context = null;
        }

-        [UnmanagedCallersOnly]
        public static void Break(ulong address, int imm)
        {
            Statistics.PauseTimer();
@@ -45,7 +43,6 @@ namespace ARMeilleure.Instructions
            Statistics.ResumeTimer();
        }

-        [UnmanagedCallersOnly]
        public static void SupervisorCall(ulong address, int imm)
        {
            Statistics.PauseTimer();
@@ -55,7 +52,6 @@ namespace ARMeilleure.Instructions
            Statistics.ResumeTimer();
        }

-        [UnmanagedCallersOnly]
        public static void Undefined(ulong address, int opCode)
        {
            Statistics.PauseTimer();
@@ -66,31 +62,26 @@ namespace ARMeilleure.Instructions
        }

        #region "System registers"
-        [UnmanagedCallersOnly]
        public static ulong GetCtrEl0()
        {
            return GetContext().CtrEl0;
        }

-        [UnmanagedCallersOnly]
        public static ulong GetDczidEl0()
        {
            return GetContext().DczidEl0;
        }

-        [UnmanagedCallersOnly]
        public static ulong GetCntfrqEl0()
        {
            return GetContext().CntfrqEl0;
        }

-        [UnmanagedCallersOnly]
        public static ulong GetCntpctEl0()
        {
            return GetContext().CntpctEl0;
        }

-        [UnmanagedCallersOnly]
        public static ulong GetCntvctEl0()
        {
            return GetContext().CntvctEl0;
@@ -98,31 +89,26 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Read"
-        [UnmanagedCallersOnly]
        public static byte ReadByte(ulong address)
        {
            return GetMemoryManager().ReadGuest<byte>(address);
        }

-        [UnmanagedCallersOnly]
        public static ushort ReadUInt16(ulong address)
        {
            return GetMemoryManager().ReadGuest<ushort>(address);
        }

-        [UnmanagedCallersOnly]
        public static uint ReadUInt32(ulong address)
        {
            return GetMemoryManager().ReadGuest<uint>(address);
        }

-        [UnmanagedCallersOnly]
        public static ulong ReadUInt64(ulong address)
        {
            return GetMemoryManager().ReadGuest<ulong>(address);
        }

-        [UnmanagedCallersOnly]
        public static V128 ReadVector128(ulong address)
        {
            return GetMemoryManager().ReadGuest<V128>(address);
@@ -130,56 +116,47 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Write"
-        [UnmanagedCallersOnly]
        public static void WriteByte(ulong address, byte value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

-        [UnmanagedCallersOnly]
        public static void WriteUInt16(ulong address, ushort value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

-        [UnmanagedCallersOnly]
        public static void WriteUInt32(ulong address, uint value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

-        [UnmanagedCallersOnly]
        public static void WriteUInt64(ulong address, ulong value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

-        [UnmanagedCallersOnly]
        public static void WriteVector128(ulong address, V128 value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }
        #endregion

-        [UnmanagedCallersOnly]
        public static void EnqueueForRejit(ulong address)
        {
            Context.Translator.EnqueueForRejit(address, GetContext().ExecutionMode);
        }

-        [UnmanagedCallersOnly]
-        public static void SignalMemoryTracking(ulong address, ulong size, byte write)
+        public static void SignalMemoryTracking(ulong address, ulong size, bool write)
        {
-            GetMemoryManager().SignalMemoryTracking(address, size, write == 1);
+            GetMemoryManager().SignalMemoryTracking(address, size, write);
        }

-        [UnmanagedCallersOnly]
        public static void ThrowInvalidMemoryAccess(ulong address)
        {
            throw new InvalidAccessException(address);
        }

-        [UnmanagedCallersOnly]
        public static ulong GetFunctionAddress(ulong address)
        {
            TranslatedFunction function = Context.Translator.GetOrTranslate(address, GetContext().ExecutionMode);
@@ -187,14 +164,12 @@ namespace ARMeilleure.Instructions
            return (ulong)function.FuncPointer.ToInt64();
        }

-        [UnmanagedCallersOnly]
        public static void InvalidateCacheLine(ulong address)
        {
            Context.Translator.InvalidateJitCacheRegion(address, InstEmit.DczSizeInBytes);
        }

-        [UnmanagedCallersOnly]
-        public static byte CheckSynchronization()
+        public static bool CheckSynchronization()
        {
            Statistics.PauseTimer();

@@ -204,7 +179,7 @@ namespace ARMeilleure.Instructions

            Statistics.ResumeTimer();

-            return (byte)(context.Running ? 1 : 0);
+            return context.Running;
        }

        public static ExecutionContext GetContext()
--- a/src/ARMeilleure/Instructions/SoftFallback.cs
+++ b/src/ARMeilleure/Instructions/SoftFallback.cs
@@ -1,13 +1,11 @@
 using ARMeilleure.State;
 using System;
-using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
    static class SoftFallback
    {
        #region "ShrImm64"
-        [UnmanagedCallersOnly]
        public static long SignedShrImm64(long value, long roundConst, int shift)
        {
            if (roundConst == 0L)
@@ -50,7 +48,6 @@ namespace ARMeilleure.Instructions
            }
        }

-        [UnmanagedCallersOnly]
        public static ulong UnsignedShrImm64(ulong value, long roundConst, int shift)
        {
            if (roundConst == 0L)
@@ -95,7 +92,6 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Saturation"
-        [UnmanagedCallersOnly]
        public static int SatF32ToS32(float value)
        {
            if (float.IsNaN(value))
@@ -107,7 +103,6 @@ namespace ARMeilleure.Instructions
                   value <= int.MinValue ? int.MinValue : (int)value;
        }

-        [UnmanagedCallersOnly]
        public static long SatF32ToS64(float value)
        {
            if (float.IsNaN(value))
@@ -119,7 +114,6 @@ namespace ARMeilleure.Instructions
                   value <= long.MinValue ? long.MinValue : (long)value;
        }

-        [UnmanagedCallersOnly]
        public static uint SatF32ToU32(float value)
        {
            if (float.IsNaN(value))
@@ -131,7 +125,6 @@ namespace ARMeilleure.Instructions
                   value <= uint.MinValue ? uint.MinValue : (uint)value;
        }

-        [UnmanagedCallersOnly]
        public static ulong SatF32ToU64(float value)
        {
            if (float.IsNaN(value))
@@ -143,7 +136,6 @@ namespace ARMeilleure.Instructions
                   value <= ulong.MinValue ? ulong.MinValue : (ulong)value;
        }

-        [UnmanagedCallersOnly]
        public static int SatF64ToS32(double value)
        {
            if (double.IsNaN(value))
@@ -155,7 +147,6 @@ namespace ARMeilleure.Instructions
                   value <= int.MinValue ? int.MinValue : (int)value;
        }

-        [UnmanagedCallersOnly]
        public static long SatF64ToS64(double value)
        {
            if (double.IsNaN(value))
@@ -167,7 +158,6 @@ namespace ARMeilleure.Instructions
                   value <= long.MinValue ? long.MinValue : (long)value;
        }

-        [UnmanagedCallersOnly]
        public static uint SatF64ToU32(double value)
        {
            if (double.IsNaN(value))
@@ -179,7 +169,6 @@ namespace ARMeilleure.Instructions
                   value <= uint.MinValue ? uint.MinValue : (uint)value;
        }

-        [UnmanagedCallersOnly]
        public static ulong SatF64ToU64(double value)
        {
            if (double.IsNaN(value))
@@ -193,7 +182,6 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Count"
-        [UnmanagedCallersOnly]
        public static ulong CountLeadingSigns(ulong value, int size) // size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.).
        {
            value ^= value >> 1;
@@ -213,7 +201,6 @@ namespace ARMeilleure.Instructions

        private static ReadOnlySpan<byte> ClzNibbleTbl => new byte[] { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 };

-        [UnmanagedCallersOnly]
        public static ulong CountLeadingZeros(ulong value, int size) // size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.).
        {
            if (value == 0ul)
@@ -237,49 +224,41 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Table"
-        [UnmanagedCallersOnly]
        public static V128 Tbl1(V128 vector, int bytes, V128 tb0)
        {
            return TblOrTbx(default, vector, bytes, tb0);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbl2(V128 vector, int bytes, V128 tb0, V128 tb1)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbl3(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1, tb2);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbl4(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1, tb2, tb3);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbx1(V128 dest, V128 vector, int bytes, V128 tb0)
        {
            return TblOrTbx(dest, vector, bytes, tb0);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbx2(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbx3(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2);
        }

-        [UnmanagedCallersOnly]
        public static V128 Tbx4(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2, tb3);
@@ -321,22 +300,14 @@ namespace ARMeilleure.Instructions
        private const uint Crc32RevPoly = 0xedb88320;
        private const uint Crc32cRevPoly = 0x82f63b78;

-        [UnmanagedCallersOnly]
        public static uint Crc32b(uint crc, byte value) => Crc32(crc, Crc32RevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32h(uint crc, ushort value) => Crc32h(crc, Crc32RevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32w(uint crc, uint value) => Crc32w(crc, Crc32RevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32x(uint crc, ulong value) => Crc32x(crc, Crc32RevPoly, value);

-        [UnmanagedCallersOnly]
        public static uint Crc32cb(uint crc, byte value) => Crc32(crc, Crc32cRevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32ch(uint crc, ushort value) => Crc32h(crc, Crc32cRevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32cw(uint crc, uint value) => Crc32w(crc, Crc32cRevPoly, value);
-        [UnmanagedCallersOnly]
        public static uint Crc32cx(uint crc, ulong value) => Crc32x(crc, Crc32cRevPoly, value);

        private static uint Crc32h(uint crc, uint poly, ushort val)
@@ -387,25 +358,21 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Aes"
-        [UnmanagedCallersOnly]
        public static V128 Decrypt(V128 value, V128 roundKey)
        {
            return CryptoHelper.AesInvSubBytes(CryptoHelper.AesInvShiftRows(value ^ roundKey));
        }

-        [UnmanagedCallersOnly]
        public static V128 Encrypt(V128 value, V128 roundKey)
        {
            return CryptoHelper.AesSubBytes(CryptoHelper.AesShiftRows(value ^ roundKey));
        }

-        [UnmanagedCallersOnly]
        public static V128 InverseMixColumns(V128 value)
        {
            return CryptoHelper.AesInvMixColumns(value);
        }

-        [UnmanagedCallersOnly]
        public static V128 MixColumns(V128 value)
        {
            return CryptoHelper.AesMixColumns(value);
@@ -413,7 +380,6 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Sha1"
-        [UnmanagedCallersOnly]
        public static V128 HashChoose(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -434,13 +400,11 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

-        [UnmanagedCallersOnly]
        public static uint FixedRotate(uint hash_e)
        {
            return hash_e.Rol(30);
        }

-        [UnmanagedCallersOnly]
        public static V128 HashMajority(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -461,7 +425,6 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

-        [UnmanagedCallersOnly]
        public static V128 HashParity(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -482,7 +445,6 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

-        [UnmanagedCallersOnly]
        public static V128 Sha1SchedulePart1(V128 w0_3, V128 w4_7, V128 w8_11)
        {
            ulong t2 = w4_7.Extract<ulong>(0);
@@ -493,7 +455,6 @@ namespace ARMeilleure.Instructions
            return result ^ (w0_3 ^ w8_11);
        }

-        [UnmanagedCallersOnly]
        public static V128 Sha1SchedulePart2(V128 tw0_3, V128 w12_15)
        {
            V128 t = tw0_3 ^ (w12_15 >> 32);
@@ -538,19 +499,16 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Sha256"
-        [UnmanagedCallersOnly]
        public static V128 HashLower(V128 hash_abcd, V128 hash_efgh, V128 wk)
        {
            return Sha256Hash(hash_abcd, hash_efgh, wk, part1: true);
        }

-        [UnmanagedCallersOnly]
        public static V128 HashUpper(V128 hash_abcd, V128 hash_efgh, V128 wk)
        {
            return Sha256Hash(hash_abcd, hash_efgh, wk, part1: false);
        }

-        [UnmanagedCallersOnly]
        public static V128 Sha256SchedulePart1(V128 w0_3, V128 w4_7)
        {
            V128 result = new();
@@ -569,7 +527,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static V128 Sha256SchedulePart2(V128 w0_3, V128 w8_11, V128 w12_15)
        {
            V128 result = new();
@@ -671,7 +628,6 @@ namespace ARMeilleure.Instructions
        }
        #endregion

-        [UnmanagedCallersOnly]
        public static V128 PolynomialMult64_128(ulong op1, ulong op2)
        {
            V128 result = V128.Zero;
--- a/src/ARMeilleure/Instructions/SoftFloat.cs
+++ b/src/ARMeilleure/Instructions/SoftFloat.cs
@@ -1,7 +1,6 @@
 using ARMeilleure.State;
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
@@ -313,7 +312,6 @@ namespace ARMeilleure.Instructions

    static class SoftFloat16_32
    {
-        [UnmanagedCallersOnly]
        public static float FPConvert(ushort valueBits)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -489,7 +487,6 @@ namespace ARMeilleure.Instructions

    static class SoftFloat16_64
    {
-        [UnmanagedCallersOnly]
        public static double FPConvert(ushort valueBits)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -665,7 +662,6 @@ namespace ARMeilleure.Instructions

    static class SoftFloat32_16
    {
-        [UnmanagedCallersOnly]
        public static ushort FPConvert(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -785,19 +781,12 @@ namespace ARMeilleure.Instructions

    static class SoftFloat32
    {
-        [UnmanagedCallersOnly]
        public static float FPAdd(float value1, float value2)
        {
-            return FPAddFpscrImpl(value1, value2, false);
+            return FPAddFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPAddFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPAddFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPAddFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPAddFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -848,8 +837,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
-        public static int FPCompare(float value1, float value2, byte signalNaNs)
+        public static int FPCompare(float value1, float value2, bool signalNaNs)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = context.Fpcr;
@@ -863,7 +851,7 @@ namespace ARMeilleure.Instructions
            {
                result = 0b0011;

-                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs == 1)
+                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs)
                {
                    SoftFloat.FPProcessException(FPException.InvalidOp, context, fpcr);
                }
@@ -887,13 +875,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPCompareEQ(float value1, float value2)
        {
-            return FPCompareEQFpscrImpl(value1, value2, false);
+            return FPCompareEQFpscr(value1, value2, false);
        }

-        private static float FPCompareEQFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPCompareEQFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -920,25 +907,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
-        public static float FPCompareEQFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPCompareEQFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        [UnmanagedCallersOnly]
        public static float FPCompareGE(float value1, float value2)
        {
-            return FPCompareGEFpscrImpl(value1, value2, false);
+            return FPCompareGEFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPCompareGEFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPCompareGEFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPCompareGEFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPCompareGEFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -962,19 +936,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPCompareGT(float value1, float value2)
        {
-            return FPCompareGTFpscrImpl(value1, value2, false);
+            return FPCompareGTFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPCompareGTFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPCompareGTFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPCompareGTFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPCompareGTFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -998,31 +965,26 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPCompareLE(float value1, float value2)
        {
-            return FPCompareGEFpscrImpl(value2, value1, false);
+            return FPCompareGE(value2, value1);
        }

-        [UnmanagedCallersOnly]
        public static float FPCompareLT(float value1, float value2)
        {
-            return FPCompareGTFpscrImpl(value2, value1, false);
+            return FPCompareGT(value2, value1);
        }

-        [UnmanagedCallersOnly]
-        public static float FPCompareLEFpscr(float value1, float value2, byte standardFpscr)
+        public static float FPCompareLEFpscr(float value1, float value2, bool standardFpscr)
        {
-            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
+            return FPCompareGEFpscr(value2, value1, standardFpscr);
        }

-        [UnmanagedCallersOnly]
-        public static float FPCompareLTFpscr(float value1, float value2, byte standardFpscr)
+        public static float FPCompareLTFpscr(float value1, float value2, bool standardFpscr)
        {
-            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
+            return FPCompareGTFpscr(value2, value1, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static float FPDiv(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1075,19 +1037,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPMax(float value1, float value2)
        {
-            return FPMaxFpscrImpl(value1, value2, false);
+            return FPMaxFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMaxFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPMaxFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-        
-        private static float FPMaxFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPMaxFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1148,13 +1103,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPMaxNum(float value1, float value2)
        {
-            return FPMaxNumFpscrImpl(value1, value2, false);
+            return FPMaxNumFpscr(value1, value2, false);
        }

-        private static float FPMaxNumFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPMaxNumFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1171,28 +1125,15 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(true);
            }

-            return FPMaxFpscrImpl(value1, value2, standardFpscr);
+            return FPMaxFpscr(value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMaxNumFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPMaxNumFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        [UnmanagedCallersOnly]
        public static float FPMin(float value1, float value2)
        {
-            return FPMinFpscrImpl(value1, value2, false);
+            return FPMinFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMinFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPMinFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPMinFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPMinFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1253,19 +1194,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPMinNum(float value1, float value2)
        {
-            return FPMinNumFpscrImpl(value1, value2, false);
+            return FPMinNumFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMinNumFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPMinNumFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPMinNumFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPMinNumFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1282,22 +1216,15 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(false);
            }

-            return FPMinFpscrImpl(value1, value2, standardFpscr);
+            return FPMinFpscr(value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static float FPMul(float value1, float value2)
        {
-            return FPMulFpscrImpl(value1, value2, false);
+            return FPMulFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMulFpscr(float value1, float value2, byte standardFpscr)
-        {
-            return FPMulFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPMulFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPMulFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1344,19 +1271,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPMulAdd(float valueA, float value1, float value2)
        {
-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAddFpscr(valueA, value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMulAddFpscr(float valueA, float value1, float value2, byte standardFpscr)
-        {
-            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
-        }
-
-        private static float FPMulAddFpscrImpl(float valueA, float value1, float value2, bool standardFpscr)
+        public static float FPMulAddFpscr(float valueA, float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1422,23 +1342,20 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPMulSub(float valueA, float value1, float value2)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
-        public static float FPMulSubFpscr(float valueA, float value1, float value2, byte standardFpscr)
+        public static float FPMulSubFpscr(float valueA, float value1, float value2, bool standardFpscr)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
+            return FPMulAddFpscr(valueA, value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static float FPMulX(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1484,36 +1401,27 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPNegMulAdd(float valueA, float value1, float value2)
        {
            valueA = valueA.FPNeg();
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
        public static float FPNegMulSub(float valueA, float value1, float value2)
        {
            valueA = valueA.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
        public static float FPRecipEstimate(float value)
        {
-            return FPRecipEstimateFpscrImpl(value, false);
+            return FPRecipEstimateFpscr(value, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPRecipEstimateFpscr(float value, byte standardFpscr)
-        {
-            return FPRecipEstimateFpscrImpl(value, standardFpscr == 1);
-        }
-
-        private static float FPRecipEstimateFpscrImpl(float value, bool standardFpscr)
+        public static float FPRecipEstimateFpscr(float value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1600,7 +1508,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRecipStep(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1626,16 +1533,15 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscrImpl(value1, value2, true);
+                    product = FPMulFpscr(value1, value2, true);
                }

-                result = FPSubFpscrImpl(FPTwo(false), product, true);
+                result = FPSubFpscr(FPTwo(false), product, true);
            }

            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRecipStepFused(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1679,7 +1585,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRecpX(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1705,19 +1610,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRSqrtEstimate(float value)
        {
-            return FPRSqrtEstimateFpscrImpl(value, false);
+            return FPRSqrtEstimateFpscr(value, false);
        }

-        [UnmanagedCallersOnly]
-        public static float FPRSqrtEstimateFpscr(float value, byte standardFpscr)
-        {
-            return FPRSqrtEstimateFpscrImpl(value, standardFpscr == 1);
-        }
-
-        private static float FPRSqrtEstimateFpscrImpl(float value, bool standardFpscr)
+        public static float FPRSqrtEstimateFpscr(float value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1831,7 +1729,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRSqrtStep(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1857,7 +1754,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscrImpl(value1, value2, true);
+                    product = FPMulFpscr(value1, value2, true);
                }

                result = FPHalvedSub(FPThree(false), product, context, fpcr);
@@ -1866,7 +1763,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPRSqrtStepFused(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1910,7 +1806,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPSqrt(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1953,13 +1848,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static float FPSub(float value1, float value2)
        {
-            return FPSubFpscrImpl(value1, value2, false);
+            return FPSubFpscr(value1, value2, false);
        }

-        private static float FPSubFpscrImpl(float value1, float value2, bool standardFpscr)
+        public static float FPSubFpscr(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2200,7 +2094,6 @@ namespace ARMeilleure.Instructions

    static class SoftFloat64_16
    {
-        [UnmanagedCallersOnly]
        public static ushort FPConvert(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2320,19 +2213,12 @@ namespace ARMeilleure.Instructions

    static class SoftFloat64
    {
-        [UnmanagedCallersOnly]
        public static double FPAdd(double value1, double value2)
        {
-            return FPAddFpscrImpl(value1, value2, false);
+            return FPAddFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPAddFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPAddFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPAddFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPAddFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2383,8 +2269,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
-        public static int FPCompare(double value1, double value2, byte signalNaNs)
+        public static int FPCompare(double value1, double value2, bool signalNaNs)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = context.Fpcr;
@@ -2398,7 +2283,7 @@ namespace ARMeilleure.Instructions
            {
                result = 0b0011;

-                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs == 1)
+                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs)
                {
                    SoftFloat.FPProcessException(FPException.InvalidOp, context, fpcr);
                }
@@ -2422,19 +2307,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPCompareEQ(double value1, double value2)
        {
-            return FPCompareEQFpscrImpl(value1, value2, false);
+            return FPCompareEQFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPCompareEQFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPCompareEQFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPCompareEQFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPCompareEQFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2461,19 +2339,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPCompareGE(double value1, double value2)
        {
-            return FPCompareGEFpscrImpl(value1, value2, false);
+            return FPCompareGEFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPCompareGEFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPCompareGEFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPCompareGEFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPCompareGEFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2497,19 +2368,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPCompareGT(double value1, double value2)
        {
-            return FPCompareGTFpscrImpl(value1, value2, false);
+            return FPCompareGTFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPCompareGTFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPCompareGTFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPCompareGTFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPCompareGTFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2533,31 +2397,26 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPCompareLE(double value1, double value2)
        {
-            return FPCompareGEFpscrImpl(value2, value1, false);
+            return FPCompareGE(value2, value1);
        }

-        [UnmanagedCallersOnly]
        public static double FPCompareLT(double value1, double value2)
        {
-            return FPCompareGTFpscrImpl(value2, value1, false);
+            return FPCompareGT(value2, value1);
        }

-        [UnmanagedCallersOnly]
-        public static double FPCompareLEFpscr(double value1, double value2, byte standardFpscr)
+        public static double FPCompareLEFpscr(double value1, double value2, bool standardFpscr)
        {
-            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
+            return FPCompareGEFpscr(value2, value1, standardFpscr);
        }

-        [UnmanagedCallersOnly]
-        public static double FPCompareLTFpscr(double value1, double value2, byte standardFpscr)
+        public static double FPCompareLTFpscr(double value1, double value2, bool standardFpscr)
        {
-            return FPCompareGTFpscrImpl(value2, value1, standardFpscr == 1);
+            return FPCompareGTFpscr(value2, value1, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static double FPDiv(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2610,19 +2469,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPMax(double value1, double value2)
        {
-            return FPMaxFpscrImpl(value1, value2, false);
+            return FPMaxFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMaxFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPMaxFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMaxFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPMaxFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2683,19 +2535,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPMaxNum(double value1, double value2)
        {
-            return FPMaxNumFpscrImpl(value1, value2, false);
+            return FPMaxNumFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMaxNumFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPMaxNumFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMaxNumFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPMaxNumFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2712,22 +2557,15 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(true);
            }

-            return FPMaxFpscrImpl(value1, value2, standardFpscr);
+            return FPMaxFpscr(value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static double FPMin(double value1, double value2)
        {
-            return FPMinFpscrImpl(value1, value2, false);
+            return FPMinFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMinFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPMinFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMinFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPMinFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2788,19 +2626,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPMinNum(double value1, double value2)
        {
-            return FPMinNumFpscrImpl(value1, value2, false);
+            return FPMinNumFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMinNumFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPMinNumFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMinNumFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPMinNumFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2817,22 +2648,15 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(false);
            }

-            return FPMinFpscrImpl(value1, value2, standardFpscr);
+            return FPMinFpscr(value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static double FPMul(double value1, double value2)
        {
-            return FPMulFpscrImpl(value1, value2, false);
+            return FPMulFpscr(value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMulFpscr(double value1, double value2, byte standardFpscr)
-        {
-            return FPMulFpscrImpl(value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMulFpscrImpl(double value1, double value2, bool standardFpscr)
+        public static double FPMulFpscr(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2879,19 +2703,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPMulAdd(double valueA, double value1, double value2)
        {
-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAddFpscr(valueA, value1, value2, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMulAddFpscr(double valueA, double value1, double value2, byte standardFpscr)
-        {
-            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
-        }
-
-        private static double FPMulAddFpscrImpl(double valueA, double value1, double value2, bool standardFpscr)
+        public static double FPMulAddFpscr(double valueA, double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2957,23 +2774,20 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPMulSub(double valueA, double value1, double value2)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
-        public static double FPMulSubFpscr(double valueA, double value1, double value2, byte standardFpscr)
+        public static double FPMulSubFpscr(double valueA, double value1, double value2, bool standardFpscr)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
+            return FPMulAddFpscr(valueA, value1, value2, standardFpscr);
        }

-        [UnmanagedCallersOnly]
        public static double FPMulX(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3019,36 +2833,27 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPNegMulAdd(double valueA, double value1, double value2)
        {
            valueA = valueA.FPNeg();
            value1 = value1.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
        public static double FPNegMulSub(double valueA, double value1, double value2)
        {
            valueA = valueA.FPNeg();

-            return FPMulAddFpscrImpl(valueA, value1, value2, false);
+            return FPMulAdd(valueA, value1, value2);
        }

-        [UnmanagedCallersOnly]
        public static double FPRecipEstimate(double value)
        {
-            return FPRecipEstimateFpscrImpl(value, false);
+            return FPRecipEstimateFpscr(value, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPRecipEstimateFpscr(double value, byte standardFpscr)
-        {
-            return FPRecipEstimateFpscrImpl(value, standardFpscr == 1);
-        }
-
-        private static double FPRecipEstimateFpscrImpl(double value, bool standardFpscr)
+        public static double FPRecipEstimateFpscr(double value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -3135,7 +2940,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRecipStep(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3161,7 +2965,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscrImpl(value1, value2, true);
+                    product = FPMulFpscr(value1, value2, true);
                }

                result = FPSubFpscr(FPTwo(false), product, true);
@@ -3170,7 +2974,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRecipStepFused(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3214,7 +3017,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRecpX(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3240,19 +3042,12 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRSqrtEstimate(double value)
        {
-            return FPRSqrtEstimateFpscrImpl(value, false);
+            return FPRSqrtEstimateFpscr(value, false);
        }

-        [UnmanagedCallersOnly]
-        public static double FPRSqrtEstimateFpscr(double value, byte standardFpscr)
-        {
-            return FPRSqrtEstimateFpscrImpl(value, standardFpscr == 1);
-        }
-
-        private static double FPRSqrtEstimateFpscrImpl(double value, bool standardFpscr)
+        public static double FPRSqrtEstimateFpscr(double value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -3366,7 +3161,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRSqrtStep(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3392,7 +3186,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscrImpl(value1, value2, true);
+                    product = FPMulFpscr(value1, value2, true);
                }

                result = FPHalvedSub(FPThree(false), product, context, fpcr);
@@ -3401,7 +3195,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPRSqrtStepFused(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3445,7 +3238,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPSqrt(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3488,7 +3280,6 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        [UnmanagedCallersOnly]
        public static double FPSub(double value1, double value2)
        {
            return FPSubFpscr(value1, value2, false);
--- a/src/ARMeilleure/Translation/DelegateInfo.cs
+++ b/src/ARMeilleure/Translation/DelegateInfo.cs
@@ -4,9 +4,15 @@ namespace ARMeilleure.Translation
 {
    class DelegateInfo
    {
-        public nint FuncPtr { get; private set; }
-        public DelegateInfo(nint funcPtr)
+#pragma warning disable IDE0052 // Remove unread private member
+        private readonly Delegate _dlg; // Ensure that this delegate will not be garbage collected.
+#pragma warning restore IDE0052
+
+        public nint FuncPtr { get; }
+
+        public DelegateInfo(Delegate dlg, nint funcPtr)
        {
+            _dlg = dlg;
            FuncPtr = funcPtr;
        }
    }
--- a/src/ARMeilleure/Translation/Delegates.cs
+++ b/src/ARMeilleure/Translation/Delegates.cs
@@ -1,7 +1,9 @@
 using ARMeilleure.Instructions;
+using ARMeilleure.State;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.InteropServices;

 namespace ARMeilleure.Translation
 {
@@ -32,7 +34,21 @@ namespace ARMeilleure.Translation

            return _delegates.Values[index].FuncPtr; // O(1).
        }
-        
+
+        public static nint GetDelegateFuncPtr(MethodInfo info)
+        {
+            ArgumentNullException.ThrowIfNull(info);
+
+            string key = GetKey(info);
+
+            if (!_delegates.TryGetValue(key, out DelegateInfo dlgInfo)) // O(log(n)).
+            {
+                throw new KeyNotFoundException($"({nameof(key)} = {key})");
+            }
+
+            return dlgInfo.FuncPtr;
+        }
+
        public static int GetDelegateIndex(MethodInfo info)
        {
            ArgumentNullException.ThrowIfNull(info);
@@ -48,12 +64,12 @@ namespace ARMeilleure.Translation

            return index;
        }
-        
-        private static void SetDelegateInfo(MethodInfo method)
-        {
-            string key = GetKey(method);

-            _delegates.Add(key, new DelegateInfo(method.MethodHandle.GetFunctionPointer())); // ArgumentException (key).
+        private static void SetDelegateInfo(Delegate dlg, nint funcPtr)
+        {
+            string key = GetKey(dlg.Method);
+
+            _delegates.Add(key, new DelegateInfo(dlg, funcPtr)); // ArgumentException (key).
        }

        private static string GetKey(MethodInfo info)
@@ -67,179 +83,528 @@ namespace ARMeilleure.Translation
        {
            _delegates = new SortedList<string, DelegateInfo>();

-            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Abs)));
-            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Ceiling)));
-            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Floor)));
-            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Round)));
-            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Truncate)));
+            var dlgMathAbs = new MathAbs(Math.Abs);
+            var dlgMathCeiling = new MathCeiling(Math.Ceiling);
+            var dlgMathFloor = new MathFloor(Math.Floor);
+            var dlgMathRound = new MathRound(Math.Round);
+            var dlgMathTruncate = new MathTruncate(Math.Truncate);

-            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Abs)));
-            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Ceiling)));
-            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Floor)));
-            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Round)));
-            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Truncate)));
+            var dlgMathFAbs = new MathFAbs(MathF.Abs);
+            var dlgMathFCeiling = new MathFCeiling(MathF.Ceiling);
+            var dlgMathFFloor = new MathFFloor(MathF.Floor);
+            var dlgMathFRound = new MathFRound(MathF.Round);
+            var dlgMathFTruncate = new MathFTruncate(MathF.Truncate);

-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Break)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.CheckSynchronization)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.EnqueueForRejit)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntfrqEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntvctEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCtrEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetDczidEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.InvalidateCacheLine)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadByte)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt16)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt32)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadVector128)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SignalMemoryTracking)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SupervisorCall)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Undefined)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteByte)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt16)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt32)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt64)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteVector128)));
+            var dlgNativeInterfaceBreak = new NativeInterfaceBreak(NativeInterface.Break);
+            var dlgNativeInterfaceCheckSynchronization = new NativeInterfaceCheckSynchronization(NativeInterface.CheckSynchronization);
+            var dlgNativeInterfaceEnqueueForRejit = new NativeInterfaceEnqueueForRejit(NativeInterface.EnqueueForRejit);
+            var dlgNativeInterfaceGetCntfrqEl0 = new NativeInterfaceGetCntfrqEl0(NativeInterface.GetCntfrqEl0);
+            var dlgNativeInterfaceGetCntpctEl0 = new NativeInterfaceGetCntpctEl0(NativeInterface.GetCntpctEl0);
+            var dlgNativeInterfaceGetCntvctEl0 = new NativeInterfaceGetCntvctEl0(NativeInterface.GetCntvctEl0);
+            var dlgNativeInterfaceGetCtrEl0 = new NativeInterfaceGetCtrEl0(NativeInterface.GetCtrEl0);
+            var dlgNativeInterfaceGetDczidEl0 = new NativeInterfaceGetDczidEl0(NativeInterface.GetDczidEl0);
+            var dlgNativeInterfaceGetFunctionAddress = new NativeInterfaceGetFunctionAddress(NativeInterface.GetFunctionAddress);
+            var dlgNativeInterfaceInvalidateCacheLine = new NativeInterfaceInvalidateCacheLine(NativeInterface.InvalidateCacheLine);
+            var dlgNativeInterfaceReadByte = new NativeInterfaceReadByte(NativeInterface.ReadByte);
+            var dlgNativeInterfaceReadUInt16 = new NativeInterfaceReadUInt16(NativeInterface.ReadUInt16);
+            var dlgNativeInterfaceReadUInt32 = new NativeInterfaceReadUInt32(NativeInterface.ReadUInt32);
+            var dlgNativeInterfaceReadUInt64 = new NativeInterfaceReadUInt64(NativeInterface.ReadUInt64);
+            var dlgNativeInterfaceReadVector128 = new NativeInterfaceReadVector128(NativeInterface.ReadVector128);
+            var dlgNativeInterfaceSignalMemoryTracking = new NativeInterfaceSignalMemoryTracking(NativeInterface.SignalMemoryTracking);
+            var dlgNativeInterfaceSupervisorCall = new NativeInterfaceSupervisorCall(NativeInterface.SupervisorCall);
+            var dlgNativeInterfaceThrowInvalidMemoryAccess = new NativeInterfaceThrowInvalidMemoryAccess(NativeInterface.ThrowInvalidMemoryAccess);
+            var dlgNativeInterfaceUndefined = new NativeInterfaceUndefined(NativeInterface.Undefined);
+            var dlgNativeInterfaceWriteByte = new NativeInterfaceWriteByte(NativeInterface.WriteByte);
+            var dlgNativeInterfaceWriteUInt16 = new NativeInterfaceWriteUInt16(NativeInterface.WriteUInt16);
+            var dlgNativeInterfaceWriteUInt32 = new NativeInterfaceWriteUInt32(NativeInterface.WriteUInt32);
+            var dlgNativeInterfaceWriteUInt64 = new NativeInterfaceWriteUInt64(NativeInterface.WriteUInt64);
+            var dlgNativeInterfaceWriteVector128 = new NativeInterfaceWriteVector128(NativeInterface.WriteVector128);

-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingSigns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingZeros)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32b)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cb)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32ch)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cw)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cx)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32h)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32w)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32x)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Decrypt)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Encrypt)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.FixedRotate)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashChoose)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashLower)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashMajority)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashParity)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashUpper)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.InverseMixColumns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.MixColumns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.PolynomialMult64_128)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SignedShrImm64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl3)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl4)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx3)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx4)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.UnsignedShrImm64)));
+            var dlgSoftFallbackCountLeadingSigns = new SoftFallbackCountLeadingSigns(SoftFallback.CountLeadingSigns);
+            var dlgSoftFallbackCountLeadingZeros = new SoftFallbackCountLeadingZeros(SoftFallback.CountLeadingZeros);
+            var dlgSoftFallbackCrc32b = new SoftFallbackCrc32b(SoftFallback.Crc32b);
+            var dlgSoftFallbackCrc32cb = new SoftFallbackCrc32cb(SoftFallback.Crc32cb);
+            var dlgSoftFallbackCrc32ch = new SoftFallbackCrc32ch(SoftFallback.Crc32ch);
+            var dlgSoftFallbackCrc32cw = new SoftFallbackCrc32cw(SoftFallback.Crc32cw);
+            var dlgSoftFallbackCrc32cx = new SoftFallbackCrc32cx(SoftFallback.Crc32cx);
+            var dlgSoftFallbackCrc32h = new SoftFallbackCrc32h(SoftFallback.Crc32h);
+            var dlgSoftFallbackCrc32w = new SoftFallbackCrc32w(SoftFallback.Crc32w);
+            var dlgSoftFallbackCrc32x = new SoftFallbackCrc32x(SoftFallback.Crc32x);
+            var dlgSoftFallbackDecrypt = new SoftFallbackDecrypt(SoftFallback.Decrypt);
+            var dlgSoftFallbackEncrypt = new SoftFallbackEncrypt(SoftFallback.Encrypt);
+            var dlgSoftFallbackFixedRotate = new SoftFallbackFixedRotate(SoftFallback.FixedRotate);
+            var dlgSoftFallbackHashChoose = new SoftFallbackHashChoose(SoftFallback.HashChoose);
+            var dlgSoftFallbackHashLower = new SoftFallbackHashLower(SoftFallback.HashLower);
+            var dlgSoftFallbackHashMajority = new SoftFallbackHashMajority(SoftFallback.HashMajority);
+            var dlgSoftFallbackHashParity = new SoftFallbackHashParity(SoftFallback.HashParity);
+            var dlgSoftFallbackHashUpper = new SoftFallbackHashUpper(SoftFallback.HashUpper);
+            var dlgSoftFallbackInverseMixColumns = new SoftFallbackInverseMixColumns(SoftFallback.InverseMixColumns);
+            var dlgSoftFallbackMixColumns = new SoftFallbackMixColumns(SoftFallback.MixColumns);
+            var dlgSoftFallbackPolynomialMult64_128 = new SoftFallbackPolynomialMult64_128(SoftFallback.PolynomialMult64_128);
+            var dlgSoftFallbackSatF32ToS32 = new SoftFallbackSatF32ToS32(SoftFallback.SatF32ToS32);
+            var dlgSoftFallbackSatF32ToS64 = new SoftFallbackSatF32ToS64(SoftFallback.SatF32ToS64);
+            var dlgSoftFallbackSatF32ToU32 = new SoftFallbackSatF32ToU32(SoftFallback.SatF32ToU32);
+            var dlgSoftFallbackSatF32ToU64 = new SoftFallbackSatF32ToU64(SoftFallback.SatF32ToU64);
+            var dlgSoftFallbackSatF64ToS32 = new SoftFallbackSatF64ToS32(SoftFallback.SatF64ToS32);
+            var dlgSoftFallbackSatF64ToS64 = new SoftFallbackSatF64ToS64(SoftFallback.SatF64ToS64);
+            var dlgSoftFallbackSatF64ToU32 = new SoftFallbackSatF64ToU32(SoftFallback.SatF64ToU32);
+            var dlgSoftFallbackSatF64ToU64 = new SoftFallbackSatF64ToU64(SoftFallback.SatF64ToU64);
+            var dlgSoftFallbackSha1SchedulePart1 = new SoftFallbackSha1SchedulePart1(SoftFallback.Sha1SchedulePart1);
+            var dlgSoftFallbackSha1SchedulePart2 = new SoftFallbackSha1SchedulePart2(SoftFallback.Sha1SchedulePart2);
+            var dlgSoftFallbackSha256SchedulePart1 = new SoftFallbackSha256SchedulePart1(SoftFallback.Sha256SchedulePart1);
+            var dlgSoftFallbackSha256SchedulePart2 = new SoftFallbackSha256SchedulePart2(SoftFallback.Sha256SchedulePart2);
+            var dlgSoftFallbackSignedShrImm64 = new SoftFallbackSignedShrImm64(SoftFallback.SignedShrImm64);
+            var dlgSoftFallbackTbl1 = new SoftFallbackTbl1(SoftFallback.Tbl1);
+            var dlgSoftFallbackTbl2 = new SoftFallbackTbl2(SoftFallback.Tbl2);
+            var dlgSoftFallbackTbl3 = new SoftFallbackTbl3(SoftFallback.Tbl3);
+            var dlgSoftFallbackTbl4 = new SoftFallbackTbl4(SoftFallback.Tbl4);
+            var dlgSoftFallbackTbx1 = new SoftFallbackTbx1(SoftFallback.Tbx1);
+            var dlgSoftFallbackTbx2 = new SoftFallbackTbx2(SoftFallback.Tbx2);
+            var dlgSoftFallbackTbx3 = new SoftFallbackTbx3(SoftFallback.Tbx3);
+            var dlgSoftFallbackTbx4 = new SoftFallbackTbx4(SoftFallback.Tbx4);
+            var dlgSoftFallbackUnsignedShrImm64 = new SoftFallbackUnsignedShrImm64(SoftFallback.UnsignedShrImm64);

-            SetDelegateInfo(typeof(SoftFloat16_32).GetMethod(nameof(SoftFloat16_32.FPConvert)));
-            SetDelegateInfo(typeof(SoftFloat16_64).GetMethod(nameof(SoftFloat16_64.FPConvert)));
+            var dlgSoftFloat16_32FPConvert = new SoftFloat16_32FPConvert(SoftFloat16_32.FPConvert);
+            var dlgSoftFloat16_64FPConvert = new SoftFloat16_64FPConvert(SoftFloat16_64.FPConvert);

-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompare)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQ)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGE)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGT)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLE)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLT)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPDiv)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMax)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNum)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMin)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNum)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMul)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSub)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSubFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulX)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulSub)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimate)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStepFused)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecpX)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimate)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStepFused)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSqrt)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSub)));
+            var dlgSoftFloat32FPAdd = new SoftFloat32FPAdd(SoftFloat32.FPAdd);
+            var dlgSoftFloat32FPAddFpscr = new SoftFloat32FPAddFpscr(SoftFloat32.FPAddFpscr); // A32 only.
+            var dlgSoftFloat32FPCompare = new SoftFloat32FPCompare(SoftFloat32.FPCompare);
+            var dlgSoftFloat32FPCompareEQ = new SoftFloat32FPCompareEQ(SoftFloat32.FPCompareEQ);
+            var dlgSoftFloat32FPCompareEQFpscr = new SoftFloat32FPCompareEQFpscr(SoftFloat32.FPCompareEQFpscr); // A32 only.
+            var dlgSoftFloat32FPCompareGE = new SoftFloat32FPCompareGE(SoftFloat32.FPCompareGE);
+            var dlgSoftFloat32FPCompareGEFpscr = new SoftFloat32FPCompareGEFpscr(SoftFloat32.FPCompareGEFpscr); // A32 only.
+            var dlgSoftFloat32FPCompareGT = new SoftFloat32FPCompareGT(SoftFloat32.FPCompareGT);
+            var dlgSoftFloat32FPCompareGTFpscr = new SoftFloat32FPCompareGTFpscr(SoftFloat32.FPCompareGTFpscr); // A32 only.
+            var dlgSoftFloat32FPCompareLE = new SoftFloat32FPCompareLE(SoftFloat32.FPCompareLE);
+            var dlgSoftFloat32FPCompareLEFpscr = new SoftFloat32FPCompareLEFpscr(SoftFloat32.FPCompareLEFpscr); // A32 only.
+            var dlgSoftFloat32FPCompareLT = new SoftFloat32FPCompareLT(SoftFloat32.FPCompareLT);
+            var dlgSoftFloat32FPCompareLTFpscr = new SoftFloat32FPCompareLTFpscr(SoftFloat32.FPCompareLTFpscr); // A32 only.
+            var dlgSoftFloat32FPDiv = new SoftFloat32FPDiv(SoftFloat32.FPDiv);
+            var dlgSoftFloat32FPMax = new SoftFloat32FPMax(SoftFloat32.FPMax);
+            var dlgSoftFloat32FPMaxFpscr = new SoftFloat32FPMaxFpscr(SoftFloat32.FPMaxFpscr); // A32 only.
+            var dlgSoftFloat32FPMaxNum = new SoftFloat32FPMaxNum(SoftFloat32.FPMaxNum);
+            var dlgSoftFloat32FPMaxNumFpscr = new SoftFloat32FPMaxNumFpscr(SoftFloat32.FPMaxNumFpscr); // A32 only.
+            var dlgSoftFloat32FPMin = new SoftFloat32FPMin(SoftFloat32.FPMin);
+            var dlgSoftFloat32FPMinFpscr = new SoftFloat32FPMinFpscr(SoftFloat32.FPMinFpscr); // A32 only.
+            var dlgSoftFloat32FPMinNum = new SoftFloat32FPMinNum(SoftFloat32.FPMinNum);
+            var dlgSoftFloat32FPMinNumFpscr = new SoftFloat32FPMinNumFpscr(SoftFloat32.FPMinNumFpscr); // A32 only.
+            var dlgSoftFloat32FPMul = new SoftFloat32FPMul(SoftFloat32.FPMul);
+            var dlgSoftFloat32FPMulFpscr = new SoftFloat32FPMulFpscr(SoftFloat32.FPMulFpscr); // A32 only.
+            var dlgSoftFloat32FPMulAdd = new SoftFloat32FPMulAdd(SoftFloat32.FPMulAdd);
+            var dlgSoftFloat32FPMulAddFpscr = new SoftFloat32FPMulAddFpscr(SoftFloat32.FPMulAddFpscr); // A32 only.
+            var dlgSoftFloat32FPMulSub = new SoftFloat32FPMulSub(SoftFloat32.FPMulSub);
+            var dlgSoftFloat32FPMulSubFpscr = new SoftFloat32FPMulSubFpscr(SoftFloat32.FPMulSubFpscr); // A32 only.
+            var dlgSoftFloat32FPMulX = new SoftFloat32FPMulX(SoftFloat32.FPMulX);
+            var dlgSoftFloat32FPNegMulAdd = new SoftFloat32FPNegMulAdd(SoftFloat32.FPNegMulAdd);
+            var dlgSoftFloat32FPNegMulSub = new SoftFloat32FPNegMulSub(SoftFloat32.FPNegMulSub);
+            var dlgSoftFloat32FPRecipEstimate = new SoftFloat32FPRecipEstimate(SoftFloat32.FPRecipEstimate);
+            var dlgSoftFloat32FPRecipEstimateFpscr = new SoftFloat32FPRecipEstimateFpscr(SoftFloat32.FPRecipEstimateFpscr); // A32 only.
+            var dlgSoftFloat32FPRecipStep = new SoftFloat32FPRecipStep(SoftFloat32.FPRecipStep); // A32 only.
+            var dlgSoftFloat32FPRecipStepFused = new SoftFloat32FPRecipStepFused(SoftFloat32.FPRecipStepFused);
+            var dlgSoftFloat32FPRecpX = new SoftFloat32FPRecpX(SoftFloat32.FPRecpX);
+            var dlgSoftFloat32FPRSqrtEstimate = new SoftFloat32FPRSqrtEstimate(SoftFloat32.FPRSqrtEstimate);
+            var dlgSoftFloat32FPRSqrtEstimateFpscr = new SoftFloat32FPRSqrtEstimateFpscr(SoftFloat32.FPRSqrtEstimateFpscr); // A32 only.
+            var dlgSoftFloat32FPRSqrtStep = new SoftFloat32FPRSqrtStep(SoftFloat32.FPRSqrtStep); // A32 only.
+            var dlgSoftFloat32FPRSqrtStepFused = new SoftFloat32FPRSqrtStepFused(SoftFloat32.FPRSqrtStepFused);
+            var dlgSoftFloat32FPSqrt = new SoftFloat32FPSqrt(SoftFloat32.FPSqrt);
+            var dlgSoftFloat32FPSub = new SoftFloat32FPSub(SoftFloat32.FPSub);

-            SetDelegateInfo(typeof(SoftFloat32_16).GetMethod(nameof(SoftFloat32_16.FPConvert)));
+            var dlgSoftFloat32_16FPConvert = new SoftFloat32_16FPConvert(SoftFloat32_16.FPConvert);

-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompare)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQ)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGE)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGT)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLE)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLT)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPDiv)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMax)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNum)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMin)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNum)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMul)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSub)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSubFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulX)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulSub)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimate)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStepFused)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecpX)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimate)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStepFused)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSqrt)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSub)));
+            var dlgSoftFloat64FPAdd = new SoftFloat64FPAdd(SoftFloat64.FPAdd);
+            var dlgSoftFloat64FPAddFpscr = new SoftFloat64FPAddFpscr(SoftFloat64.FPAddFpscr); // A32 only.
+            var dlgSoftFloat64FPCompare = new SoftFloat64FPCompare(SoftFloat64.FPCompare);
+            var dlgSoftFloat64FPCompareEQ = new SoftFloat64FPCompareEQ(SoftFloat64.FPCompareEQ);
+            var dlgSoftFloat64FPCompareEQFpscr = new SoftFloat64FPCompareEQFpscr(SoftFloat64.FPCompareEQFpscr); // A32 only.
+            var dlgSoftFloat64FPCompareGE = new SoftFloat64FPCompareGE(SoftFloat64.FPCompareGE);
+            var dlgSoftFloat64FPCompareGEFpscr = new SoftFloat64FPCompareGEFpscr(SoftFloat64.FPCompareGEFpscr); // A32 only.
+            var dlgSoftFloat64FPCompareGT = new SoftFloat64FPCompareGT(SoftFloat64.FPCompareGT);
+            var dlgSoftFloat64FPCompareGTFpscr = new SoftFloat64FPCompareGTFpscr(SoftFloat64.FPCompareGTFpscr); // A32 only.
+            var dlgSoftFloat64FPCompareLE = new SoftFloat64FPCompareLE(SoftFloat64.FPCompareLE);
+            var dlgSoftFloat64FPCompareLEFpscr = new SoftFloat64FPCompareLEFpscr(SoftFloat64.FPCompareLEFpscr); // A32 only.
+            var dlgSoftFloat64FPCompareLT = new SoftFloat64FPCompareLT(SoftFloat64.FPCompareLT);
+            var dlgSoftFloat64FPCompareLTFpscr = new SoftFloat64FPCompareLTFpscr(SoftFloat64.FPCompareLTFpscr); // A32 only.
+            var dlgSoftFloat64FPDiv = new SoftFloat64FPDiv(SoftFloat64.FPDiv);
+            var dlgSoftFloat64FPMax = new SoftFloat64FPMax(SoftFloat64.FPMax);
+            var dlgSoftFloat64FPMaxFpscr = new SoftFloat64FPMaxFpscr(SoftFloat64.FPMaxFpscr); // A32 only.
+            var dlgSoftFloat64FPMaxNum = new SoftFloat64FPMaxNum(SoftFloat64.FPMaxNum);
+            var dlgSoftFloat64FPMaxNumFpscr = new SoftFloat64FPMaxNumFpscr(SoftFloat64.FPMaxNumFpscr); // A32 only.
+            var dlgSoftFloat64FPMin = new SoftFloat64FPMin(SoftFloat64.FPMin);
+            var dlgSoftFloat64FPMinFpscr = new SoftFloat64FPMinFpscr(SoftFloat64.FPMinFpscr); // A32 only.
+            var dlgSoftFloat64FPMinNum = new SoftFloat64FPMinNum(SoftFloat64.FPMinNum);
+            var dlgSoftFloat64FPMinNumFpscr = new SoftFloat64FPMinNumFpscr(SoftFloat64.FPMinNumFpscr); // A32 only.
+            var dlgSoftFloat64FPMul = new SoftFloat64FPMul(SoftFloat64.FPMul);
+            var dlgSoftFloat64FPMulFpscr = new SoftFloat64FPMulFpscr(SoftFloat64.FPMulFpscr); // A32 only.
+            var dlgSoftFloat64FPMulAdd = new SoftFloat64FPMulAdd(SoftFloat64.FPMulAdd);
+            var dlgSoftFloat64FPMulAddFpscr = new SoftFloat64FPMulAddFpscr(SoftFloat64.FPMulAddFpscr); // A32 only.
+            var dlgSoftFloat64FPMulSub = new SoftFloat64FPMulSub(SoftFloat64.FPMulSub);
+            var dlgSoftFloat64FPMulSubFpscr = new SoftFloat64FPMulSubFpscr(SoftFloat64.FPMulSubFpscr); // A32 only.
+            var dlgSoftFloat64FPMulX = new SoftFloat64FPMulX(SoftFloat64.FPMulX);
+            var dlgSoftFloat64FPNegMulAdd = new SoftFloat64FPNegMulAdd(SoftFloat64.FPNegMulAdd);
+            var dlgSoftFloat64FPNegMulSub = new SoftFloat64FPNegMulSub(SoftFloat64.FPNegMulSub);
+            var dlgSoftFloat64FPRecipEstimate = new SoftFloat64FPRecipEstimate(SoftFloat64.FPRecipEstimate);
+            var dlgSoftFloat64FPRecipEstimateFpscr = new SoftFloat64FPRecipEstimateFpscr(SoftFloat64.FPRecipEstimateFpscr); // A32 only.
+            var dlgSoftFloat64FPRecipStep = new SoftFloat64FPRecipStep(SoftFloat64.FPRecipStep); // A32 only.
+            var dlgSoftFloat64FPRecipStepFused = new SoftFloat64FPRecipStepFused(SoftFloat64.FPRecipStepFused);
+            var dlgSoftFloat64FPRecpX = new SoftFloat64FPRecpX(SoftFloat64.FPRecpX);
+            var dlgSoftFloat64FPRSqrtEstimate = new SoftFloat64FPRSqrtEstimate(SoftFloat64.FPRSqrtEstimate);
+            var dlgSoftFloat64FPRSqrtEstimateFpscr = new SoftFloat64FPRSqrtEstimateFpscr(SoftFloat64.FPRSqrtEstimateFpscr); // A32 only.
+            var dlgSoftFloat64FPRSqrtStep = new SoftFloat64FPRSqrtStep(SoftFloat64.FPRSqrtStep); // A32 only.
+            var dlgSoftFloat64FPRSqrtStepFused = new SoftFloat64FPRSqrtStepFused(SoftFloat64.FPRSqrtStepFused);
+            var dlgSoftFloat64FPSqrt = new SoftFloat64FPSqrt(SoftFloat64.FPSqrt);
+            var dlgSoftFloat64FPSub = new SoftFloat64FPSub(SoftFloat64.FPSub);

-            SetDelegateInfo(typeof(SoftFloat64_16).GetMethod(nameof(SoftFloat64_16.FPConvert)));
+            var dlgSoftFloat64_16FPConvert = new SoftFloat64_16FPConvert(SoftFloat64_16.FPConvert);
+
+            SetDelegateInfo(dlgMathAbs, Marshal.GetFunctionPointerForDelegate<MathAbs>(dlgMathAbs));
+            SetDelegateInfo(dlgMathCeiling, Marshal.GetFunctionPointerForDelegate<MathCeiling>(dlgMathCeiling));
+            SetDelegateInfo(dlgMathFloor, Marshal.GetFunctionPointerForDelegate<MathFloor>(dlgMathFloor));
+            SetDelegateInfo(dlgMathRound, Marshal.GetFunctionPointerForDelegate<MathRound>(dlgMathRound));
+            SetDelegateInfo(dlgMathTruncate, Marshal.GetFunctionPointerForDelegate<MathTruncate>(dlgMathTruncate));
+
+            SetDelegateInfo(dlgMathFAbs, Marshal.GetFunctionPointerForDelegate<MathFAbs>(dlgMathFAbs));
+            SetDelegateInfo(dlgMathFCeiling, Marshal.GetFunctionPointerForDelegate<MathFCeiling>(dlgMathFCeiling));
+            SetDelegateInfo(dlgMathFFloor, Marshal.GetFunctionPointerForDelegate<MathFFloor>(dlgMathFFloor));
+            SetDelegateInfo(dlgMathFRound, Marshal.GetFunctionPointerForDelegate<MathFRound>(dlgMathFRound));
+            SetDelegateInfo(dlgMathFTruncate, Marshal.GetFunctionPointerForDelegate<MathFTruncate>(dlgMathFTruncate));
+
+            SetDelegateInfo(dlgNativeInterfaceBreak, Marshal.GetFunctionPointerForDelegate<NativeInterfaceBreak>(dlgNativeInterfaceBreak));
+            SetDelegateInfo(dlgNativeInterfaceCheckSynchronization, Marshal.GetFunctionPointerForDelegate<NativeInterfaceCheckSynchronization>(dlgNativeInterfaceCheckSynchronization));
+            SetDelegateInfo(dlgNativeInterfaceEnqueueForRejit, Marshal.GetFunctionPointerForDelegate<NativeInterfaceEnqueueForRejit>(dlgNativeInterfaceEnqueueForRejit));
+            SetDelegateInfo(dlgNativeInterfaceGetCntfrqEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntfrqEl0>(dlgNativeInterfaceGetCntfrqEl0));
+            SetDelegateInfo(dlgNativeInterfaceGetCntpctEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntpctEl0>(dlgNativeInterfaceGetCntpctEl0));
+            SetDelegateInfo(dlgNativeInterfaceGetCntvctEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntvctEl0>(dlgNativeInterfaceGetCntvctEl0));
+            SetDelegateInfo(dlgNativeInterfaceGetCtrEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCtrEl0>(dlgNativeInterfaceGetCtrEl0));
+            SetDelegateInfo(dlgNativeInterfaceGetDczidEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetDczidEl0>(dlgNativeInterfaceGetDczidEl0));
+            SetDelegateInfo(dlgNativeInterfaceGetFunctionAddress, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetFunctionAddress>(dlgNativeInterfaceGetFunctionAddress));
+            SetDelegateInfo(dlgNativeInterfaceInvalidateCacheLine, Marshal.GetFunctionPointerForDelegate<NativeInterfaceInvalidateCacheLine>(dlgNativeInterfaceInvalidateCacheLine));
+            SetDelegateInfo(dlgNativeInterfaceReadByte, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadByte>(dlgNativeInterfaceReadByte));
+            SetDelegateInfo(dlgNativeInterfaceReadUInt16, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt16>(dlgNativeInterfaceReadUInt16));
+            SetDelegateInfo(dlgNativeInterfaceReadUInt32, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt32>(dlgNativeInterfaceReadUInt32));
+            SetDelegateInfo(dlgNativeInterfaceReadUInt64, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt64>(dlgNativeInterfaceReadUInt64));
+            SetDelegateInfo(dlgNativeInterfaceReadVector128, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadVector128>(dlgNativeInterfaceReadVector128));
+            SetDelegateInfo(dlgNativeInterfaceSignalMemoryTracking, Marshal.GetFunctionPointerForDelegate<NativeInterfaceSignalMemoryTracking>(dlgNativeInterfaceSignalMemoryTracking));
+            SetDelegateInfo(dlgNativeInterfaceSupervisorCall, Marshal.GetFunctionPointerForDelegate<NativeInterfaceSupervisorCall>(dlgNativeInterfaceSupervisorCall));
+            SetDelegateInfo(dlgNativeInterfaceThrowInvalidMemoryAccess, Marshal.GetFunctionPointerForDelegate<NativeInterfaceThrowInvalidMemoryAccess>(dlgNativeInterfaceThrowInvalidMemoryAccess));
+            SetDelegateInfo(dlgNativeInterfaceUndefined, Marshal.GetFunctionPointerForDelegate<NativeInterfaceUndefined>(dlgNativeInterfaceUndefined));
+            SetDelegateInfo(dlgNativeInterfaceWriteByte, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteByte>(dlgNativeInterfaceWriteByte));
+            SetDelegateInfo(dlgNativeInterfaceWriteUInt16, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt16>(dlgNativeInterfaceWriteUInt16));
+            SetDelegateInfo(dlgNativeInterfaceWriteUInt32, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt32>(dlgNativeInterfaceWriteUInt32));
+            SetDelegateInfo(dlgNativeInterfaceWriteUInt64, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt64>(dlgNativeInterfaceWriteUInt64));
+            SetDelegateInfo(dlgNativeInterfaceWriteVector128, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteVector128>(dlgNativeInterfaceWriteVector128));
+
+            SetDelegateInfo(dlgSoftFallbackCountLeadingSigns, Marshal.GetFunctionPointerForDelegate<SoftFallbackCountLeadingSigns>(dlgSoftFallbackCountLeadingSigns));
+            SetDelegateInfo(dlgSoftFallbackCountLeadingZeros, Marshal.GetFunctionPointerForDelegate<SoftFallbackCountLeadingZeros>(dlgSoftFallbackCountLeadingZeros));
+            SetDelegateInfo(dlgSoftFallbackCrc32b, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32b>(dlgSoftFallbackCrc32b));
+            SetDelegateInfo(dlgSoftFallbackCrc32cb, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cb>(dlgSoftFallbackCrc32cb));
+            SetDelegateInfo(dlgSoftFallbackCrc32ch, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32ch>(dlgSoftFallbackCrc32ch));
+            SetDelegateInfo(dlgSoftFallbackCrc32cw, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cw>(dlgSoftFallbackCrc32cw));
+            SetDelegateInfo(dlgSoftFallbackCrc32cx, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cx>(dlgSoftFallbackCrc32cx));
+            SetDelegateInfo(dlgSoftFallbackCrc32h, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32h>(dlgSoftFallbackCrc32h));
+            SetDelegateInfo(dlgSoftFallbackCrc32w, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32w>(dlgSoftFallbackCrc32w));
+            SetDelegateInfo(dlgSoftFallbackCrc32x, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32x>(dlgSoftFallbackCrc32x));
+            SetDelegateInfo(dlgSoftFallbackDecrypt, Marshal.GetFunctionPointerForDelegate<SoftFallbackDecrypt>(dlgSoftFallbackDecrypt));
+            SetDelegateInfo(dlgSoftFallbackEncrypt, Marshal.GetFunctionPointerForDelegate<SoftFallbackEncrypt>(dlgSoftFallbackEncrypt));
+            SetDelegateInfo(dlgSoftFallbackFixedRotate, Marshal.GetFunctionPointerForDelegate<SoftFallbackFixedRotate>(dlgSoftFallbackFixedRotate));
+            SetDelegateInfo(dlgSoftFallbackHashChoose, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashChoose>(dlgSoftFallbackHashChoose));
+            SetDelegateInfo(dlgSoftFallbackHashLower, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashLower>(dlgSoftFallbackHashLower));
+            SetDelegateInfo(dlgSoftFallbackHashMajority, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashMajority>(dlgSoftFallbackHashMajority));
+            SetDelegateInfo(dlgSoftFallbackHashParity, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashParity>(dlgSoftFallbackHashParity));
+            SetDelegateInfo(dlgSoftFallbackHashUpper, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashUpper>(dlgSoftFallbackHashUpper));
+            SetDelegateInfo(dlgSoftFallbackInverseMixColumns, Marshal.GetFunctionPointerForDelegate<SoftFallbackInverseMixColumns>(dlgSoftFallbackInverseMixColumns));
+            SetDelegateInfo(dlgSoftFallbackMixColumns, Marshal.GetFunctionPointerForDelegate<SoftFallbackMixColumns>(dlgSoftFallbackMixColumns));
+            SetDelegateInfo(dlgSoftFallbackPolynomialMult64_128, Marshal.GetFunctionPointerForDelegate<SoftFallbackPolynomialMult64_128>(dlgSoftFallbackPolynomialMult64_128));
+            SetDelegateInfo(dlgSoftFallbackSatF32ToS32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToS32>(dlgSoftFallbackSatF32ToS32));
+            SetDelegateInfo(dlgSoftFallbackSatF32ToS64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToS64>(dlgSoftFallbackSatF32ToS64));
+            SetDelegateInfo(dlgSoftFallbackSatF32ToU32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToU32>(dlgSoftFallbackSatF32ToU32));
+            SetDelegateInfo(dlgSoftFallbackSatF32ToU64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToU64>(dlgSoftFallbackSatF32ToU64));
+            SetDelegateInfo(dlgSoftFallbackSatF64ToS32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToS32>(dlgSoftFallbackSatF64ToS32));
+            SetDelegateInfo(dlgSoftFallbackSatF64ToS64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToS64>(dlgSoftFallbackSatF64ToS64));
+            SetDelegateInfo(dlgSoftFallbackSatF64ToU32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToU32>(dlgSoftFallbackSatF64ToU32));
+            SetDelegateInfo(dlgSoftFallbackSatF64ToU64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToU64>(dlgSoftFallbackSatF64ToU64));
+            SetDelegateInfo(dlgSoftFallbackSha1SchedulePart1, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha1SchedulePart1>(dlgSoftFallbackSha1SchedulePart1));
+            SetDelegateInfo(dlgSoftFallbackSha1SchedulePart2, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha1SchedulePart2>(dlgSoftFallbackSha1SchedulePart2));
+            SetDelegateInfo(dlgSoftFallbackSha256SchedulePart1, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha256SchedulePart1>(dlgSoftFallbackSha256SchedulePart1));
+            SetDelegateInfo(dlgSoftFallbackSha256SchedulePart2, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha256SchedulePart2>(dlgSoftFallbackSha256SchedulePart2));
+            SetDelegateInfo(dlgSoftFallbackSignedShrImm64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSignedShrImm64>(dlgSoftFallbackSignedShrImm64));
+            SetDelegateInfo(dlgSoftFallbackTbl1, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl1>(dlgSoftFallbackTbl1));
+            SetDelegateInfo(dlgSoftFallbackTbl2, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl2>(dlgSoftFallbackTbl2));
+            SetDelegateInfo(dlgSoftFallbackTbl3, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl3>(dlgSoftFallbackTbl3));
+            SetDelegateInfo(dlgSoftFallbackTbl4, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl4>(dlgSoftFallbackTbl4));
+            SetDelegateInfo(dlgSoftFallbackTbx1, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx1>(dlgSoftFallbackTbx1));
+            SetDelegateInfo(dlgSoftFallbackTbx2, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx2>(dlgSoftFallbackTbx2));
+            SetDelegateInfo(dlgSoftFallbackTbx3, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx3>(dlgSoftFallbackTbx3));
+            SetDelegateInfo(dlgSoftFallbackTbx4, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx4>(dlgSoftFallbackTbx4));
+            SetDelegateInfo(dlgSoftFallbackUnsignedShrImm64, Marshal.GetFunctionPointerForDelegate<SoftFallbackUnsignedShrImm64>(dlgSoftFallbackUnsignedShrImm64));
+
+            SetDelegateInfo(dlgSoftFloat16_32FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat16_32FPConvert>(dlgSoftFloat16_32FPConvert));
+            SetDelegateInfo(dlgSoftFloat16_64FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat16_64FPConvert>(dlgSoftFloat16_64FPConvert));
+
+            SetDelegateInfo(dlgSoftFloat32FPAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPAdd>(dlgSoftFloat32FPAdd));
+            SetDelegateInfo(dlgSoftFloat32FPAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPAddFpscr>(dlgSoftFloat32FPAddFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPCompare, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompare>(dlgSoftFloat32FPCompare));
+            SetDelegateInfo(dlgSoftFloat32FPCompareEQ, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareEQ>(dlgSoftFloat32FPCompareEQ));
+            SetDelegateInfo(dlgSoftFloat32FPCompareEQFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareEQFpscr>(dlgSoftFloat32FPCompareEQFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPCompareGE, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGE>(dlgSoftFloat32FPCompareGE));
+            SetDelegateInfo(dlgSoftFloat32FPCompareGEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGEFpscr>(dlgSoftFloat32FPCompareGEFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPCompareGT, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGT>(dlgSoftFloat32FPCompareGT));
+            SetDelegateInfo(dlgSoftFloat32FPCompareGTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGTFpscr>(dlgSoftFloat32FPCompareGTFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPCompareLE, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLE>(dlgSoftFloat32FPCompareLE));
+            SetDelegateInfo(dlgSoftFloat32FPCompareLEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLEFpscr>(dlgSoftFloat32FPCompareLEFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPCompareLT, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLT>(dlgSoftFloat32FPCompareLT));
+            SetDelegateInfo(dlgSoftFloat32FPCompareLTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLTFpscr>(dlgSoftFloat32FPCompareLTFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPDiv, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPDiv>(dlgSoftFloat32FPDiv));
+            SetDelegateInfo(dlgSoftFloat32FPMax, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMax>(dlgSoftFloat32FPMax));
+            SetDelegateInfo(dlgSoftFloat32FPMaxFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxFpscr>(dlgSoftFloat32FPMaxFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMaxNum, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxNum>(dlgSoftFloat32FPMaxNum));
+            SetDelegateInfo(dlgSoftFloat32FPMaxNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxNumFpscr>(dlgSoftFloat32FPMaxNumFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMin, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMin>(dlgSoftFloat32FPMin));
+            SetDelegateInfo(dlgSoftFloat32FPMinFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinFpscr>(dlgSoftFloat32FPMinFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMinNum, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinNum>(dlgSoftFloat32FPMinNum));
+            SetDelegateInfo(dlgSoftFloat32FPMinNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinNumFpscr>(dlgSoftFloat32FPMinNumFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMul, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMul>(dlgSoftFloat32FPMul));
+            SetDelegateInfo(dlgSoftFloat32FPMulFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulFpscr>(dlgSoftFloat32FPMulFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulAdd>(dlgSoftFloat32FPMulAdd));
+            SetDelegateInfo(dlgSoftFloat32FPMulAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulAddFpscr>(dlgSoftFloat32FPMulAddFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulSub>(dlgSoftFloat32FPMulSub));
+            SetDelegateInfo(dlgSoftFloat32FPMulSubFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulSubFpscr>(dlgSoftFloat32FPMulSubFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPMulX, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulX>(dlgSoftFloat32FPMulX));
+            SetDelegateInfo(dlgSoftFloat32FPNegMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPNegMulAdd>(dlgSoftFloat32FPNegMulAdd));
+            SetDelegateInfo(dlgSoftFloat32FPNegMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPNegMulSub>(dlgSoftFloat32FPNegMulSub));
+            SetDelegateInfo(dlgSoftFloat32FPRecipEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipEstimate>(dlgSoftFloat32FPRecipEstimate));
+            SetDelegateInfo(dlgSoftFloat32FPRecipEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipEstimateFpscr>(dlgSoftFloat32FPRecipEstimateFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPRecipStep, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipStep>(dlgSoftFloat32FPRecipStep)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPRecipStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipStepFused>(dlgSoftFloat32FPRecipStepFused));
+            SetDelegateInfo(dlgSoftFloat32FPRecpX, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecpX>(dlgSoftFloat32FPRecpX));
+            SetDelegateInfo(dlgSoftFloat32FPRSqrtEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtEstimate>(dlgSoftFloat32FPRSqrtEstimate));
+            SetDelegateInfo(dlgSoftFloat32FPRSqrtEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtEstimateFpscr>(dlgSoftFloat32FPRSqrtEstimateFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPRSqrtStep, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtStep>(dlgSoftFloat32FPRSqrtStep)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat32FPRSqrtStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtStepFused>(dlgSoftFloat32FPRSqrtStepFused));
+            SetDelegateInfo(dlgSoftFloat32FPSqrt, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPSqrt>(dlgSoftFloat32FPSqrt));
+            SetDelegateInfo(dlgSoftFloat32FPSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPSub>(dlgSoftFloat32FPSub));
+
+            SetDelegateInfo(dlgSoftFloat32_16FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat32_16FPConvert>(dlgSoftFloat32_16FPConvert));
+
+            SetDelegateInfo(dlgSoftFloat64FPAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPAdd>(dlgSoftFloat64FPAdd));
+            SetDelegateInfo(dlgSoftFloat64FPAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPAddFpscr>(dlgSoftFloat64FPAddFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPCompare, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompare>(dlgSoftFloat64FPCompare));
+            SetDelegateInfo(dlgSoftFloat64FPCompareEQ, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareEQ>(dlgSoftFloat64FPCompareEQ));
+            SetDelegateInfo(dlgSoftFloat64FPCompareEQFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareEQFpscr>(dlgSoftFloat64FPCompareEQFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPCompareGE, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGE>(dlgSoftFloat64FPCompareGE));
+            SetDelegateInfo(dlgSoftFloat64FPCompareGEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGEFpscr>(dlgSoftFloat64FPCompareGEFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPCompareGT, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGT>(dlgSoftFloat64FPCompareGT));
+            SetDelegateInfo(dlgSoftFloat64FPCompareGTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGTFpscr>(dlgSoftFloat64FPCompareGTFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPCompareLE, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLE>(dlgSoftFloat64FPCompareLE));
+            SetDelegateInfo(dlgSoftFloat64FPCompareLEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLEFpscr>(dlgSoftFloat64FPCompareLEFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPCompareLT, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLT>(dlgSoftFloat64FPCompareLT));
+            SetDelegateInfo(dlgSoftFloat64FPCompareLTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLTFpscr>(dlgSoftFloat64FPCompareLTFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPDiv, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPDiv>(dlgSoftFloat64FPDiv));
+            SetDelegateInfo(dlgSoftFloat64FPMax, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMax>(dlgSoftFloat64FPMax));
+            SetDelegateInfo(dlgSoftFloat64FPMaxFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxFpscr>(dlgSoftFloat64FPMaxFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMaxNum, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxNum>(dlgSoftFloat64FPMaxNum));
+            SetDelegateInfo(dlgSoftFloat64FPMaxNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxNumFpscr>(dlgSoftFloat64FPMaxNumFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMin, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMin>(dlgSoftFloat64FPMin));
+            SetDelegateInfo(dlgSoftFloat64FPMinFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinFpscr>(dlgSoftFloat64FPMinFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMinNum, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinNum>(dlgSoftFloat64FPMinNum));
+            SetDelegateInfo(dlgSoftFloat64FPMinNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinNumFpscr>(dlgSoftFloat64FPMinNumFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMul, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMul>(dlgSoftFloat64FPMul));
+            SetDelegateInfo(dlgSoftFloat64FPMulFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulFpscr>(dlgSoftFloat64FPMulFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulAdd>(dlgSoftFloat64FPMulAdd));
+            SetDelegateInfo(dlgSoftFloat64FPMulAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulAddFpscr>(dlgSoftFloat64FPMulAddFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulSub>(dlgSoftFloat64FPMulSub));
+            SetDelegateInfo(dlgSoftFloat64FPMulSubFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulSubFpscr>(dlgSoftFloat64FPMulSubFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPMulX, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulX>(dlgSoftFloat64FPMulX));
+            SetDelegateInfo(dlgSoftFloat64FPNegMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPNegMulAdd>(dlgSoftFloat64FPNegMulAdd));
+            SetDelegateInfo(dlgSoftFloat64FPNegMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPNegMulSub>(dlgSoftFloat64FPNegMulSub));
+            SetDelegateInfo(dlgSoftFloat64FPRecipEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipEstimate>(dlgSoftFloat64FPRecipEstimate));
+            SetDelegateInfo(dlgSoftFloat64FPRecipEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipEstimateFpscr>(dlgSoftFloat64FPRecipEstimateFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPRecipStep, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipStep>(dlgSoftFloat64FPRecipStep)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPRecipStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipStepFused>(dlgSoftFloat64FPRecipStepFused));
+            SetDelegateInfo(dlgSoftFloat64FPRecpX, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecpX>(dlgSoftFloat64FPRecpX));
+            SetDelegateInfo(dlgSoftFloat64FPRSqrtEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtEstimate>(dlgSoftFloat64FPRSqrtEstimate));
+            SetDelegateInfo(dlgSoftFloat64FPRSqrtEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtEstimateFpscr>(dlgSoftFloat64FPRSqrtEstimateFpscr)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPRSqrtStep, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtStep>(dlgSoftFloat64FPRSqrtStep)); // A32 only.
+            SetDelegateInfo(dlgSoftFloat64FPRSqrtStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtStepFused>(dlgSoftFloat64FPRSqrtStepFused));
+            SetDelegateInfo(dlgSoftFloat64FPSqrt, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPSqrt>(dlgSoftFloat64FPSqrt));
+            SetDelegateInfo(dlgSoftFloat64FPSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPSub>(dlgSoftFloat64FPSub));
+
+            SetDelegateInfo(dlgSoftFloat64_16FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat64_16FPConvert>(dlgSoftFloat64_16FPConvert));
        }
+
+        private delegate double MathAbs(double value);
+        private delegate double MathCeiling(double a);
+        private delegate double MathFloor(double d);
+        private delegate double MathRound(double value, MidpointRounding mode);
+        private delegate double MathTruncate(double d);
+
+        private delegate float MathFAbs(float x);
+        private delegate float MathFCeiling(float x);
+        private delegate float MathFFloor(float x);
+        private delegate float MathFRound(float x, MidpointRounding mode);
+        private delegate float MathFTruncate(float x);
+
+        private delegate void NativeInterfaceBreak(ulong address, int imm);
+        private delegate bool NativeInterfaceCheckSynchronization();
+        private delegate void NativeInterfaceEnqueueForRejit(ulong address);
+        private delegate ulong NativeInterfaceGetCntfrqEl0();
+        private delegate ulong NativeInterfaceGetCntpctEl0();
+        private delegate ulong NativeInterfaceGetCntvctEl0();
+        private delegate ulong NativeInterfaceGetCtrEl0();
+        private delegate ulong NativeInterfaceGetDczidEl0();
+        private delegate ulong NativeInterfaceGetFunctionAddress(ulong address);
+        private delegate void NativeInterfaceInvalidateCacheLine(ulong address);
+        private delegate byte NativeInterfaceReadByte(ulong address);
+        private delegate ushort NativeInterfaceReadUInt16(ulong address);
+        private delegate uint NativeInterfaceReadUInt32(ulong address);
+        private delegate ulong NativeInterfaceReadUInt64(ulong address);
+        private delegate V128 NativeInterfaceReadVector128(ulong address);
+        private delegate void NativeInterfaceSignalMemoryTracking(ulong address, ulong size, bool write);
+        private delegate void NativeInterfaceSupervisorCall(ulong address, int imm);
+        private delegate void NativeInterfaceThrowInvalidMemoryAccess(ulong address);
+        private delegate void NativeInterfaceUndefined(ulong address, int opCode);
+        private delegate void NativeInterfaceWriteByte(ulong address, byte value);
+        private delegate void NativeInterfaceWriteUInt16(ulong address, ushort value);
+        private delegate void NativeInterfaceWriteUInt32(ulong address, uint value);
+        private delegate void NativeInterfaceWriteUInt64(ulong address, ulong value);
+        private delegate void NativeInterfaceWriteVector128(ulong address, V128 value);
+
+        private delegate ulong SoftFallbackCountLeadingSigns(ulong value, int size);
+        private delegate ulong SoftFallbackCountLeadingZeros(ulong value, int size);
+        private delegate uint SoftFallbackCrc32b(uint crc, byte value);
+        private delegate uint SoftFallbackCrc32cb(uint crc, byte value);
+        private delegate uint SoftFallbackCrc32ch(uint crc, ushort value);
+        private delegate uint SoftFallbackCrc32cw(uint crc, uint value);
+        private delegate uint SoftFallbackCrc32cx(uint crc, ulong value);
+        private delegate uint SoftFallbackCrc32h(uint crc, ushort value);
+        private delegate uint SoftFallbackCrc32w(uint crc, uint value);
+        private delegate uint SoftFallbackCrc32x(uint crc, ulong value);
+        private delegate V128 SoftFallbackDecrypt(V128 value, V128 roundKey);
+        private delegate V128 SoftFallbackEncrypt(V128 value, V128 roundKey);
+        private delegate uint SoftFallbackFixedRotate(uint hash_e);
+        private delegate V128 SoftFallbackHashChoose(V128 hash_abcd, uint hash_e, V128 wk);
+        private delegate V128 SoftFallbackHashLower(V128 hash_abcd, V128 hash_efgh, V128 wk);
+        private delegate V128 SoftFallbackHashMajority(V128 hash_abcd, uint hash_e, V128 wk);
+        private delegate V128 SoftFallbackHashParity(V128 hash_abcd, uint hash_e, V128 wk);
+        private delegate V128 SoftFallbackHashUpper(V128 hash_abcd, V128 hash_efgh, V128 wk);
+        private delegate V128 SoftFallbackInverseMixColumns(V128 value);
+        private delegate V128 SoftFallbackMixColumns(V128 value);
+        private delegate V128 SoftFallbackPolynomialMult64_128(ulong op1, ulong op2);
+        private delegate int SoftFallbackSatF32ToS32(float value);
+        private delegate long SoftFallbackSatF32ToS64(float value);
+        private delegate uint SoftFallbackSatF32ToU32(float value);
+        private delegate ulong SoftFallbackSatF32ToU64(float value);
+        private delegate int SoftFallbackSatF64ToS32(double value);
+        private delegate long SoftFallbackSatF64ToS64(double value);
+        private delegate uint SoftFallbackSatF64ToU32(double value);
+        private delegate ulong SoftFallbackSatF64ToU64(double value);
+        private delegate V128 SoftFallbackSha1SchedulePart1(V128 w0_3, V128 w4_7, V128 w8_11);
+        private delegate V128 SoftFallbackSha1SchedulePart2(V128 tw0_3, V128 w12_15);
+        private delegate V128 SoftFallbackSha256SchedulePart1(V128 w0_3, V128 w4_7);
+        private delegate V128 SoftFallbackSha256SchedulePart2(V128 w0_3, V128 w8_11, V128 w12_15);
+        private delegate long SoftFallbackSignedShrImm64(long value, long roundConst, int shift);
+        private delegate V128 SoftFallbackTbl1(V128 vector, int bytes, V128 tb0);
+        private delegate V128 SoftFallbackTbl2(V128 vector, int bytes, V128 tb0, V128 tb1);
+        private delegate V128 SoftFallbackTbl3(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2);
+        private delegate V128 SoftFallbackTbl4(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3);
+        private delegate V128 SoftFallbackTbx1(V128 dest, V128 vector, int bytes, V128 tb0);
+        private delegate V128 SoftFallbackTbx2(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1);
+        private delegate V128 SoftFallbackTbx3(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2);
+        private delegate V128 SoftFallbackTbx4(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3);
+        private delegate ulong SoftFallbackUnsignedShrImm64(ulong value, long roundConst, int shift);
+
+        private delegate float SoftFloat16_32FPConvert(ushort valueBits);
+
+        private delegate double SoftFloat16_64FPConvert(ushort valueBits);
+
+        private delegate float SoftFloat32FPAdd(float value1, float value2);
+        private delegate float SoftFloat32FPAddFpscr(float value1, float value2, bool standardFpscr);
+        private delegate int SoftFloat32FPCompare(float value1, float value2, bool signalNaNs);
+        private delegate float SoftFloat32FPCompareEQ(float value1, float value2);
+        private delegate float SoftFloat32FPCompareEQFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPCompareGE(float value1, float value2);
+        private delegate float SoftFloat32FPCompareGEFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPCompareGT(float value1, float value2);
+        private delegate float SoftFloat32FPCompareGTFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPCompareLE(float value1, float value2);
+        private delegate float SoftFloat32FPCompareLEFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPCompareLT(float value1, float value2);
+        private delegate float SoftFloat32FPCompareLTFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPDiv(float value1, float value2);
+        private delegate float SoftFloat32FPMax(float value1, float value2);
+        private delegate float SoftFloat32FPMaxFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMaxNum(float value1, float value2);
+        private delegate float SoftFloat32FPMaxNumFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMin(float value1, float value2);
+        private delegate float SoftFloat32FPMinFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMinNum(float value1, float value2);
+        private delegate float SoftFloat32FPMinNumFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMul(float value1, float value2);
+        private delegate float SoftFloat32FPMulFpscr(float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMulAdd(float valueA, float value1, float value2);
+        private delegate float SoftFloat32FPMulAddFpscr(float valueA, float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMulSub(float valueA, float value1, float value2);
+        private delegate float SoftFloat32FPMulSubFpscr(float valueA, float value1, float value2, bool standardFpscr);
+        private delegate float SoftFloat32FPMulX(float value1, float value2);
+        private delegate float SoftFloat32FPNegMulAdd(float valueA, float value1, float value2);
+        private delegate float SoftFloat32FPNegMulSub(float valueA, float value1, float value2);
+        private delegate float SoftFloat32FPRecipEstimate(float value);
+        private delegate float SoftFloat32FPRecipEstimateFpscr(float value, bool standardFpscr);
+        private delegate float SoftFloat32FPRecipStep(float value1, float value2);
+        private delegate float SoftFloat32FPRecipStepFused(float value1, float value2);
+        private delegate float SoftFloat32FPRecpX(float value);
+        private delegate float SoftFloat32FPRSqrtEstimate(float value);
+        private delegate float SoftFloat32FPRSqrtEstimateFpscr(float value, bool standardFpscr);
+        private delegate float SoftFloat32FPRSqrtStep(float value1, float value2);
+        private delegate float SoftFloat32FPRSqrtStepFused(float value1, float value2);
+        private delegate float SoftFloat32FPSqrt(float value);
+        private delegate float SoftFloat32FPSub(float value1, float value2);
+
+        private delegate ushort SoftFloat32_16FPConvert(float value);
+
+        private delegate double SoftFloat64FPAdd(double value1, double value2);
+        private delegate double SoftFloat64FPAddFpscr(double value1, double value2, bool standardFpscr);
+        private delegate int SoftFloat64FPCompare(double value1, double value2, bool signalNaNs);
+        private delegate double SoftFloat64FPCompareEQ(double value1, double value2);
+        private delegate double SoftFloat64FPCompareEQFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPCompareGE(double value1, double value2);
+        private delegate double SoftFloat64FPCompareGEFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPCompareGT(double value1, double value2);
+        private delegate double SoftFloat64FPCompareGTFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPCompareLE(double value1, double value2);
+        private delegate double SoftFloat64FPCompareLEFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPCompareLT(double value1, double value2);
+        private delegate double SoftFloat64FPCompareLTFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPDiv(double value1, double value2);
+        private delegate double SoftFloat64FPMax(double value1, double value2);
+        private delegate double SoftFloat64FPMaxFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMaxNum(double value1, double value2);
+        private delegate double SoftFloat64FPMaxNumFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMin(double value1, double value2);
+        private delegate double SoftFloat64FPMinFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMinNum(double value1, double value2);
+        private delegate double SoftFloat64FPMinNumFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMul(double value1, double value2);
+        private delegate double SoftFloat64FPMulFpscr(double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMulAdd(double valueA, double value1, double value2);
+        private delegate double SoftFloat64FPMulAddFpscr(double valueA, double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMulSub(double valueA, double value1, double value2);
+        private delegate double SoftFloat64FPMulSubFpscr(double valueA, double value1, double value2, bool standardFpscr);
+        private delegate double SoftFloat64FPMulX(double value1, double value2);
+        private delegate double SoftFloat64FPNegMulAdd(double valueA, double value1, double value2);
+        private delegate double SoftFloat64FPNegMulSub(double valueA, double value1, double value2);
+        private delegate double SoftFloat64FPRecipEstimate(double value);
+        private delegate double SoftFloat64FPRecipEstimateFpscr(double value, bool standardFpscr);
+        private delegate double SoftFloat64FPRecipStep(double value1, double value2);
+        private delegate double SoftFloat64FPRecipStepFused(double value1, double value2);
+        private delegate double SoftFloat64FPRecpX(double value);
+        private delegate double SoftFloat64FPRSqrtEstimate(double value);
+        private delegate double SoftFloat64FPRSqrtEstimateFpscr(double value, bool standardFpscr);
+        private delegate double SoftFloat64FPRSqrtStep(double value1, double value2);
+        private delegate double SoftFloat64FPRSqrtStepFused(double value1, double value2);
+        private delegate double SoftFloat64FPSqrt(double value);
+        private delegate double SoftFloat64FPSub(double value1, double value2);
+
+        private delegate ushort SoftFloat64_16FPConvert(double value);
    }
 }
--- a/src/ARMeilleure/Translation/EmitterContext.cs
+++ b/src/ARMeilleure/Translation/EmitterContext.cs
@@ -97,7 +97,7 @@ namespace ARMeilleure.Translation

        public virtual Operand Call(MethodInfo info, params Operand[] callArgs)
        {
-            nint funcPtr = info.MethodHandle.GetFunctionPointer();
+            nint funcPtr = Delegates.GetDelegateFuncPtr(info);

            OperandType returnType = GetOperandType(info.ReturnType);

--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -29,8 +29,8 @@ namespace ARMeilleure.Translation.PTC
    {
        private const string OuterHeaderMagicString = "PTCohd\0\0";
        private const string InnerHeaderMagicString = "PTCihd\0\0";
-        
-        private const uint InternalVersion = 6998; //! To be incremented manually for each change to the ARMeilleure project.
+
+        private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.

        private const string ActualDir = "0";
        private const string BackupDir = "1";
--- a/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
+++ b/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
@@ -1,5 +1,4 @@
 using ARMeilleure.State;
-using Humanizer;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
@@ -59,8 +58,8 @@ namespace ARMeilleure.Translation.PTC
        {
            _ptc = ptc;

-            _timer = new Timer(SaveInterval.Seconds());
-            _timer.Elapsed += TimerElapsed;
+            _timer = new Timer(SaveInterval * 1000d);
+            _timer.Elapsed += PreSave;

            _outerHeaderMagic = BinaryPrimitives.ReadUInt64LittleEndian(EncodingCache.UTF8NoBOM.GetBytes(OuterHeaderMagicString).AsSpan());

@@ -73,9 +72,6 @@ namespace ARMeilleure.Translation.PTC
            Enabled = false;
        }

-        private void TimerElapsed(object _, ElapsedEventArgs __) 
-            => new Thread(PreSave) { Name = "Ptc.DiskWriter" }.Start();
-
        public void AddEntry(ulong address, ExecutionMode mode, bool highCq)
        {
            if (IsAddressInStaticCodeRange(address))
@@ -266,7 +262,7 @@ namespace ARMeilleure.Translation.PTC
            compressedStream.SetLength(0L);
        }

-        private void PreSave()
+        private void PreSave(object source, ElapsedEventArgs e)
        {
            _waitEvent.Reset();

@@ -432,7 +428,7 @@ namespace ARMeilleure.Translation.PTC
            {
                _disposed = true;

-                _timer.Elapsed -= TimerElapsed;
+                _timer.Elapsed -= PreSave;
                _timer.Dispose();

                Wait();
--- a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
@@ -9,12 +9,20 @@ namespace Ryujinx.Audio.Backends.Dummy
 {
    public class DummyHardwareDeviceDriver : IHardwareDeviceDriver
    {
-        private readonly ManualResetEvent _updateRequiredEvent = new(false);
-        private readonly ManualResetEvent _pauseEvent = new(true);
+        private readonly ManualResetEvent _updateRequiredEvent;
+        private readonly ManualResetEvent _pauseEvent;

        public static bool IsSupported => true;

-        public float Volume { get; set; } = 1f;
+        public float Volume { get; set; }
+
+        public DummyHardwareDeviceDriver()
+        {
+            _updateRequiredEvent = new ManualResetEvent(false);
+            _pauseEvent = new ManualResetEvent(true);
+
+            Volume = 1f;
+        }

        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount)
        {
@@ -52,7 +60,7 @@ namespace Ryujinx.Audio.Backends.Dummy
            Dispose(true);
        }

-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
        {
            if (disposing)
            {
--- a/src/Ryujinx.BuildValidationTasks/IValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/IValidationTask.cs
@@ -1,7 +0,0 @@
-namespace Ryujinx.BuildValidationTasks
-{
-    public interface IValidationTask
-    {
-        public bool Execute(string projectPath, bool isGitRunner);
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
@@ -0,0 +1,73 @@
+using System;
+using Microsoft.Build.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using Newtonsoft.Json;
+using Microsoft.Build.Framework;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class LocaleValidationTask : Task
+    {
+        public override bool Execute()
+        {
+            string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+
+            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
+            {
+                //i assume that we are in a build directory in the solution dir
+                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }
+            else
+            {
+                path = path.Split(["src"], StringSplitOptions.None)[0];
+                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }
+
+            string data;
+
+            using (StreamReader sr = new(path))
+            {
+                data = sr.ReadToEnd();
+            }
+
+            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
+
+            for (int i = 0; i < json.Locales.Count; i++)
+            {
+                LocalesEntry locale = json.Locales[i];
+
+                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
+                {
+                    locale.Translations.Add(langCode, string.Empty);
+                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
+                }
+
+                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
+                json.Locales[i] = locale;
+            }
+
+            string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
+
+            using (StreamWriter sw = new(path))
+            {
+                sw.Write(jsonString);
+            }
+
+            return true;
+        }
+
+        struct LocalesJson
+        {
+            public List<string> Languages { get; set; }
+            public List<LocalesEntry> Locales { get; set; }
+        }
+
+        struct LocalesEntry
+        {
+            public string ID { get; set; }
+            public Dictionary<string, string> Translations { get; set; }
+        }
+    }
+}
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text.Json;
-using System.Text.Encodings.Web;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class LocalesValidationTask : IValidationTask
-    {
-        public LocalesValidationTask() { }
-
-        public bool Execute(string projectPath, bool isGitRunner)
-        {
-            Console.WriteLine("Running Locale Validation Task...");
-
-            string path = projectPath + "src/Ryujinx/Assets/locales.json";
-            string data;
-
-            using (StreamReader sr = new(path))
-            {
-                data = sr.ReadToEnd();
-            }
-
-            LocalesJson json;
-
-            if (isGitRunner && data.Contains("\r\n"))
-                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, build locally to fix...");
-
-            try
-            {
-                json = JsonSerializer.Deserialize<LocalesJson>(data);
-
-            }
-            catch (JsonException e)
-            {
-                throw new JsonException(e.Message); //shorter and easier stacktrace
-            }
-
-
-
-            bool encounteredIssue = false;
-
-            for (int i = 0; i < json.Locales.Count; i++)
-            {
-                LocalesEntry locale = json.Locales[i];
-
-                foreach (string langCode in json.Languages.Where(lang => !locale.Translations.ContainsKey(lang)))
-                {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations.Add(langCode, string.Empty);
-                        Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
-                    }
-                }
-
-                foreach (string langCode in json.Languages.Where(lang => locale.Translations.ContainsKey(lang) && lang != "en_US" && locale.Translations[lang] == locale.Translations["en_US"]))
-                {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations[langCode] = string.Empty;
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
-                    }
-                }
-
-                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-                json.Locales[i] = locale;
-            }
-
-            if (isGitRunner && encounteredIssue)
-                throw new JsonException("1 or more locales are invalid!");
-
-            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
-            {
-                WriteIndented = true,
-                NewLine = "\n",
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
-
-            string jsonString = JsonSerializer.Serialize(json, jsonOptions);
-
-            using (StreamWriter sw = new(path))
-            {
-                sw.Write(jsonString);
-            }
-
-            Console.WriteLine("Finished Locale Validation Task!");
-
-            return true;
-        }
-
-        struct LocalesJson
-        {
-            public List<string> Languages { get; set; }
-            public List<LocalesEntry> Locales { get; set; }
-        }
-
-        struct LocalesEntry
-        {
-            public string ID { get; set; }
-            public Dictionary<string, string> Translations { get; set; }
-        }
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/Program.cs
+++ b/src/Ryujinx.BuildValidationTasks/Program.cs
@@ -1,37 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class Program
-    {
-        static void Main(string[] args)
-        {
-            // Display the number of command line arguments.
-            if (args.Length == 0)
-                throw new ArgumentException("Error: too few arguments!");
-
-            string path = args[0];
-
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Error: path is null or empty!");
-
-            if (!Path.Exists(path))
-                throw new FileLoadException($"path {{{path}}} does not exist!");
-
-            path = Path.GetFullPath(path);
-
-            if (!Directory.GetDirectories(path).Contains($"{path}src"))
-                throw new FileLoadException($"path {{{path}}} is not a valid ryujinx project!");
-
-            bool isGitRunner = path.Contains("runner") || path.Contains("D:\\a\\Ryujinx\\Ryujinx");
-            if (isGitRunner)
-                Console.WriteLine("Is Git Runner!");
-
-            // Run tasks
-            // Pass extra info needed in the task constructors
-            new LocalesValidationTask().Execute(path, isGitRunner);
-        }
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -1,17 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
  </PropertyGroup>

-  <Target Name="PostBuildTarget" AfterTargets="AfterBuild">
-    <Message Text="Running Validation Project" Importance="high" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" />
+    <PackageReference Include="Newtonsoft.Json" />
+  </ItemGroup>

-    <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
-      Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
-      ConsoleToMsBuild="true"
-      Condition="'$(RuntimeIdentifier)' == ''"
-      />
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
+
+  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
+    <LocaleValidationTask />
  </Target>

-</Project>
+</Project>
--- a/src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs
+++ b/src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs
@@ -35,8 +35,6 @@ namespace Ryujinx.Common.Configuration
 #pragma warning restore IDE0055
            };
        }
-        
-        

        public static float ToFloatY(this AspectRatio aspectRatio)
        {
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHack.cs
@@ -1,60 +0,0 @@
-using Gommon;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Common.Configuration
-{
-    [Flags]
-    public enum DirtyHack : byte
-    {
-        Xc2MenuSoftlockFix = 1,
-        ShaderTranslationDelay = 2
-    }
-
-    public readonly struct EnabledDirtyHack(DirtyHack hack, int value)
-    {
-        public DirtyHack Hack => hack;
-        public int Value => value;
-        
-        
-        
-        public ulong Pack() => Raw.PackBitFields(PackedFormat);
-
-        public static EnabledDirtyHack Unpack(ulong packedHack)
-        {
-            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
-            if (unpackedFields is not [var hack, var value])
-                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
-            
-            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
-        }
-        
-        private uint[] Raw => [(uint)Hack, (uint)Value.CoerceAtLeast(0)];
-        
-        public static readonly byte[] PackedFormat = [8, 32];
-    }
-
-    public class DirtyHacks : Dictionary<DirtyHack, int>
-    {
-        public DirtyHacks(IEnumerable<EnabledDirtyHack> hacks) 
-            => hacks.ForEach(edh => Add(edh.Hack, edh.Value));
-
-        public DirtyHacks(ulong[] packedHacks) : this(packedHacks.Select(EnabledDirtyHack.Unpack)) {}
-
-        public ulong[] PackEntries() 
-            => Entries.Select(it => it.Pack()).ToArray();
-        
-        public EnabledDirtyHack[] Entries 
-            => this
-                .Select(it => new EnabledDirtyHack(it.Key, it.Value))
-                .ToArray();
-
-        public static implicit operator DirtyHacks(EnabledDirtyHack[] hacks) => new(hacks);
-        public static implicit operator DirtyHacks(ulong[] packedHacks) => new(packedHacks);
-
-        public new int this[DirtyHack hack] => TryGetValue(hack, out var value) ? value : -1;
-
-        public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
-    }
-}
--- a/src/Ryujinx.Common/Configuration/GraphicsBackend.cs
+++ b/src/Ryujinx.Common/Configuration/GraphicsBackend.cs
@@ -6,9 +6,7 @@ namespace Ryujinx.Common.Configuration
    [JsonConverter(typeof(TypedStringEnumConverter<GraphicsBackend>))]
    public enum GraphicsBackend
    {
-        Auto,
        Vulkan,
        OpenGl,
-        Metal
    }
 }
--- a/src/Ryujinx.Common/Configuration/ScalingFilter.cs
+++ b/src/Ryujinx.Common/Configuration/ScalingFilter.cs
@@ -9,6 +9,5 @@ namespace Ryujinx.Common.Configuration
        Bilinear,
        Nearest,
        Fsr,
-        Area,
    }
 }
--- a/src/Ryujinx.Common/Extensions/StreamExtensions.cs
+++ b/src/Ryujinx.Common/Extensions/StreamExtensions.cs
@@ -8,10 +8,10 @@ namespace Ryujinx.Common
    public static class StreamExtensions
    {
        /// <summary>
-        /// Writes an int span to this stream.
+        /// Writes a <see cref="ReadOnlySpan{int}" /> to this stream.
        ///
        /// This default implementation converts each buffer value to a stack-allocated
-        /// byte array, then writes it to the Stream using <see cref="Stream.Write(ReadOnlySpan{byte})" />.
+        /// byte array, then writes it to the Stream using <cref="System.Stream.Write(byte[])" />.
        /// </summary>
        /// <param name="stream">The stream to be written to</param>
        /// <param name="buffer">The buffer of values to be written</param>
--- a/src/Ryujinx.Common/Logging/Logger.cs
+++ b/src/Ryujinx.Common/Logging/Logger.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;

@@ -158,16 +157,21 @@ namespace Ryujinx.Common.Logging
            _time.Restart();
        }

-        private static ILogTarget GetTarget(string targetName) 
-            => _logTargets.FirstOrDefault(target => target.Name.Equals(targetName));
+        private static ILogTarget GetTarget(string targetName)
+        {
+            foreach (var target in _logTargets)
+            {
+                if (target.Name.Equals(targetName))
+                {
+                    return target;
+                }
+            }
+
+            return null;
+        }

        public static void AddTarget(ILogTarget target)
        {
-            if (_logTargets.Any(t => t.Name == target.Name))
-            {
-                return;
-            }
-
            _logTargets.Add(target);

            Updated += target.Log;
--- a/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
+++ b/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
@@ -27,7 +27,11 @@ namespace Ryujinx.Common.Logging.Targets

        private readonly int _overflowTimeout;

-        string ILogTarget.Name => _target.Name;
+        string ILogTarget.Name { get => _target.Name; }
+
+        public AsyncLogTargetWrapper(ILogTarget target)
+            : this(target, -1)
+        { }

        public AsyncLogTargetWrapper(ILogTarget target, int queueLimit = -1, AsyncLogTargetOverflowAction overflowAction = AsyncLogTargetOverflowAction.Block)
        {
--- a/src/Ryujinx.Common/ReactiveObject.cs
+++ b/src/Ryujinx.Common/ReactiveObject.cs
@@ -53,9 +53,6 @@ namespace Ryujinx.Common
    {
        public static void LogValueChange<T>(LogClass logClass, ReactiveEventArgs<T> eventArgs, string valueName)
        {
-            if (eventArgs.AreValuesEqual)
-                return;
-            
            string message = string.Create(CultureInfo.InvariantCulture, $"{valueName} set to: {eventArgs.NewValue}");

            Logger.Info?.Print(logClass, message);
@@ -68,22 +65,5 @@ namespace Ryujinx.Common
    {
        public T OldValue { get; } = oldValue;
        public T NewValue { get; } = newValue;
-
-        public bool AreValuesEqual
-        {
-            get
-            {
-                if (OldValue == null && NewValue == null)
-                    return true;
-
-                if (OldValue == null && NewValue != null)
-                    return false;
-                
-                if (OldValue != null && NewValue == null)
-                    return false;
-
-                return OldValue!.Equals(NewValue);
-            }
-        }
    }
 }
--- a/src/Ryujinx.Common/RyujinxException.cs
+++ b/src/Ryujinx.Common/RyujinxException.cs
@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Common
-{
-    public class RyujinxException : Exception
-    {
-        public RyujinxException(string message) : base(message)
-        { }
-    }
-}
--- a/src/Ryujinx.Common/Utilities/BitUtils.cs
+++ b/src/Ryujinx.Common/Utilities/BitUtils.cs
@@ -40,35 +40,5 @@ namespace Ryujinx.Common

            return (value >> 32) | (value << 32);
        }
-        
-        // Never actually written bit packing logic before, so I looked it up.
-        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
-        
-        public static ulong PackBitFields(this uint[] values, byte[] bitFields)
-        {
-            ulong retVal = values[0]; //we set the first value right away
-            for (int f = 1; f < values.Length; f++)
-            {
-                retVal <<= bitFields[f]; // we shift the previous value
-                retVal += values[f];// and add our current value
-            }
-            return retVal;
-        }
-
-        public static uint[] UnpackBitFields(this ulong packed, byte[] bitFields)
-        {
-            int fields = bitFields.Length - 1; // number of fields to unpack
-            uint[] retArr = new uint[fields + 1]; // init return array
-            int curPos = 0; // current field bit position (start)
-            int lastEnd; // position where last field ended
-            for (int f = fields; f >= 0; f--) // loop from last
-            {
-                lastEnd = curPos; // we store where the last value ended
-                curPos += bitFields[f]; // we get where the current value starts
-                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
-                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
-            }
-            return retArr;
-        }
    }
 }
--- a/src/Ryujinx.Graphics.GAL/AntiAliasing.cs
+++ b/src/Ryujinx.Graphics.GAL/AntiAliasing.cs
@@ -0,0 +1,12 @@
+namespace Ryujinx.Graphics.GAL
+{
+    public enum AntiAliasing
+    {
+        None,
+        Fxaa,
+        SmaaLow,
+        SmaaMedium,
+        SmaaHigh,
+        SmaaUltra,
+    }
+}
--- a/src/Ryujinx.Graphics.GAL/ComputeSize.cs
+++ b/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;
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.GAL/Format.cs
+++ b/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>
--- a/src/Ryujinx.Graphics.GAL/IWindow.cs
+++ b/src/Ryujinx.Graphics.GAL/IWindow.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Configuration;
 using System;

 namespace Ryujinx.Graphics.GAL
--- a/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Configuration;
 using Ryujinx.Graphics.GAL.Multithreading.Commands.Window;
 using Ryujinx.Graphics.GAL.Multithreading.Model;
 using Ryujinx.Graphics.GAL.Multithreading.Resources;
--- a/src/Ryujinx.Graphics.GAL/ShaderInfo.cs
+++ b/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;
+        }
    }
 }
--- a/src/Ryujinx.Graphics.GAL/UpscaleType.cs
+++ b/src/Ryujinx.Graphics.GAL/UpscaleType.cs
@@ -0,0 +1,10 @@
+namespace Ryujinx.Graphics.GAL
+{
+    public enum ScalingFilter
+    {
+        Bilinear,
+        Nearest,
+        Fsr,
+        Area,
+    }
+}
--- a/src/Ryujinx.Graphics.GAL/VSyncMode.cs
+++ b/src/Ryujinx.Graphics.GAL/VSyncMode.cs
@@ -0,0 +1,9 @@
+namespace Ryujinx.Graphics.GAL
+{
+    public enum VSyncMode
+    {
+        Switch,
+        Unbounded,
+        Custom
+    }
+}
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeContext.cs
+++ b/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>
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeState.cs
+++ b/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>
--- a/src/Ryujinx.Graphics.Gpu/GpuContext.cs
+++ b/src/Ryujinx.Graphics.Gpu/GpuContext.cs
@@ -1,5 +1,4 @@
 using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
 using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.GPFifo;
@@ -91,13 +90,6 @@ namespace Ryujinx.Graphics.Gpu
        /// Support buffer updater.
        /// </summary>
        internal SupportBufferUpdater SupportBufferUpdater { get; }
-        
-        /// <summary>
-        /// Enabled dirty hacks.
-        /// Used for workarounds to emulator bugs we can't fix/don't know how to fix yet.
-        /// </summary>
-        internal DirtyHacks DirtyHacks { get; }
-        

        /// <summary>
        /// Host hardware capabilities.
@@ -121,7 +113,7 @@ namespace Ryujinx.Graphics.Gpu
        /// Creates a new instance of the GPU emulation context.
        /// </summary>
        /// <param name="renderer">Host renderer</param>
-        public GpuContext(IRenderer renderer, DirtyHacks hacks)
+        public GpuContext(IRenderer renderer)
        {
            Renderer = renderer;

@@ -144,8 +136,6 @@ namespace Ryujinx.Graphics.Gpu

            SupportBufferUpdater = new SupportBufferUpdater(renderer);

-            DirtyHacks = hacks;
-
            _firstTimestamp = ConvertNanosecondsToTicks((ulong)PerformanceCounter.ElapsedNanoseconds);
        }

--- a/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
+++ b/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Gpu
        /// Enables or disables high-level emulation of common GPU Macro code.
        /// </summary>
        public static bool EnableMacroHLE = true;
-        
+
        /// <summary>
        /// Title id of the current running game.
        /// Used by the shader cache.
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
+++ b/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>
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
@@ -367,9 +366,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        {
            try
            {
-                if (_context.Capabilities.Api == TargetApi.Metal && _context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
-                    Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
-                
                AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
                _asyncTranslationQueue.Add(asyncTranslation, _cancellationToken);
            }
@@ -494,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++)
                {
--- a/src/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs
+++ b/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/>
--- a/src/Ryujinx.Graphics.Gpu/Shader/GpuAccessorBase.cs
+++ b/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)
                {
--- a/src/Ryujinx.Graphics.Gpu/Shader/GpuChannelComputeState.cs
+++ b/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);
-        }
    }
 }
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
@@ -118,7 +117,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
        private static string GetDiskCachePath()
        {
            return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
-                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId.ToLower(), "cache", "shader")
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
                : null;
        }

@@ -225,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);
@@ -429,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
                        {
@@ -535,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());
        }
@@ -827,20 +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,
-                _ => throw new NotImplementedException()
-            };
+            TargetLanguage lang = GraphicsConfig.EnableSpirvCompilationOnVulkan && api == TargetApi.Vulkan
+                ? TargetLanguage.Spirv
+                : TargetLanguage.Glsl;

            return new TranslationOptions(lang, api, flags);
        }
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs
+++ b/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);
--- a/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/CAMetalLayerExtensions.cs
+++ b/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/CAMetalLayerExtensions.cs
@@ -1,22 +0,0 @@
-using SharpMetal;
-using SharpMetal.Foundation;
-using SharpMetal.ObjectiveCCore;
-using SharpMetal.QuartzCore;
-using System.Runtime.Versioning;
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Graphics.Metal.SharpMetalExtensions
-{
-    [SupportedOSPlatform("macOS")]
-    public static class CAMetalLayerExtensions
-    {
-        private static readonly Selector sel_developerHUDProperties = "developerHUDProperties";
-        private static readonly Selector sel_setDeveloperHUDProperties = "setDeveloperHUDProperties:";
-
-        public static NSDictionary GetDeveloperHudProperties(this CAMetalLayer metalLayer)
-            => new(ObjectiveCRuntime.IntPtr_objc_msgSend(metalLayer.NativePtr, sel_developerHUDProperties));
-
-        public static void SetDeveloperHudProperties(this CAMetalLayer metalLayer, NSDictionary dictionary) 
-            => ObjectiveCRuntime.objc_msgSend(metalLayer.NativePtr, sel_setDeveloperHUDProperties, dictionary);
-    }
-}
--- a/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/NSHelper.cs
+++ b/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/NSHelper.cs
@@ -1,32 +0,0 @@
-using SharpMetal.Foundation;
-using SharpMetal.ObjectiveCCore;
-using System.Runtime.Versioning;
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Graphics.Metal.SharpMetalExtensions
-{
-    [SupportedOSPlatform("macOS")]
-    public static class NSHelper
-    {
-        private static readonly Selector sel_getCStringMaxLengthEncoding = "getCString:maxLength:encoding:";
-        private static readonly Selector sel_stringWithUTF8String = "stringWithUTF8String:";
-        
-        public static unsafe string ToDotNetString(this NSString source)
-        {
-            char[] sourceBuffer = new char[source.Length];
-            fixed (char* pSourceBuffer = sourceBuffer)
-            {
-                ObjectiveC.bool_objc_msgSend(source,
-                    sel_getCStringMaxLengthEncoding,
-                    pSourceBuffer,
-                    source.MaximumLengthOfBytes(NSStringEncoding.UTF16) + 1,
-                    (ulong)NSStringEncoding.UTF16);
-            }
-
-            return new string(sourceBuffer);
-        }
-        
-        public static NSString ToNSString(this string source) 
-            => new(ObjectiveC.IntPtr_objc_msgSend(new ObjectiveCClass(nameof(NSString)), sel_stringWithUTF8String, source));
-    }
-}
--- a/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj
+++ b/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="SharpMetal" />
-  </ItemGroup>
-</Project>
--- a/src/Ryujinx.Graphics.Metal/Auto.cs
+++ b/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;
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/BackgroundResources.cs
+++ b/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();
-                }
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/BitMap.cs
+++ b/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;
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/BufferHolder.cs
+++ b/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();
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/BufferManager.cs
+++ b/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();
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/BufferUsageBitmap.cs
+++ b/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);
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/CacheByRange.cs
+++ b/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();
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/CommandBufferEncoder.cs
+++ b/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;
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/CommandBufferPool.cs
+++ b/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);
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/CommandBufferScoped.cs
+++ b/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);
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/Constants.cs
+++ b/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;
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/CounterEvent.cs
+++ b/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() { }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/DepthStencilCache.cs
+++ b/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);
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/DisposableBuffer.cs
+++ b/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();
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/DisposableSampler.cs
+++ b/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();
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/Effects/IPostProcessingEffect.cs
+++ b/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);
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/Effects/IScalingFilter.cs
+++ b/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);
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/EncoderResources.cs
+++ b/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;
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/EncoderState.cs
+++ b/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();
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs
+++ b/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs
--- a/src/Ryujinx.Graphics.Metal/EnumConversion.cs
+++ b/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;
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/FenceHolder.cs
+++ b/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;
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/FormatConverter.cs
+++ b/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;
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/FormatTable.cs
+++ b/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;
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/HardwareInfo.cs
+++ b/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 "";
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/HashTableSlim.cs
+++ b/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;
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/HelperShader.cs
+++ b/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();
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/IdList.cs
+++ b/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];
-                }
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/ImageArray.cs
+++ b/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() { }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/IndexBufferPattern.cs
+++ b/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;
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/IndexBufferState.cs
+++ b/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,
-            };
-        }
-    }
-}
--- a/src/Ryujinx.Graphics.Metal/MetalRenderer.cs
+++ b/src/Ryujinx.Graphics.Metal/MetalRenderer.cs
@@ -1,312 +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 uint ProgramCount { get; set; }
-
-#pragma warning disable CS0067 // The event is never used
-        public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
-#pragma warning restore CS0067
-        
-        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)
-        {
-            ProgramCount++;
-            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();
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
IvonWei	a4b2feef79	Merge branch 'GreemDev:master' into master	2024-12-23 22:13:47 +08:00
IvonWei	ad7d9d1ce0	Update NpadController.cs add ?	2024-12-23 18:55:49 +08:00
IvonWei	86f9544910	Update NpadController.cs back to Debug	2024-12-23 18:54:11 +08:00
madwind	e9ecbd44fc	Add a virtual controller to merge Joy-Cons.	2024-12-23 17:57:55 +08:00