UI: I may be stupid.

Minor code improvements and comment fixes.

.github/FUNDING.yml

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

.github/labeler.yml

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

.github/reviewers.yml

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

.github/workflows/build.yml

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

.github/workflows/flatpak.yml

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

.github/workflows/mako.yml

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

.github/workflows/nightly_pr_comment.yml

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

.github/workflows/pr_triage.yml

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

.github/workflows/release.yml

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

Directory.Packages.props

@@ -10,13 +10,15 @@
     <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="Projektanker.Icons.Avalonia" Version="9.4.0" />
+    <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="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" />
-    <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
-    <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
+    <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
@@ -34,8 +36,8 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
+    <PackageVersion Include="Gommon" Version="2.6.5" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />

README.md

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

Ryujinx.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Gtk3", "src\Ryujinx.Gtk3\Ryujinx.Gtk3.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Unicorn", "src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj", "{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}"
@@ -95,10 +93,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{074045D4-3ED2-4711-9169-E385F2BFB5A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU

distribution/macos/create_macos_build_ava.sh

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

src/ARMeilleure/Optimizations.cs

@@ -5,6 +5,9 @@ namespace ARMeilleure
 
     public static class Optimizations
     {
+        // low-core count PPTC
+        public static bool LowPower { get; set; } = false;
+
         public static bool FastFP { get; set; } = true;
 
         public static bool AllowLcqInFunctionTable { get; set; } = true;
@@ -51,8 +54,8 @@ namespace ARMeilleure
         internal static bool UseSse41     => UseSse41IfAvailable     && X86HardwareCapabilities.SupportsSse41;
         internal static bool UseSse42     => UseSse42IfAvailable     && X86HardwareCapabilities.SupportsSse42;
         internal static bool UsePopCnt    => UsePopCntIfAvailable    && X86HardwareCapabilities.SupportsPopcnt;
-        internal static bool UseAvx       => UseAvxIfAvailable       && X86HardwareCapabilities.SupportsAvx && !ForceLegacySse;
-        internal static bool UseAvx512F   => UseAvx512FIfAvailable   && X86HardwareCapabilities.SupportsAvx512F && !ForceLegacySse;
+        internal static bool UseAvx       => UseAvxIfAvailable       && X86HardwareCapabilities.SupportsAvx      && !ForceLegacySse;
+        internal static bool UseAvx512F   => UseAvx512FIfAvailable   && X86HardwareCapabilities.SupportsAvx512F  && !ForceLegacySse;
         internal static bool UseAvx512Vl  => UseAvx512VlIfAvailable  && X86HardwareCapabilities.SupportsAvx512Vl && !ForceLegacySse;
         internal static bool UseAvx512Bw  => UseAvx512BwIfAvailable  && X86HardwareCapabilities.SupportsAvx512Bw && !ForceLegacySse;
         internal static bool UseAvx512Dq  => UseAvx512DqIfAvailable  && X86HardwareCapabilities.SupportsAvx512Dq && !ForceLegacySse;

src/ARMeilleure/Translation/PTC/Ptc.cs

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

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/Ryujinx.Common/Collections/IntervalTree.cs

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

src/Ryujinx.Common/Extensions/StreamExtensions.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Common
     public static class StreamExtensions
     {
         /// <summary>
-        /// Writes a <cref="ReadOnlySpan<int>" /> 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 <cref="System.Stream.Write(byte[])" />.
@@ -66,8 +66,8 @@ namespace Ryujinx.Common
         }
 
         /// <summary>
-        // Writes a four-byte unsigned integer to this stream. The current position
-        // of the stream is advanced by four.
+        /// Writes a four-byte unsigned integer to this stream. The current position
+        /// of the stream is advanced by four.
         /// </summary>
         /// <param name="stream">The stream to be written to</param>
         /// <param name="value">The value to be written</param>

src/Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs

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

src/Ryujinx.Common/Hash128.cs

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

src/Ryujinx.Common/Logging/Logger.cs

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

src/Ryujinx.Common/Pools/ObjectPool.cs

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

src/Ryujinx.Common/ReactiveObject.cs

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

src/Ryujinx.Common/ReleaseInformation.cs

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

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
     <PackageReference Include="MsgPack.Cli" />
     <PackageReference Include="System.Management" />
+    <PackageReference Include="Gommon" />
   </ItemGroup>
 
 </Project>

src/Ryujinx.Common/Utilities/BitUtils.cs

@@ -4,23 +4,18 @@ namespace Ryujinx.Common
 {
     public static class BitUtils
     {
-        public static T AlignUp<T>(T value, T size)
-            where T : IBinaryInteger<T>
-        {
-            return (value + (size - T.One)) & -size;
-        }
+        public static T AlignUp<T>(T value, T size) where T : IBinaryInteger<T>
+            => (value + (size - T.One)) & -size;
 
-        public static T AlignDown<T>(T value, T size)
-            where T : IBinaryInteger<T>
-        {
-            return value & -size;
-        }
+        public static T AlignDown<T>(T value, T size) where T : IBinaryInteger<T> 
+            => value & -size;
 
-        public static T DivRoundUp<T>(T value, T dividend)
-            where T : IBinaryInteger<T>
-        {
-            return (value + (dividend - T.One)) / dividend;
-        }
+        public static T DivRoundUp<T>(T value, T dividend) where T : IBinaryInteger<T> 
+            => (value + (dividend - T.One)) / dividend;
+
+        public static int Pow2RoundDown(int value) => BitOperations.IsPow2(value) ? value : Pow2RoundUp(value) >> 1;
+
+        public static long ReverseBits64(long value) => (long)ReverseBits64((ulong)value);
 
         public static int Pow2RoundUp(int value)
         {
@@ -35,16 +30,6 @@ namespace Ryujinx.Common
             return ++value;
         }
 
-        public static int Pow2RoundDown(int value)
-        {
-            return BitOperations.IsPow2(value) ? value : Pow2RoundUp(value) >> 1;
-        }
-
-        public static long ReverseBits64(long value)
-        {
-            return (long)ReverseBits64((ulong)value);
-        }
-
         private static ulong ReverseBits64(ulong value)
         {
             value = ((value & 0xaaaaaaaaaaaaaaaa) >> 1) | ((value & 0x5555555555555555) << 1);

src/Ryujinx.Common/Utilities/JsonHelper.cs

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

src/Ryujinx.Common/Utilities/UInt128Utils.cs

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

src/Ryujinx.Common/XXHash128.cs

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

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

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

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

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

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

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

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

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

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

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

src/Ryujinx.Graphics.Nvdec.FFmpeg/FFmpegContext.cs

@@ -52,7 +52,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
             int avCodecMajorVersion = avCodecRawVersion >> 16;
             int avCodecMinorVersion = (avCodecRawVersion >> 8) & 0xFF;
 
-            // libavcodec 59.24 changed AvCodec to move its private API and also move the codec function to an union.
+            // libavcodec 59.24 changed AvCodec to move its private API and also move the codec function to a union.
             if (avCodecMajorVersion > 59 || (avCodecMajorVersion == 59 && avCodecMinorVersion > 24))
             {
                 _decodeFrame = Marshal.GetDelegateForFunctionPointer<AVCodec_decode>(((FFCodec<AVCodec>*)_codec)->CodecCallback);

src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs

@@ -26,8 +26,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
         {
             Surface outSurf = (Surface)output;
 
-            if (outSurf.RequestedWidth != _oldOutputWidth ||
-                outSurf.RequestedHeight != _oldOutputHeight)
+            if (outSurf.RequestedWidth != _oldOutputWidth || outSurf.RequestedHeight != _oldOutputHeight)
             {
                 _context.Dispose();
                 _context = new FFmpegContext(AVCodecID.AV_CODEC_ID_H264);
@@ -38,7 +37,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
 
             Span<byte> bs = Prepend(bitstream, SpsAndPpsReconstruction.Reconstruct(ref pictureInfo, _workBuffer));
 
-            return _context.DecodeFrame(outSurf, bs) == 0;
+            return _context.DecodeFrame(outSurf, bs) is 0;
         }
 
         private static byte[] Prepend(ReadOnlySpan<byte> data, ReadOnlySpan<byte> prep)

src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs

@@ -3,23 +3,13 @@ using System.Numerics;
 
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
 {
-    struct H264BitStreamWriter
+    struct H264BitStreamWriter(byte[] workBuffer)
     {
         private const int BufferSize = 8;
 
-        private readonly byte[] _workBuffer;
-
-        private int _offset;
-        private int _buffer;
-        private int _bufferPos;
-
-        public H264BitStreamWriter(byte[] workBuffer)
-        {
-            _workBuffer = workBuffer;
-            _offset = 0;
-            _buffer = 0;
-            _bufferPos = 0;
-        }
+        private int _offset = 0;
+        private int _buffer = 0;
+        private int _bufferPos = 0;
 
         public void WriteBit(bool value)
         {
@@ -59,9 +49,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
         private int GetFreeBufferBits()
         {
             if (_bufferPos == BufferSize)
-            {
                 Flush();
-            }
 
             return BufferSize - _bufferPos;
         }
@@ -70,7 +58,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
         {
             if (_bufferPos != 0)
             {
-                _workBuffer[_offset++] = (byte)_buffer;
+                workBuffer[_offset++] = (byte)_buffer;
 
                 _buffer = 0;
                 _bufferPos = 0;
@@ -84,10 +72,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             Flush();
         }
 
-        public readonly Span<byte> AsSpan()
-        {
-            return new Span<byte>(_workBuffer)[.._offset];
-        }
+        public readonly Span<byte> AsSpan() 
+            => new Span<byte>(workBuffer)[.._offset];
 
         public void WriteU(uint value, int valueSize) => WriteBits((int)value, valueSize);
         public void WriteSe(int value) => WriteExpGolombCodedInt(value);

src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs

@@ -243,7 +243,7 @@ namespace Ryujinx.Graphics.OpenGL
             // This is required to disable [0, 1] clamping for SNorm outputs on compatibility profiles.
             // This call is expected to fail if we're running with a core profile,
             // as this clamp target was deprecated, but that's fine as a core profile
-            // should already have the desired behaviour were outputs are not clamped.
+            // should already have the desired behaviour where outputs are not clamped.
             GL.ClampColor(ClampColorTarget.ClampFragmentColor, ClampColorMode.False);
         }
 

src/Ryujinx.Graphics.Texture/BC6Decoder.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Graphics.Texture
             if (subsetCount == 0)
             {
                 // Mode is invalid, the spec mandates that hardware fills the block with
-                // a opaque black color.
+                // an opaque black color.
                 for (int ty = 0; ty < h; ty++)
                 {
                     int baseOffs = ty * width;

src/Ryujinx.Graphics.Texture/OffsetCalculator.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Texture
 
         private readonly BlockLinearLayout _layoutConverter;
 
-        // Variables for built in iteration.
+        // Variables for built-in iteration.
         private int _yPart;
 
         public OffsetCalculator(
@@ -73,69 +73,50 @@ namespace Ryujinx.Graphics.Texture
         public int GetOffset(int x, int y)
         {
             if (_isLinear)
-            {
                 return x * _bytesPerPixel + y * _stride;
-            }
-            else
-            {
-                return _layoutConverter.GetOffset(x, y, 0);
-            }
+
+            return _layoutConverter.GetOffset(x, y, 0);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int GetOffset(int x)
         {
             if (_isLinear)
-            {
                 return x * _bytesPerPixel + _yPart;
-            }
-            else
-            {
-                return _layoutConverter.GetOffset(x);
-            }
+
+            return _layoutConverter.GetOffset(x);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int GetOffsetWithLineOffset64(int x)
         {
             if (_isLinear)
-            {
                 return x + _yPart;
-            }
-            else
-            {
-                return _layoutConverter.GetOffsetWithLineOffset64(x);
-            }
+
+            return _layoutConverter.GetOffsetWithLineOffset64(x);
         }
 
         public (int offset, int size) GetRectangleRange(int x, int y, int width, int height)
         {
-            if (_isLinear)
-            {
-                int start = y * Math.Abs(_stride) + x * _bytesPerPixel;
-                int end = (y + height - 1) * Math.Abs(_stride) + (x + width) * _bytesPerPixel;
-                return (y * _stride + x * _bytesPerPixel, end - start);
-            }
-            else
-            {
+            if (!_isLinear)
                 return _layoutConverter.GetRectangleRange(x, y, width, height);
-            }
+
+            int start = y * Math.Abs(_stride) + x * _bytesPerPixel;
+            int end = (y + height - 1) * Math.Abs(_stride) + (x + width) * _bytesPerPixel;
+            return (y * _stride + x * _bytesPerPixel, end - start);
         }
 
         public bool LayoutMatches(OffsetCalculator other)
         {
             if (_isLinear)
-            {
                 return other._isLinear &&
                        _width == other._width &&
                        _height == other._height &&
                        _stride == other._stride &&
                        _bytesPerPixel == other._bytesPerPixel;
-            }
-            else
-            {
-                return !other._isLinear && _layoutConverter.LayoutMatches(other._layoutConverter);
-            }
+            
+
+            return !other._isLinear && _layoutConverter.LayoutMatches(other._layoutConverter);
         }
     }
 }

src/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs

@@ -76,9 +76,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        internal int FindSuitableMemoryTypeIndex(
-            uint memoryTypeBits,
-            MemoryPropertyFlags flags)
+        internal int FindSuitableMemoryTypeIndex(uint memoryTypeBits, MemoryPropertyFlags flags)
         {
             for (int i = 0; i < _physicalDevice.PhysicalDeviceMemoryProperties.MemoryTypeCount; i++)
             {

src/Ryujinx.Gtk3/Input/GTK3/GTK3Keyboard.cs

@@ -1,205 +0,0 @@
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Keyboard;
-using System;
-using System.Collections.Generic;
-using System.Numerics;
-using ConfigKey = Ryujinx.Common.Configuration.Hid.Key;
-
-namespace Ryujinx.Input.GTK3
-{
-    public class GTK3Keyboard : IKeyboard
-    {
-        private class ButtonMappingEntry
-        {
-            public readonly GamepadButtonInputId To;
-            public readonly Key From;
-
-            public ButtonMappingEntry(GamepadButtonInputId to, Key from)
-            {
-                To = to;
-                From = from;
-            }
-        }
-
-        private readonly object _userMappingLock = new();
-
-        private readonly GTK3KeyboardDriver _driver;
-        private StandardKeyboardInputConfig _configuration;
-        private readonly List<ButtonMappingEntry> _buttonsUserMapping;
-
-        public GTK3Keyboard(GTK3KeyboardDriver driver, string id, string name)
-        {
-            _driver = driver;
-            Id = id;
-            Name = name;
-            _buttonsUserMapping = new List<ButtonMappingEntry>();
-        }
-
-        private bool HasConfiguration => _configuration != null;
-
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public bool IsConnected => true;
-
-        public GamepadFeaturesFlag Features => GamepadFeaturesFlag.None;
-
-        public void Dispose()
-        {
-            // No operations
-            GC.SuppressFinalize(this);
-        }
-
-        public KeyboardStateSnapshot GetKeyboardStateSnapshot()
-        {
-            return IKeyboard.GetStateSnapshot(this);
-        }
-
-        private static float ConvertRawStickValue(short value)
-        {
-            const float ConvertRate = 1.0f / (short.MaxValue + 0.5f);
-
-            return value * ConvertRate;
-        }
-
-        private static (short, short) GetStickValues(ref KeyboardStateSnapshot snapshot, JoyconConfigKeyboardStick<ConfigKey> stickConfig)
-        {
-            short stickX = 0;
-            short stickY = 0;
-
-            if (snapshot.IsPressed((Key)stickConfig.StickUp))
-            {
-                stickY += 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickDown))
-            {
-                stickY -= 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickRight))
-            {
-                stickX += 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickLeft))
-            {
-                stickX -= 1;
-            }
-
-            OpenTK.Mathematics.Vector2 stick = new(stickX, stickY);
-
-            stick.NormalizeFast();
-
-            return ((short)(stick.X * short.MaxValue), (short)(stick.Y * short.MaxValue));
-        }
-
-        public GamepadStateSnapshot GetMappedStateSnapshot()
-        {
-            KeyboardStateSnapshot rawState = GetKeyboardStateSnapshot();
-            GamepadStateSnapshot result = default;
-
-            lock (_userMappingLock)
-            {
-                if (!HasConfiguration)
-                {
-                    return result;
-                }
-
-                foreach (ButtonMappingEntry entry in _buttonsUserMapping)
-                {
-                    if (entry.From == Key.Unknown || entry.From == Key.Unbound || entry.To == GamepadButtonInputId.Unbound)
-                    {
-                        continue;
-                    }
-
-                    // Do not touch state of button already pressed
-                    if (!result.IsPressed(entry.To))
-                    {
-                        result.SetPressed(entry.To, rawState.IsPressed(entry.From));
-                    }
-                }
-
-                (short leftStickX, short leftStickY) = GetStickValues(ref rawState, _configuration.LeftJoyconStick);
-                (short rightStickX, short rightStickY) = GetStickValues(ref rawState, _configuration.RightJoyconStick);
-
-                result.SetStick(StickInputId.Left, ConvertRawStickValue(leftStickX), ConvertRawStickValue(leftStickY));
-                result.SetStick(StickInputId.Right, ConvertRawStickValue(rightStickX), ConvertRawStickValue(rightStickY));
-            }
-
-            return result;
-        }
-
-        public GamepadStateSnapshot GetStateSnapshot()
-        {
-            throw new NotSupportedException();
-        }
-
-        public (float, float) GetStick(StickInputId inputId)
-        {
-            throw new NotSupportedException();
-        }
-
-        public bool IsPressed(GamepadButtonInputId inputId)
-        {
-            throw new NotSupportedException();
-        }
-
-        public bool IsPressed(Key key)
-        {
-            return _driver.IsPressed(key);
-        }
-
-        public void SetConfiguration(InputConfig configuration)
-        {
-            lock (_userMappingLock)
-            {
-                _configuration = (StandardKeyboardInputConfig)configuration;
-
-                _buttonsUserMapping.Clear();
-
-                // Then left joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (Key)_configuration.LeftJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (Key)_configuration.LeftJoycon.DpadUp));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (Key)_configuration.LeftJoycon.DpadDown));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (Key)_configuration.LeftJoycon.DpadLeft));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (Key)_configuration.LeftJoycon.DpadRight));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (Key)_configuration.LeftJoycon.ButtonMinus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (Key)_configuration.LeftJoycon.ButtonL));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (Key)_configuration.LeftJoycon.ButtonZl));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (Key)_configuration.LeftJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (Key)_configuration.LeftJoycon.ButtonSl));
-
-                // Finally right joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (Key)_configuration.RightJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (Key)_configuration.RightJoycon.ButtonA));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (Key)_configuration.RightJoycon.ButtonB));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (Key)_configuration.RightJoycon.ButtonX));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (Key)_configuration.RightJoycon.ButtonY));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (Key)_configuration.RightJoycon.ButtonPlus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (Key)_configuration.RightJoycon.ButtonR));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (Key)_configuration.RightJoycon.ButtonZr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (Key)_configuration.RightJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (Key)_configuration.RightJoycon.ButtonSl));
-            }
-        }
-
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            // No operations
-        }
-
-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            // No operations
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputId)
-        {
-            // No operations
-
-            return Vector3.Zero;
-        }
-    }
-}

src/Ryujinx.Gtk3/Input/GTK3/GTK3KeyboardDriver.cs

@@ -1,99 +0,0 @@
-using Gdk;
-using Gtk;
-using System;
-using System.Collections.Generic;
-using GtkKey = Gdk.Key;
-
-namespace Ryujinx.Input.GTK3
-{
-    public class GTK3KeyboardDriver : IGamepadDriver
-    {
-        private readonly Widget _widget;
-        private readonly HashSet<GtkKey> _pressedKeys;
-
-        public GTK3KeyboardDriver(Widget widget)
-        {
-            _widget = widget;
-            _pressedKeys = new HashSet<GtkKey>();
-
-            _widget.KeyPressEvent += OnKeyPress;
-            _widget.KeyReleaseEvent += OnKeyRelease;
-        }
-
-        public string DriverName => "GTK3";
-
-        private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
-
-        public ReadOnlySpan<string> GamepadsIds => _keyboardIdentifers;
-
-        public event Action<string> OnGamepadConnected
-        {
-            add { }
-            remove { }
-        }
-
-        public event Action<string> OnGamepadDisconnected
-        {
-            add { }
-            remove { }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _widget.KeyPressEvent -= OnKeyPress;
-                _widget.KeyReleaseEvent -= OnKeyRelease;
-            }
-        }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            Dispose(true);
-        }
-
-        [GLib.ConnectBefore]
-        protected void OnKeyPress(object sender, KeyPressEventArgs args)
-        {
-            GtkKey key = (GtkKey)Keyval.ToLower((uint)args.Event.Key);
-
-            _pressedKeys.Add(key);
-        }
-
-        [GLib.ConnectBefore]
-        protected void OnKeyRelease(object sender, KeyReleaseEventArgs args)
-        {
-            GtkKey key = (GtkKey)Keyval.ToLower((uint)args.Event.Key);
-
-            _pressedKeys.Remove(key);
-        }
-
-        internal bool IsPressed(Key key)
-        {
-            if (key == Key.Unbound || key == Key.Unknown)
-            {
-                return false;
-            }
-
-            GtkKey nativeKey = GTK3MappingHelper.ToGtkKey(key);
-
-            return _pressedKeys.Contains(nativeKey);
-        }
-
-        public void Clear()
-        {
-            _pressedKeys.Clear();
-        }
-
-        public IGamepad GetGamepad(string id)
-        {
-            if (!_keyboardIdentifers[0].Equals(id))
-            {
-                return null;
-            }
-
-            return new GTK3Keyboard(this, _keyboardIdentifers[0], "All keyboards");
-        }
-    }
-}

src/Ryujinx.Gtk3/Input/GTK3/GTK3MappingHelper.cs

@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using GtkKey = Gdk.Key;
-
-namespace Ryujinx.Input.GTK3
-{
-    public static class GTK3MappingHelper
-    {
-        private static readonly GtkKey[] _keyMapping = new GtkKey[(int)Key.Count]
-        {
-            // NOTE: invalid
-            GtkKey.blank,
-
-            GtkKey.Shift_L,
-            GtkKey.Shift_R,
-            GtkKey.Control_L,
-            GtkKey.Control_R,
-            GtkKey.Alt_L,
-            GtkKey.Alt_R,
-            GtkKey.Super_L,
-            GtkKey.Super_R,
-            GtkKey.Menu,
-            GtkKey.F1,
-            GtkKey.F2,
-            GtkKey.F3,
-            GtkKey.F4,
-            GtkKey.F5,
-            GtkKey.F6,
-            GtkKey.F7,
-            GtkKey.F8,
-            GtkKey.F9,
-            GtkKey.F10,
-            GtkKey.F11,
-            GtkKey.F12,
-            GtkKey.F13,
-            GtkKey.F14,
-            GtkKey.F15,
-            GtkKey.F16,
-            GtkKey.F17,
-            GtkKey.F18,
-            GtkKey.F19,
-            GtkKey.F20,
-            GtkKey.F21,
-            GtkKey.F22,
-            GtkKey.F23,
-            GtkKey.F24,
-            GtkKey.F25,
-            GtkKey.F26,
-            GtkKey.F27,
-            GtkKey.F28,
-            GtkKey.F29,
-            GtkKey.F30,
-            GtkKey.F31,
-            GtkKey.F32,
-            GtkKey.F33,
-            GtkKey.F34,
-            GtkKey.F35,
-            GtkKey.Up,
-            GtkKey.Down,
-            GtkKey.Left,
-            GtkKey.Right,
-            GtkKey.Return,
-            GtkKey.Escape,
-            GtkKey.space,
-            GtkKey.Tab,
-            GtkKey.BackSpace,
-            GtkKey.Insert,
-            GtkKey.Delete,
-            GtkKey.Page_Up,
-            GtkKey.Page_Down,
-            GtkKey.Home,
-            GtkKey.End,
-            GtkKey.Caps_Lock,
-            GtkKey.Scroll_Lock,
-            GtkKey.Print,
-            GtkKey.Pause,
-            GtkKey.Num_Lock,
-            GtkKey.Clear,
-            GtkKey.KP_0,
-            GtkKey.KP_1,
-            GtkKey.KP_2,
-            GtkKey.KP_3,
-            GtkKey.KP_4,
-            GtkKey.KP_5,
-            GtkKey.KP_6,
-            GtkKey.KP_7,
-            GtkKey.KP_8,
-            GtkKey.KP_9,
-            GtkKey.KP_Divide,
-            GtkKey.KP_Multiply,
-            GtkKey.KP_Subtract,
-            GtkKey.KP_Add,
-            GtkKey.KP_Decimal,
-            GtkKey.KP_Enter,
-            GtkKey.a,
-            GtkKey.b,
-            GtkKey.c,
-            GtkKey.d,
-            GtkKey.e,
-            GtkKey.f,
-            GtkKey.g,
-            GtkKey.h,
-            GtkKey.i,
-            GtkKey.j,
-            GtkKey.k,
-            GtkKey.l,
-            GtkKey.m,
-            GtkKey.n,
-            GtkKey.o,
-            GtkKey.p,
-            GtkKey.q,
-            GtkKey.r,
-            GtkKey.s,
-            GtkKey.t,
-            GtkKey.u,
-            GtkKey.v,
-            GtkKey.w,
-            GtkKey.x,
-            GtkKey.y,
-            GtkKey.z,
-            GtkKey.Key_0,
-            GtkKey.Key_1,
-            GtkKey.Key_2,
-            GtkKey.Key_3,
-            GtkKey.Key_4,
-            GtkKey.Key_5,
-            GtkKey.Key_6,
-            GtkKey.Key_7,
-            GtkKey.Key_8,
-            GtkKey.Key_9,
-            GtkKey.grave,
-            GtkKey.grave,
-            GtkKey.minus,
-            GtkKey.plus,
-            GtkKey.bracketleft,
-            GtkKey.bracketright,
-            GtkKey.semicolon,
-            GtkKey.quoteright,
-            GtkKey.comma,
-            GtkKey.period,
-            GtkKey.slash,
-            GtkKey.backslash,
-
-            // NOTE: invalid
-            GtkKey.blank,
-        };
-
-        private static readonly Dictionary<GtkKey, Key> _gtkKeyMapping;
-
-        static GTK3MappingHelper()
-        {
-            var inputKeys = Enum.GetValues<Key>().SkipLast(1);
-
-            // GtkKey is not contiguous and quite large, so use a dictionary instead of an array.
-            _gtkKeyMapping = new Dictionary<GtkKey, Key>();
-
-            foreach (var key in inputKeys)
-            {
-                var index = ToGtkKey(key);
-                _gtkKeyMapping[index] = key;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static GtkKey ToGtkKey(Key key)
-        {
-            return _keyMapping[(int)key];
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Key ToInputKey(GtkKey key)
-        {
-            return _gtkKeyMapping.GetValueOrDefault(key, Key.Unknown);
-        }
-    }
-}

src/Ryujinx.Gtk3/Input/GTK3/GTK3Mouse.cs

@@ -1,90 +0,0 @@
-using Ryujinx.Common.Configuration.Hid;
-using System;
-using System.Drawing;
-using System.Numerics;
-
-namespace Ryujinx.Input.GTK3
-{
-    public class GTK3Mouse : IMouse
-    {
-        private GTK3MouseDriver _driver;
-
-        public GamepadFeaturesFlag Features => throw new NotImplementedException();
-
-        public string Id => "0";
-
-        public string Name => "GTKMouse";
-
-        public bool IsConnected => true;
-
-        public bool[] Buttons => _driver.PressedButtons;
-
-        public GTK3Mouse(GTK3MouseDriver driver)
-        {
-            _driver = driver;
-        }
-
-        public Size ClientSize => _driver.GetClientSize();
-
-        public Vector2 GetPosition()
-        {
-            return _driver.CurrentPosition;
-        }
-
-        public Vector2 GetScroll()
-        {
-            return _driver.Scroll;
-        }
-
-        public GamepadStateSnapshot GetMappedStateSnapshot()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public GamepadStateSnapshot GetStateSnapshot()
-        {
-            throw new NotImplementedException();
-        }
-
-        public (float, float) GetStick(StickInputId inputId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsButtonPressed(MouseButton button)
-        {
-            return _driver.IsButtonPressed(button);
-        }
-
-        public bool IsPressed(GamepadButtonInputId inputId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetConfiguration(InputConfig configuration)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            _driver = null;
-        }
-    }
-}

src/Ryujinx.Gtk3/Input/GTK3/GTK3MouseDriver.cs

@@ -1,108 +0,0 @@
-using Gdk;
-using Gtk;
-using System;
-using System.Numerics;
-using Size = System.Drawing.Size;
-
-namespace Ryujinx.Input.GTK3
-{
-    public class GTK3MouseDriver : IGamepadDriver
-    {
-        private Widget _widget;
-        private bool _isDisposed;
-
-        public bool[] PressedButtons { get; }
-
-        public Vector2 CurrentPosition { get; private set; }
-        public Vector2 Scroll { get; private set; }
-
-        public GTK3MouseDriver(Widget parent)
-        {
-            _widget = parent;
-
-            _widget.MotionNotifyEvent += Parent_MotionNotifyEvent;
-            _widget.ButtonPressEvent += Parent_ButtonPressEvent;
-            _widget.ButtonReleaseEvent += Parent_ButtonReleaseEvent;
-            _widget.ScrollEvent += Parent_ScrollEvent;
-
-            PressedButtons = new bool[(int)MouseButton.Count];
-        }
-
-
-        [GLib.ConnectBefore]
-        private void Parent_ScrollEvent(object o, ScrollEventArgs args)
-        {
-            Scroll = new Vector2((float)args.Event.X, (float)args.Event.Y);
-        }
-
-        [GLib.ConnectBefore]
-        private void Parent_ButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
-        {
-            PressedButtons[args.Event.Button - 1] = false;
-        }
-
-        [GLib.ConnectBefore]
-        private void Parent_ButtonPressEvent(object o, ButtonPressEventArgs args)
-        {
-            PressedButtons[args.Event.Button - 1] = true;
-        }
-
-        [GLib.ConnectBefore]
-        private void Parent_MotionNotifyEvent(object o, MotionNotifyEventArgs args)
-        {
-            if (args.Event.Device.InputSource == InputSource.Mouse)
-            {
-                CurrentPosition = new Vector2((float)args.Event.X, (float)args.Event.Y);
-            }
-        }
-
-        public bool IsButtonPressed(MouseButton button)
-        {
-            return PressedButtons[(int)button];
-        }
-
-        public Size GetClientSize()
-        {
-            return new Size(_widget.AllocatedWidth, _widget.AllocatedHeight);
-        }
-
-        public string DriverName => "GTK3";
-
-        public event Action<string> OnGamepadConnected
-        {
-            add { }
-            remove { }
-        }
-
-        public event Action<string> OnGamepadDisconnected
-        {
-            add { }
-            remove { }
-        }
-
-        public ReadOnlySpan<string> GamepadsIds => new[] { "0" };
-
-        public IGamepad GetGamepad(string id)
-        {
-            return new GTK3Mouse(this);
-        }
-
-        public void Dispose()
-        {
-            if (_isDisposed)
-            {
-                return;
-            }
-
-            GC.SuppressFinalize(this);
-
-            _isDisposed = true;
-
-            _widget.MotionNotifyEvent -= Parent_MotionNotifyEvent;
-            _widget.ButtonPressEvent -= Parent_ButtonPressEvent;
-            _widget.ButtonReleaseEvent -= Parent_ButtonReleaseEvent;
-
-            _widget = null;
-        }
-    }
-}

src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.cs

@@ -1,95 +0,0 @@
-using Gdk;
-using Gtk;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.UI;
-using Ryujinx.UI.Common.Configuration;
-using Ryujinx.UI.Common.Helper;
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-namespace Ryujinx.Modules
-{
-    public class UpdateDialog : Gtk.Window
-    {
-#pragma warning disable CS0649, IDE0044 // Field is never assigned to, Add readonly modifier
-        [Builder.Object] public Label MainText;
-        [Builder.Object] public Label SecondaryText;
-        [Builder.Object] public LevelBar ProgressBar;
-        [Builder.Object] public Button YesButton;
-        [Builder.Object] public Button NoButton;
-#pragma warning restore CS0649, IDE0044
-
-        private readonly MainWindow _mainWindow;
-        private readonly string _buildUrl;
-        private bool _restartQuery;
-
-        public UpdateDialog(MainWindow mainWindow, Version newVersion, string buildUrl) : this(new Builder("Ryujinx.Gtk3.Modules.Updater.UpdateDialog.glade"), mainWindow, newVersion, buildUrl) { }
-
-        private UpdateDialog(Builder builder, MainWindow mainWindow, Version newVersion, string buildUrl) : base(builder.GetRawOwnedObject("UpdateDialog"))
-        {
-            builder.Autoconnect(this);
-
-            _mainWindow = mainWindow;
-            _buildUrl = buildUrl;
-
-            Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png");
-            MainText.Text = "Do you want to update Ryujinx to the latest version?";
-            SecondaryText.Text = $"{Program.Version} -> {newVersion}";
-
-            ProgressBar.Hide();
-
-            YesButton.Clicked += YesButton_Clicked;
-            NoButton.Clicked += NoButton_Clicked;
-        }
-
-        private void YesButton_Clicked(object sender, EventArgs args)
-        {
-            if (_restartQuery)
-            {
-                string ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
-
-                ProcessStartInfo processStart = new(ryuName)
-                {
-                    UseShellExecute = true,
-                    WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory
-                };
-
-                foreach (string argument in CommandLineState.Arguments)
-                {
-                    processStart.ArgumentList.Add(argument);
-                }
-
-                Process.Start(processStart);
-
-                Environment.Exit(0);
-            }
-            else
-            {
-                Window.Functions = _mainWindow.Window.Functions = WMFunction.All & WMFunction.Close;
-                _mainWindow.ExitMenuItem.Sensitive = false;
-
-                YesButton.Hide();
-                NoButton.Hide();
-                ProgressBar.Show();
-
-                SecondaryText.Text = "";
-                _restartQuery = true;
-
-                Updater.UpdateRyujinx(this, _buildUrl);
-            }
-        }
-
-        private void NoButton_Clicked(object sender, EventArgs args)
-        {
-            Updater.Running = false;
-            _mainWindow.Window.Functions = WMFunction.All;
-
-            _mainWindow.ExitMenuItem.Sensitive = true;
-            _mainWindow.UpdateMenuItem.Sensitive = true;
-
-            Dispose();
-        }
-    }
-}

src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.glade

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="UpdateDialog">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Ryujinx - Updater</property>
-    <property name="resizable">False</property>
-    <property name="window_position">center</property>
-    <property name="default_width">400</property>
-    <property name="default_height">130</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="MainBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox" id="BodyBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel" id="MainText">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                  <attribute name="size" value="10000"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="SecondaryText">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLevelBar" id="ProgressBar">
-                <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="max_value">100</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="ButtonBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButton" id="YesButton">
-                <property name="label" translatable="yes">Yes</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="NoButton">
-                <property name="label" translatable="yes">No</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="margin_left">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

src/Ryujinx.Gtk3/Modules/Updater/Updater.cs

@@ -1,622 +0,0 @@
-using Gtk;
-using ICSharpCode.SharpZipLib.GZip;
-using ICSharpCode.SharpZipLib.Tar;
-using ICSharpCode.SharpZipLib.Zip;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.UI;
-using Ryujinx.UI.Common.Models.Github;
-using Ryujinx.UI.Widgets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.NetworkInformation;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Modules
-{
-    public static class Updater
-    {
-        private const string GitHubApiUrl = "https://api.github.com";
-        private const int ConnectionCount = 4;
-
-        internal static bool Running;
-
-        private static readonly string _homeDir = AppDomain.CurrentDomain.BaseDirectory;
-        private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
-        private static readonly string _updatePublishDir = Path.Combine(_updateDir, "publish");
-
-        private static string _buildVer;
-        private static string _platformExt;
-        private static string _buildUrl;
-        private static long _buildSize;
-
-        private static readonly GithubReleasesJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
-
-        // On Windows, GtkSharp.Dependencies adds these extra dirs that must be cleaned during updates.
-        private static readonly string[] _windowsDependencyDirs = { "bin", "etc", "lib", "share" };
-
-        private static HttpClient ConstructHttpClient()
-        {
-            HttpClient result = new();
-
-            // Required by GitHub to interact with APIs.
-            result.DefaultRequestHeaders.Add("User-Agent", "Ryujinx-Updater/1.0.0");
-
-            return result;
-        }
-
-        public static async Task BeginParse(MainWindow mainWindow, bool showVersionUpToDate)
-        {
-            if (Running)
-            {
-                return;
-            }
-
-            Running = true;
-            mainWindow.UpdateMenuItem.Sensitive = false;
-
-            int artifactIndex = -1;
-
-            // Detect current platform
-            if (OperatingSystem.IsMacOS())
-            {
-                _platformExt = "osx_x64.zip";
-                artifactIndex = 1;
-            }
-            else if (OperatingSystem.IsWindows())
-            {
-                _platformExt = "win_x64.zip";
-                artifactIndex = 2;
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                var arch = RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm64" : "x64";
-                _platformExt = $"linux_{arch}.tar.gz";
-                artifactIndex = 0;
-            }
-
-            if (artifactIndex == -1)
-            {
-                GtkDialog.CreateErrorDialog("Your platform is not supported!");
-
-                return;
-            }
-
-            Version newVersion;
-            Version currentVersion;
-
-            try
-            {
-                currentVersion = Version.Parse(Program.Version);
-            }
-            catch
-            {
-                GtkDialog.CreateWarningDialog("Failed to convert the current Ryujinx version.", "Cancelling Update!");
-                Logger.Error?.Print(LogClass.Application, "Failed to convert the current Ryujinx version!");
-
-                return;
-            }
-
-            // Get latest version number from GitHub API
-            try
-            {
-                using HttpClient jsonClient = ConstructHttpClient();
-                string buildInfoUrl = $"{GitHubApiUrl}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
-
-                // Fetch latest build information
-                string fetchedJson = await jsonClient.GetStringAsync(buildInfoUrl);
-                var fetched = JsonHelper.Deserialize(fetchedJson, _serializerContext.GithubReleasesJsonResponse);
-                _buildVer = fetched.Name;
-
-                foreach (var asset in fetched.Assets)
-                {
-                    if (asset.Name.StartsWith("gtk-ryujinx") && asset.Name.EndsWith(_platformExt))
-                    {
-                        _buildUrl = asset.BrowserDownloadUrl;
-
-                        if (asset.State != "uploaded")
-                        {
-                            if (showVersionUpToDate)
-                            {
-                                GtkDialog.CreateUpdaterInfoDialog("You are already using the latest version of Ryujinx!", "");
-                            }
-
-                            return;
-                        }
-
-                        break;
-                    }
-                }
-
-                if (_buildUrl == null)
-                {
-                    if (showVersionUpToDate)
-                    {
-                        GtkDialog.CreateUpdaterInfoDialog("You are already using the latest version of Ryujinx!", "");
-                    }
-
-                    return;
-                }
-            }
-            catch (Exception exception)
-            {
-                Logger.Error?.Print(LogClass.Application, exception.Message);
-                GtkDialog.CreateErrorDialog("An error occurred when trying to get release information from GitHub Release. This can be caused if a new release is being compiled by GitHub Actions. Try again in a few minutes.");
-
-                return;
-            }
-
-            try
-            {
-                newVersion = Version.Parse(_buildVer);
-            }
-            catch
-            {
-                GtkDialog.CreateWarningDialog("Failed to convert the received Ryujinx version from GitHub Release.", "Cancelling Update!");
-                Logger.Error?.Print(LogClass.Application, "Failed to convert the received Ryujinx version from GitHub Release!");
-
-                return;
-            }
-
-            if (newVersion <= currentVersion)
-            {
-                if (showVersionUpToDate)
-                {
-                    GtkDialog.CreateUpdaterInfoDialog("You are already using the latest version of Ryujinx!", "");
-                }
-
-                Running = false;
-                mainWindow.UpdateMenuItem.Sensitive = true;
-
-                return;
-            }
-
-            // Fetch build size information to learn chunk sizes.
-            using HttpClient buildSizeClient = ConstructHttpClient();
-            try
-            {
-                buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0");
-
-                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_buildUrl), HttpCompletionOption.ResponseHeadersRead);
-
-                _buildSize = message.Content.Headers.ContentRange.Length.Value;
-            }
-            catch (Exception ex)
-            {
-                Logger.Warning?.Print(LogClass.Application, ex.Message);
-                Logger.Warning?.Print(LogClass.Application, "Couldn't determine build size for update, using single-threaded updater");
-
-                _buildSize = -1;
-            }
-
-            // Show a message asking the user if they want to update
-            UpdateDialog updateDialog = new(mainWindow, newVersion, _buildUrl);
-            updateDialog.Show();
-        }
-
-        public static void UpdateRyujinx(UpdateDialog updateDialog, string downloadUrl)
-        {
-            // Empty update dir, although it shouldn't ever have anything inside it
-            if (Directory.Exists(_updateDir))
-            {
-                Directory.Delete(_updateDir, true);
-            }
-
-            Directory.CreateDirectory(_updateDir);
-
-            string updateFile = Path.Combine(_updateDir, "update.bin");
-
-            // Download the update .zip
-            updateDialog.MainText.Text = "Downloading Update...";
-            updateDialog.ProgressBar.Value = 0;
-            updateDialog.ProgressBar.MaxValue = 100;
-
-            if (_buildSize >= 0)
-            {
-                DoUpdateWithMultipleThreads(updateDialog, downloadUrl, updateFile);
-            }
-            else
-            {
-                DoUpdateWithSingleThread(updateDialog, downloadUrl, updateFile);
-            }
-        }
-
-        private static void DoUpdateWithMultipleThreads(UpdateDialog updateDialog, string downloadUrl, string updateFile)
-        {
-            // Multi-Threaded Updater
-            long chunkSize = _buildSize / ConnectionCount;
-            long remainderChunk = _buildSize % ConnectionCount;
-
-            int completedRequests = 0;
-            int totalProgressPercentage = 0;
-            int[] progressPercentage = new int[ConnectionCount];
-
-            List<byte[]> list = new(ConnectionCount);
-            List<WebClient> webClients = new(ConnectionCount);
-
-            for (int i = 0; i < ConnectionCount; i++)
-            {
-                list.Add(Array.Empty<byte>());
-            }
-
-            for (int i = 0; i < ConnectionCount; i++)
-            {
-#pragma warning disable SYSLIB0014
-                // TODO: WebClient is obsolete and need to be replaced with a more complex logic using HttpClient.
-                using WebClient client = new();
-#pragma warning restore SYSLIB0014
-                webClients.Add(client);
-
-                if (i == ConnectionCount - 1)
-                {
-                    client.Headers.Add("Range", $"bytes={chunkSize * i}-{(chunkSize * (i + 1) - 1) + remainderChunk}");
-                }
-                else
-                {
-                    client.Headers.Add("Range", $"bytes={chunkSize * i}-{chunkSize * (i + 1) - 1}");
-                }
-
-                client.DownloadProgressChanged += (_, args) =>
-                {
-                    int index = (int)args.UserState;
-
-                    Interlocked.Add(ref totalProgressPercentage, -1 * progressPercentage[index]);
-                    Interlocked.Exchange(ref progressPercentage[index], args.ProgressPercentage);
-                    Interlocked.Add(ref totalProgressPercentage, args.ProgressPercentage);
-
-                    updateDialog.ProgressBar.Value = totalProgressPercentage / ConnectionCount;
-                };
-
-                client.DownloadDataCompleted += (_, args) =>
-                {
-                    int index = (int)args.UserState;
-
-                    if (args.Cancelled)
-                    {
-                        webClients[index].Dispose();
-
-                        return;
-                    }
-
-                    list[index] = args.Result;
-                    Interlocked.Increment(ref completedRequests);
-
-                    if (Equals(completedRequests, ConnectionCount))
-                    {
-                        byte[] mergedFileBytes = new byte[_buildSize];
-                        for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++)
-                        {
-                            Array.Copy(list[connectionIndex], 0, mergedFileBytes, destinationOffset, list[connectionIndex].Length);
-                            destinationOffset += list[connectionIndex].Length;
-                        }
-
-                        File.WriteAllBytes(updateFile, mergedFileBytes);
-
-                        try
-                        {
-                            InstallUpdate(updateDialog, updateFile);
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.Warning?.Print(LogClass.Application, e.Message);
-                            Logger.Warning?.Print(LogClass.Application, "Multi-Threaded update failed, falling back to single-threaded updater.");
-
-                            DoUpdateWithSingleThread(updateDialog, downloadUrl, updateFile);
-
-                            return;
-                        }
-                    }
-                };
-
-                try
-                {
-                    client.DownloadDataAsync(new Uri(downloadUrl), i);
-                }
-                catch (WebException ex)
-                {
-                    Logger.Warning?.Print(LogClass.Application, ex.Message);
-                    Logger.Warning?.Print(LogClass.Application, "Multi-Threaded update failed, falling back to single-threaded updater.");
-
-                    foreach (WebClient webClient in webClients)
-                    {
-                        webClient.CancelAsync();
-                    }
-
-                    DoUpdateWithSingleThread(updateDialog, downloadUrl, updateFile);
-
-                    return;
-                }
-            }
-        }
-
-        private static void DoUpdateWithSingleThreadWorker(UpdateDialog updateDialog, string downloadUrl, string updateFile)
-        {
-            using HttpClient client = new();
-            // We do not want to timeout while downloading
-            client.Timeout = TimeSpan.FromDays(1);
-
-            using HttpResponseMessage response = client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead).Result;
-            using Stream remoteFileStream = response.Content.ReadAsStreamAsync().Result;
-            using Stream updateFileStream = File.Open(updateFile, FileMode.Create);
-
-            long totalBytes = response.Content.Headers.ContentLength.Value;
-            long byteWritten = 0;
-
-            byte[] buffer = new byte[32 * 1024];
-
-            while (true)
-            {
-                int readSize = remoteFileStream.Read(buffer);
-
-                if (readSize == 0)
-                {
-                    break;
-                }
-
-                byteWritten += readSize;
-
-                updateDialog.ProgressBar.Value = ((double)byteWritten / totalBytes) * 100;
-                updateFileStream.Write(buffer, 0, readSize);
-            }
-
-            InstallUpdate(updateDialog, updateFile);
-        }
-
-        private static void DoUpdateWithSingleThread(UpdateDialog updateDialog, string downloadUrl, string updateFile)
-        {
-            Thread worker = new(() => DoUpdateWithSingleThreadWorker(updateDialog, downloadUrl, updateFile))
-            {
-                Name = "Updater.SingleThreadWorker",
-            };
-            worker.Start();
-        }
-
-        private static async void InstallUpdate(UpdateDialog updateDialog, string updateFile)
-        {
-            // Extract Update
-            updateDialog.MainText.Text = "Extracting Update...";
-            updateDialog.ProgressBar.Value = 0;
-
-            if (OperatingSystem.IsLinux())
-            {
-                using Stream inStream = File.OpenRead(updateFile);
-                using Stream gzipStream = new GZipInputStream(inStream);
-                using TarInputStream tarStream = new(gzipStream, Encoding.ASCII);
-                updateDialog.ProgressBar.MaxValue = inStream.Length;
-
-                await Task.Run(() =>
-                {
-                    TarEntry tarEntry;
-
-                    if (!OperatingSystem.IsWindows())
-                    {
-                        while ((tarEntry = tarStream.GetNextEntry()) != null)
-                        {
-                            if (tarEntry.IsDirectory)
-                            {
-                                continue;
-                            }
-
-                            string outPath = Path.Combine(_updateDir, tarEntry.Name);
-
-                            Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                            using FileStream outStream = File.OpenWrite(outPath);
-                            tarStream.CopyEntryContents(outStream);
-
-                            File.SetUnixFileMode(outPath, (UnixFileMode)tarEntry.TarHeader.Mode);
-                            File.SetLastWriteTime(outPath, DateTime.SpecifyKind(tarEntry.ModTime, DateTimeKind.Utc));
-
-                            TarEntry entry = tarEntry;
-
-                            Application.Invoke(delegate
-                            {
-                                updateDialog.ProgressBar.Value += entry.Size;
-                            });
-                        }
-                    }
-                });
-
-                updateDialog.ProgressBar.Value = inStream.Length;
-            }
-            else
-            {
-                using Stream inStream = File.OpenRead(updateFile);
-                using ZipFile zipFile = new(inStream);
-                updateDialog.ProgressBar.MaxValue = zipFile.Count;
-
-                await Task.Run(() =>
-                {
-                    foreach (ZipEntry zipEntry in zipFile)
-                    {
-                        if (zipEntry.IsDirectory)
-                        {
-                            continue;
-                        }
-
-                        string outPath = Path.Combine(_updateDir, zipEntry.Name);
-
-                        Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                        using Stream zipStream = zipFile.GetInputStream(zipEntry);
-                        using FileStream outStream = File.OpenWrite(outPath);
-                        zipStream.CopyTo(outStream);
-
-                        File.SetLastWriteTime(outPath, DateTime.SpecifyKind(zipEntry.DateTime, DateTimeKind.Utc));
-
-                        Application.Invoke(delegate
-                        {
-                            updateDialog.ProgressBar.Value++;
-                        });
-                    }
-                });
-            }
-
-            // Delete downloaded zip
-            File.Delete(updateFile);
-
-            List<string> allFiles = EnumerateFilesToDelete().ToList();
-
-            updateDialog.MainText.Text = "Renaming Old Files...";
-            updateDialog.ProgressBar.Value = 0;
-            updateDialog.ProgressBar.MaxValue = allFiles.Count;
-
-            // Replace old files
-            await Task.Run(() =>
-            {
-                foreach (string file in allFiles)
-                {
-                    try
-                    {
-                        File.Move(file, file + ".ryuold");
-
-                        Application.Invoke(delegate
-                        {
-                            updateDialog.ProgressBar.Value++;
-                        });
-                    }
-                    catch
-                    {
-                        Logger.Warning?.Print(LogClass.Application, "Updater was unable to rename file: " + file);
-                    }
-                }
-
-                Application.Invoke(delegate
-                {
-                    updateDialog.MainText.Text = "Adding New Files...";
-                    updateDialog.ProgressBar.Value = 0;
-                    updateDialog.ProgressBar.MaxValue = Directory.GetFiles(_updatePublishDir, "*", SearchOption.AllDirectories).Length;
-                });
-
-                MoveAllFilesOver(_updatePublishDir, _homeDir, updateDialog);
-            });
-
-            Directory.Delete(_updateDir, true);
-
-            updateDialog.MainText.Text = "Update Complete!";
-            updateDialog.SecondaryText.Text = "Do you want to restart Ryujinx now?";
-            updateDialog.Modal = true;
-
-            updateDialog.ProgressBar.Hide();
-            updateDialog.YesButton.Show();
-            updateDialog.NoButton.Show();
-        }
-
-        public static bool CanUpdate(bool showWarnings)
-        {
-#if !DISABLE_UPDATER
-            if (!NetworkInterface.GetIsNetworkAvailable())
-            {
-                if (showWarnings)
-                {
-                    GtkDialog.CreateWarningDialog("You are not connected to the Internet!", "Please verify that you have a working Internet connection!");
-                }
-
-                return false;
-            }
-
-            if (Program.Version.Contains("dirty") || !ReleaseInformation.IsValid)
-            {
-                if (showWarnings)
-                {
-                    GtkDialog.CreateWarningDialog("You cannot update a Dirty build of Ryujinx!", "Please download Ryujinx at https://ryujinx.org/ if you are looking for a supported version.");
-                }
-
-                return false;
-            }
-
-            return true;
-#else
-            if (showWarnings)
-            {
-                if (ReleaseInformation.IsFlatHubBuild)
-                {
-                    GtkDialog.CreateWarningDialog("Updater Disabled!", "Please update Ryujinx via FlatHub.");
-                }
-                else
-                {
-                    GtkDialog.CreateWarningDialog("Updater Disabled!", "Please download Ryujinx at https://ryujinx.org/ if you are looking for a supported version.");
-                }
-            }
-
-            return false;
-#endif
-        }
-
-        // NOTE: This method should always reflect the latest build layout.
-        private static IEnumerable<string> EnumerateFilesToDelete()
-        {
-            var files = Directory.EnumerateFiles(_homeDir); // All files directly in base dir.
-
-            // Determine and exclude user files only when the updater is running, not when cleaning old files
-            if (Running)
-            {
-                // Compare the loose files in base directory against the loose files from the incoming update, and store foreign ones in a user list.
-                var oldFiles = Directory.EnumerateFiles(_homeDir, "*", SearchOption.TopDirectoryOnly).Select(Path.GetFileName);
-                var newFiles = Directory.EnumerateFiles(_updatePublishDir, "*", SearchOption.TopDirectoryOnly).Select(Path.GetFileName);
-                var userFiles = oldFiles.Except(newFiles).Select(filename => Path.Combine(_homeDir, filename));
-
-                // Remove user files from the paths in files.
-                files = files.Except(userFiles);
-            }
-
-            if (OperatingSystem.IsWindows())
-            {
-                foreach (string dir in _windowsDependencyDirs)
-                {
-                    string dirPath = Path.Combine(_homeDir, dir);
-                    if (Directory.Exists(dirPath))
-                    {
-                        files = files.Concat(Directory.EnumerateFiles(dirPath, "*", SearchOption.AllDirectories));
-                    }
-                }
-            }
-
-            return files.Where(f => !new FileInfo(f).Attributes.HasFlag(FileAttributes.Hidden | FileAttributes.System));
-        }
-
-        private static void MoveAllFilesOver(string root, string dest, UpdateDialog dialog)
-        {
-            foreach (string directory in Directory.GetDirectories(root))
-            {
-                string dirName = Path.GetFileName(directory);
-
-                if (!Directory.Exists(Path.Combine(dest, dirName)))
-                {
-                    Directory.CreateDirectory(Path.Combine(dest, dirName));
-                }
-
-                MoveAllFilesOver(directory, Path.Combine(dest, dirName), dialog);
-            }
-
-            foreach (string file in Directory.GetFiles(root))
-            {
-                File.Move(file, Path.Combine(dest, Path.GetFileName(file)), true);
-
-                Application.Invoke(delegate
-                {
-                    dialog.ProgressBar.Value++;
-                });
-            }
-        }
-
-        public static void CleanupUpdate()
-        {
-            foreach (string file in EnumerateFilesToDelete())
-            {
-                if (Path.GetExtension(file).EndsWith(".ryuold"))
-                {
-                    File.Delete(file);
-                }
-            }
-        }
-    }
-}

src/Ryujinx.Gtk3/Program.cs

@@ -1,403 +0,0 @@
-using Gtk;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.GraphicsDriver;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.SystemInterop;
-using Ryujinx.Common.Utilities;
-using Ryujinx.Graphics.Vulkan.MoltenVK;
-using Ryujinx.Modules;
-using Ryujinx.SDL2.Common;
-using Ryujinx.UI;
-using Ryujinx.UI.App.Common;
-using Ryujinx.UI.Common;
-using Ryujinx.UI.Common.Configuration;
-using Ryujinx.UI.Common.Helper;
-using Ryujinx.UI.Common.SystemInfo;
-using Ryujinx.UI.Widgets;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Ryujinx
-{
-    partial class Program
-    {
-        public static double WindowScaleFactor { get; private set; }
-
-        public static string Version { get; private set; }
-
-        public static string ConfigurationPath { get; set; }
-
-        public static string CommandLineProfile { get; set; }
-
-        private const string X11LibraryName = "libX11";
-
-        [LibraryImport(X11LibraryName)]
-        private static partial int XInitThreads();
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        public static partial int MessageBoxA(IntPtr hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
-
-        private const uint MbIconWarning = 0x30;
-
-        static Program()
-        {
-            if (OperatingSystem.IsLinux())
-            {
-                NativeLibrary.SetDllImportResolver(typeof(Program).Assembly, (name, assembly, path) =>
-                {
-                    if (name != X11LibraryName)
-                    {
-                        return IntPtr.Zero;
-                    }
-
-                    if (!NativeLibrary.TryLoad("libX11.so.6", assembly, path, out IntPtr result))
-                    {
-                        if (!NativeLibrary.TryLoad("libX11.so", assembly, path, out result))
-                        {
-                            return IntPtr.Zero;
-                        }
-                    }
-
-                    return result;
-                });
-            }
-        }
-
-        static void Main(string[] args)
-        {
-            Version = ReleaseInformation.Version;
-
-            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
-            {
-                MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 1803 and newer.\n", $"Ryujinx {Version}", MbIconWarning);
-            }
-
-            // Parse arguments
-            CommandLineState.ParseArguments(args);
-
-            // Hook unhandled exception and process exit events.
-            GLib.ExceptionManager.UnhandledException += (GLib.UnhandledExceptionArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
-            AppDomain.CurrentDomain.UnhandledException += (object sender, UnhandledExceptionEventArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
-            AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) => Exit();
-
-            // Make process DPI aware for proper window sizing on high-res screens.
-            ForceDpiAware.Windows();
-            WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
-
-            // Delete backup files after updating.
-            Task.Run(Updater.CleanupUpdate);
-
-            Console.Title = $"Ryujinx Console {Version}";
-
-            // NOTE: GTK3 doesn't init X11 in a multi threaded way.
-            // This ends up causing race condition and abort of XCB when a context is created by SPB (even if SPB do call XInitThreads).
-            if (OperatingSystem.IsLinux())
-            {
-                if (XInitThreads() == 0)
-                {
-                    throw new NotSupportedException("Failed to initialize multi-threading support.");
-                }
-
-                OsUtils.SetEnvironmentVariableNoCaching("GDK_BACKEND", "x11");
-            }
-
-            if (OperatingSystem.IsMacOS())
-            {
-                MVKInitialization.InitializeResolver();
-
-                string baseDirectory = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
-                string resourcesDataDir;
-
-                if (Path.GetFileName(baseDirectory) == "MacOS")
-                {
-                    resourcesDataDir = Path.Combine(Directory.GetParent(baseDirectory).FullName, "Resources");
-                }
-                else
-                {
-                    resourcesDataDir = baseDirectory;
-                }
-
-                // On macOS, GTK3 needs XDG_DATA_DIRS to be set, otherwise it will try searching for "gschemas.compiled" in system directories.
-                OsUtils.SetEnvironmentVariableNoCaching("XDG_DATA_DIRS", Path.Combine(resourcesDataDir, "share"));
-
-                // On macOS, GTK3 needs GDK_PIXBUF_MODULE_FILE to be set, otherwise it will try searching for "loaders.cache" in system directories.
-                OsUtils.SetEnvironmentVariableNoCaching("GDK_PIXBUF_MODULE_FILE", Path.Combine(resourcesDataDir, "lib", "gdk-pixbuf-2.0", "2.10.0", "loaders.cache"));
-
-                OsUtils.SetEnvironmentVariableNoCaching("GTK_IM_MODULE_FILE", Path.Combine(resourcesDataDir, "lib", "gtk-3.0", "3.0.0", "immodules.cache"));
-            }
-
-            string systemPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
-            Environment.SetEnvironmentVariable("Path", $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin")};{systemPath}");
-
-            // Setup base data directory.
-            AppDataManager.Initialize(CommandLineState.BaseDirPathArg);
-
-            // Initialize the configuration.
-            ConfigurationState.Initialize();
-
-            // Initialize the logger system.
-            LoggerModule.Initialize();
-
-            // Initialize Discord integration.
-            DiscordIntegrationModule.Initialize();
-
-            // Initialize SDL2 driver
-            SDL2Driver.MainThreadDispatcher = action =>
-            {
-                Application.Invoke(delegate
-                {
-                    action();
-                });
-            };
-
-            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
-            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
-
-            // Now load the configuration as the other subsystems are now registered
-            ConfigurationPath = File.Exists(localConfigurationPath)
-                ? localConfigurationPath
-                : File.Exists(appDataConfigurationPath)
-                    ? appDataConfigurationPath
-                    : null;
-
-            if (ConfigurationPath == null)
-            {
-                // No configuration, we load the default values and save it to disk
-                ConfigurationPath = appDataConfigurationPath;
-                Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}");
-
-                ConfigurationState.Instance.LoadDefault();
-                ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
-            }
-            else
-            {
-                Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}");
-
-                if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
-                {
-                    ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
-                }
-                else
-                {
-                    Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
-
-                    ConfigurationState.Instance.LoadDefault();
-                }
-            }
-
-            // Check if graphics backend was overridden.
-            if (CommandLineState.OverrideGraphicsBackend != null)
-            {
-                if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.OpenGl;
-                }
-                else if (CommandLineState.OverrideGraphicsBackend.ToLower() == "vulkan")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.Vulkan;
-                }
-            }
-
-            // Check if HideCursor was overridden.
-            if (CommandLineState.OverrideHideCursor is not null)
-            {
-                ConfigurationState.Instance.HideCursor.Value = CommandLineState.OverrideHideCursor!.ToLower() switch
-                {
-                    "never" => HideCursorMode.Never,
-                    "onidle" => HideCursorMode.OnIdle,
-                    "always" => HideCursorMode.Always,
-                    _ => ConfigurationState.Instance.HideCursor.Value,
-                };
-            }
-
-            // Check if docked mode was overridden.
-            if (CommandLineState.OverrideDockedMode.HasValue)
-            {
-                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
-            }
-
-            // Logging system information.
-            PrintSystemInfo();
-
-            // Enable OGL multithreading on the driver, and some other flags.
-            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-            DriverUtilities.InitDriverConfig(threadingMode == BackendThreading.Off);
-
-            // Initialize Gtk.
-            Application.Init();
-
-            // Check if keys exists.
-            bool hasSystemProdKeys = File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys"));
-            bool hasCommonProdKeys = AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"));
-            if (!hasSystemProdKeys && !hasCommonProdKeys)
-            {
-                UserErrorDialog.CreateUserErrorDialog(UserError.NoKeys);
-            }
-
-            // Show the main window UI.
-            MainWindow mainWindow = new();
-            mainWindow.Show();
-
-            // Load the game table if no application was requested by the command line
-            if (CommandLineState.LaunchPathArg == null)
-            {
-                mainWindow.UpdateGameTable();
-            }
-
-            if (OperatingSystem.IsLinux())
-            {
-                int currentVmMaxMapCount = LinuxHelper.VmMaxMapCount;
-
-                if (LinuxHelper.VmMaxMapCount < LinuxHelper.RecommendedVmMaxMapCount)
-                {
-                    Logger.Warning?.Print(LogClass.Application, $"The value of vm.max_map_count is lower than {LinuxHelper.RecommendedVmMaxMapCount}. ({currentVmMaxMapCount})");
-
-                    if (LinuxHelper.PkExecPath is not null)
-                    {
-                        var buttonTexts = new Dictionary<int, string>()
-                        {
-                            { 0, "Yes, until the next restart" },
-                            { 1, "Yes, permanently" },
-                            { 2, "No" },
-                        };
-
-                        ResponseType response = GtkDialog.CreateCustomDialog(
-                            "Ryujinx - Low limit for memory mappings detected",
-                            $"Would you like to increase the value of vm.max_map_count to {LinuxHelper.RecommendedVmMaxMapCount}?",
-                            "Some games might try to create more memory mappings than currently allowed. " +
-                            "Ryujinx will crash as soon as this limit gets exceeded.",
-                            buttonTexts,
-                            MessageType.Question);
-
-                        int rc;
-
-                        switch ((int)response)
-                        {
-                            case 0:
-                                rc = LinuxHelper.RunPkExec($"echo {LinuxHelper.RecommendedVmMaxMapCount} > {LinuxHelper.VmMaxMapCountPath}");
-                                if (rc == 0)
-                                {
-                                    Logger.Info?.Print(LogClass.Application, $"vm.max_map_count set to {LinuxHelper.VmMaxMapCount} until the next restart.");
-                                }
-                                else
-                                {
-                                    Logger.Error?.Print(LogClass.Application, $"Unable to change vm.max_map_count. Process exited with code: {rc}");
-                                }
-                                break;
-                            case 1:
-                                rc = LinuxHelper.RunPkExec($"echo \"vm.max_map_count = {LinuxHelper.RecommendedVmMaxMapCount}\" > {LinuxHelper.SysCtlConfigPath} && sysctl -p {LinuxHelper.SysCtlConfigPath}");
-                                if (rc == 0)
-                                {
-                                    Logger.Info?.Print(LogClass.Application, $"vm.max_map_count set to {LinuxHelper.VmMaxMapCount}. Written to config: {LinuxHelper.SysCtlConfigPath}");
-                                }
-                                else
-                                {
-                                    Logger.Error?.Print(LogClass.Application, $"Unable to write new value for vm.max_map_count to config. Process exited with code: {rc}");
-                                }
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        GtkDialog.CreateWarningDialog(
-                            "Max amount of memory mappings is lower than recommended.",
-                            $"The current value of vm.max_map_count ({currentVmMaxMapCount}) is lower than {LinuxHelper.RecommendedVmMaxMapCount}." +
-                            "Some games might try to create more memory mappings than currently allowed. " +
-                            "Ryujinx will crash as soon as this limit gets exceeded.\n\n" +
-                            "You might want to either manually increase the limit or install pkexec, which allows Ryujinx to assist with that.");
-                    }
-                }
-            }
-
-            if (CommandLineState.LaunchPathArg != null)
-            {
-                if (mainWindow.ApplicationLibrary.TryGetApplicationsFromFile(CommandLineState.LaunchPathArg, out List<ApplicationData> applications))
-                {
-                    ApplicationData applicationData;
-
-                    if (CommandLineState.LaunchApplicationId != null)
-                    {
-                        applicationData = applications.Find(application => application.IdString == CommandLineState.LaunchApplicationId);
-
-                        if (applicationData != null)
-                        {
-                            mainWindow.RunApplication(applicationData, CommandLineState.StartFullscreenArg);
-                        }
-                        else
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Couldn't find requested application id '{CommandLineState.LaunchApplicationId}' in '{CommandLineState.LaunchPathArg}'.");
-                            UserErrorDialog.CreateUserErrorDialog(UserError.ApplicationNotFound);
-                        }
-                    }
-                    else
-                    {
-                        applicationData = applications[0];
-                        mainWindow.RunApplication(applicationData, CommandLineState.StartFullscreenArg);
-                    }
-                }
-                else
-                {
-                    Logger.Error?.Print(LogClass.Application, $"Couldn't find any application in '{CommandLineState.LaunchPathArg}'.");
-                    UserErrorDialog.CreateUserErrorDialog(UserError.ApplicationNotFound);
-                }
-            }
-
-            if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
-            {
-                Updater.BeginParse(mainWindow, false).ContinueWith(task =>
-                {
-                    Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}");
-                }, TaskContinuationOptions.OnlyOnFaulted);
-            }
-
-            Application.Run();
-        }
-
-        private static void PrintSystemInfo()
-        {
-            Logger.Notice.Print(LogClass.Application, $"Ryujinx Version: {Version}");
-            SystemInfo.Gather().Print();
-
-            var enabledLogs = Logger.GetEnabledLevels();
-            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(enabledLogs.Count == 0 ? "<None>" : string.Join(", ", enabledLogs))}");
-
-            if (AppDataManager.Mode == AppDataManager.LaunchMode.Custom)
-            {
-                Logger.Notice.Print(LogClass.Application, $"Launch Mode: Custom Path {AppDataManager.BaseDirPath}");
-            }
-            else
-            {
-                Logger.Notice.Print(LogClass.Application, $"Launch Mode: {AppDataManager.Mode}");
-            }
-        }
-
-        private static void ProcessUnhandledException(Exception ex, bool isTerminating)
-        {
-            string message = $"Unhandled exception caught: {ex}";
-
-            Logger.Error?.PrintMsg(LogClass.Application, message);
-
-            if (Logger.Error == null)
-            {
-                Logger.Notice.PrintMsg(LogClass.Application, message);
-            }
-
-            if (isTerminating)
-            {
-                Exit();
-            }
-        }
-
-        public static void Exit()
-        {
-            DiscordIntegrationModule.Exit();
-
-            Logger.Shutdown();
-        }
-    }
-}

src/Ryujinx.Gtk3/Ryujinx.Gtk3.csproj

@@ -1,103 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-    <OutputType>Exe</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>1.0.0-dirty</Version>
-    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
-    <!-- As we already provide GTK3 on Windows via GtkSharp.Dependencies this is redundant. -->
-    <SkipGtkInstall>true</SkipGtkInstall>
-    <TieredPGO>true</TieredPGO>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-    <PublishSingleFile>true</PublishSingleFile>
-    <TrimmerSingleWarn>false</TrimmerSingleWarn>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Ryujinx.GtkSharp" />
-    <PackageReference Include="GtkSharp.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="GtkSharp.Dependencies.osx" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
-    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
-    <PackageReference Include="OpenTK.Core" />
-    <PackageReference Include="OpenTK.Graphics" />
-    <PackageReference Include="SPB" />
-    <PackageReference Include="SharpZipLib" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
-    <ProjectReference Include="..\Ryujinx.UI.Common\Ryujinx.UI.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>alsoft.ini</TargetPath>
-    </Content>
-    <Content Include="..\..\distribution\legal\THIRDPARTY.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>THIRDPARTY.md</TargetPath>
-    </Content>
-    <Content Include="..\..\LICENSE.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>LICENSE.txt</TargetPath>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">
-    <Content Include="..\..\distribution\linux\Ryujinx.sh">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\distribution\linux\mime\Ryujinx.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>mime\Ryujinx.xml</TargetPath>
-    </Content>
-  </ItemGroup>
-
-  <!-- Due to .net core 3.1 embedded resource loading -->
-  <PropertyGroup>
-    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
-    <ApplicationIcon>Ryujinx.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="UI\MainWindow.glade" />
-    <None Remove="UI\Widgets\ProfileDialog.glade" />
-    <None Remove="UI\Windows\CheatWindow.glade" />
-    <None Remove="UI\Windows\ControllerWindow.glade" />
-    <None Remove="UI\Windows\DlcWindow.glade" />
-    <None Remove="UI\Windows\SettingsWindow.glade" />
-    <None Remove="UI\Windows\TitleUpdateWindow.glade" />
-    <None Remove="Modules\Updater\UpdateDialog.glade" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="UI\MainWindow.glade" />
-    <EmbeddedResource Include="UI\Widgets\ProfileDialog.glade" />
-    <EmbeddedResource Include="UI\Windows\CheatWindow.glade" />
-    <EmbeddedResource Include="UI\Windows\ControllerWindow.glade" />
-    <EmbeddedResource Include="UI\Windows\DlcWindow.glade" />
-    <EmbeddedResource Include="UI\Windows\SettingsWindow.glade" />
-    <EmbeddedResource Include="UI\Windows\TitleUpdateWindow.glade" />
-    <EmbeddedResource Include="Modules\Updater\UpdateDialog.glade" />
-  </ItemGroup>
-
-</Project>

src/Ryujinx.Gtk3/UI/Applet/ErrorAppletDialog.cs

@@ -1,31 +0,0 @@
-using Gtk;
-using Ryujinx.UI.Common.Configuration;
-using System.Reflection;
-
-namespace Ryujinx.UI.Applet
-{
-    internal class ErrorAppletDialog : MessageDialog
-    {
-        public ErrorAppletDialog(Window parentWindow, DialogFlags dialogFlags, MessageType messageType, string[] buttons) : base(parentWindow, dialogFlags, messageType, ButtonsType.None, null)
-        {
-            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png");
-
-            int responseId = 0;
-
-            if (buttons != null)
-            {
-                foreach (string buttonText in buttons)
-                {
-                    AddButton(buttonText, responseId);
-                    responseId++;
-                }
-            }
-            else
-            {
-                AddButton("OK", 0);
-            }
-
-            ShowAll();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Applet/GtkDynamicTextInputHandler.cs

@@ -1,108 +0,0 @@
-using Gtk;
-using Ryujinx.HLE.UI;
-using Ryujinx.Input.GTK3;
-using Ryujinx.UI.Widgets;
-using System.Threading;
-
-namespace Ryujinx.UI.Applet
-{
-    /// <summary>
-    /// Class that forwards key events to a GTK Entry so they can be processed into text.
-    /// </summary>
-    internal class GtkDynamicTextInputHandler : IDynamicTextInputHandler
-    {
-        private readonly Window _parent;
-        private readonly OffscreenWindow _inputToTextWindow = new();
-        private readonly RawInputToTextEntry _inputToTextEntry = new();
-
-        private bool _canProcessInput;
-
-        public event DynamicTextChangedHandler TextChangedEvent;
-        public event KeyPressedHandler KeyPressedEvent;
-        public event KeyReleasedHandler KeyReleasedEvent;
-
-        public bool TextProcessingEnabled
-        {
-            get
-            {
-                return Volatile.Read(ref _canProcessInput);
-            }
-
-            set
-            {
-                Volatile.Write(ref _canProcessInput, value);
-            }
-        }
-
-        public GtkDynamicTextInputHandler(Window parent)
-        {
-            _parent = parent;
-            _parent.KeyPressEvent += HandleKeyPressEvent;
-            _parent.KeyReleaseEvent += HandleKeyReleaseEvent;
-
-            _inputToTextWindow.Add(_inputToTextEntry);
-
-            _inputToTextEntry.TruncateMultiline = true;
-
-            // Start with input processing turned off so the text box won't accumulate text 
-            // if the user is playing on the keyboard.
-            _canProcessInput = false;
-        }
-
-        [GLib.ConnectBefore()]
-        private void HandleKeyPressEvent(object o, KeyPressEventArgs args)
-        {
-            var key = (Ryujinx.Common.Configuration.Hid.Key)GTK3MappingHelper.ToInputKey(args.Event.Key);
-
-            if (!(KeyPressedEvent?.Invoke(key)).GetValueOrDefault(true))
-            {
-                return;
-            }
-
-            if (_canProcessInput)
-            {
-                _inputToTextEntry.SendKeyPressEvent(o, args);
-                _inputToTextEntry.GetSelectionBounds(out int selectionStart, out int selectionEnd);
-                TextChangedEvent?.Invoke(_inputToTextEntry.Text, selectionStart, selectionEnd, _inputToTextEntry.OverwriteMode);
-            }
-        }
-
-        [GLib.ConnectBefore()]
-        private void HandleKeyReleaseEvent(object o, KeyReleaseEventArgs args)
-        {
-            var key = (Ryujinx.Common.Configuration.Hid.Key)GTK3MappingHelper.ToInputKey(args.Event.Key);
-
-            if (!(KeyReleasedEvent?.Invoke(key)).GetValueOrDefault(true))
-            {
-                return;
-            }
-
-            if (_canProcessInput)
-            {
-                // TODO (caian): This solution may have problems if the pause is sent after a key press
-                // and before a key release. But for now GTK Entry does not seem to use release events.
-                _inputToTextEntry.SendKeyReleaseEvent(o, args);
-                _inputToTextEntry.GetSelectionBounds(out int selectionStart, out int selectionEnd);
-                TextChangedEvent?.Invoke(_inputToTextEntry.Text, selectionStart, selectionEnd, _inputToTextEntry.OverwriteMode);
-            }
-        }
-
-        public void SetText(string text, int cursorBegin)
-        {
-            _inputToTextEntry.Text = text;
-            _inputToTextEntry.Position = cursorBegin;
-        }
-
-        public void SetText(string text, int cursorBegin, int cursorEnd)
-        {
-            _inputToTextEntry.Text = text;
-            _inputToTextEntry.SelectRegion(cursorBegin, cursorEnd);
-        }
-
-        public void Dispose()
-        {
-            _parent.KeyPressEvent -= HandleKeyPressEvent;
-            _parent.KeyReleaseEvent -= HandleKeyReleaseEvent;
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs

@@ -1,203 +0,0 @@
-using Gtk;
-using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
-using Ryujinx.HLE.UI;
-using Ryujinx.UI.Widgets;
-using System;
-using System.Threading;
-
-namespace Ryujinx.UI.Applet
-{
-    internal class GtkHostUIHandler : IHostUIHandler
-    {
-        private readonly Window _parent;
-
-        public IHostUITheme HostUITheme { get; }
-
-        public GtkHostUIHandler(Window parent)
-        {
-            _parent = parent;
-
-            HostUITheme = new GtkHostUITheme(parent);
-        }
-
-        public bool DisplayMessageDialog(ControllerAppletUIArgs args)
-        {
-            string playerCount = args.PlayerCountMin == args.PlayerCountMax ? $"exactly {args.PlayerCountMin}" : $"{args.PlayerCountMin}-{args.PlayerCountMax}";
-
-            string message = $"Application requests <b>{playerCount}</b> player(s) with:\n\n"
-                           + $"<tt><b>TYPES:</b> {args.SupportedStyles}</tt>\n\n"
-                           + $"<tt><b>PLAYERS:</b> {string.Join(", ", args.SupportedPlayers)}</tt>\n\n"
-                           + (args.IsDocked ? "Docked mode set. <tt>Handheld</tt> is also invalid.\n\n" : "")
-                           + "<i>Please reconfigure Input now and then press OK.</i>";
-
-            return DisplayMessageDialog("Controller Applet", message);
-        }
-
-        public bool DisplayMessageDialog(string title, string message)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool okPressed = false;
-
-            Application.Invoke(delegate
-            {
-                MessageDialog msgDialog = null;
-
-                try
-                {
-                    msgDialog = new MessageDialog(_parent, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, null)
-                    {
-                        Title = title,
-                        Text = message,
-                        UseMarkup = true,
-                    };
-
-                    msgDialog.SetDefaultSize(400, 0);
-
-                    msgDialog.Response += (object o, ResponseArgs args) =>
-                    {
-                        if (args.ResponseId == ResponseType.Ok)
-                        {
-                            okPressed = true;
-                        }
-
-                        dialogCloseEvent.Set();
-                        msgDialog?.Dispose();
-                    };
-
-                    msgDialog.Show();
-                }
-                catch (Exception ex)
-                {
-                    GtkDialog.CreateErrorDialog($"Error displaying Message Dialog: {ex}");
-
-                    dialogCloseEvent.Set();
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-
-            return okPressed;
-        }
-
-        public bool DisplayInputDialog(SoftwareKeyboardUIArgs args, out string userText)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool okPressed = false;
-            bool error = false;
-            string inputText = args.InitialText ?? "";
-
-            Application.Invoke(delegate
-            {
-                try
-                {
-                    var swkbdDialog = new SwkbdAppletDialog(_parent)
-                    {
-                        Title = "Software Keyboard",
-                        Text = args.HeaderText,
-                        SecondaryText = args.SubtitleText,
-                    };
-
-                    swkbdDialog.InputEntry.Text = inputText;
-                    swkbdDialog.InputEntry.PlaceholderText = args.GuideText;
-                    swkbdDialog.OkButton.Label = args.SubmitText;
-
-                    swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
-                    swkbdDialog.SetInputValidation(args.KeyboardMode);
-
-                    ((MainWindow)_parent).RendererWidget.NpadManager.BlockInputUpdates();
-
-                    if (swkbdDialog.Run() == (int)ResponseType.Ok)
-                    {
-                        inputText = swkbdDialog.InputEntry.Text;
-                        okPressed = true;
-                    }
-
-                    swkbdDialog.Dispose();
-                }
-                catch (Exception ex)
-                {
-                    error = true;
-
-                    GtkDialog.CreateErrorDialog($"Error displaying Software Keyboard: {ex}");
-                }
-                finally
-                {
-                    dialogCloseEvent.Set();
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-            ((MainWindow)_parent).RendererWidget.NpadManager.UnblockInputUpdates();
-
-            userText = error ? null : inputText;
-
-            return error || okPressed;
-        }
-
-        public void ExecuteProgram(HLE.Switch device, ProgramSpecifyKind kind, ulong value)
-        {
-            device.Configuration.UserChannelPersistence.ExecuteProgram(kind, value);
-            ((MainWindow)_parent).RendererWidget?.Exit();
-        }
-
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool showDetails = false;
-
-            Application.Invoke(delegate
-            {
-                try
-                {
-                    ErrorAppletDialog msgDialog = new(_parent, DialogFlags.DestroyWithParent, MessageType.Error, buttons)
-                    {
-                        Title = title,
-                        Text = message,
-                        UseMarkup = true,
-                        WindowPosition = WindowPosition.CenterAlways,
-                    };
-
-                    msgDialog.SetDefaultSize(400, 0);
-
-                    msgDialog.Response += (object o, ResponseArgs args) =>
-                    {
-                        if (buttons != null)
-                        {
-                            if (buttons.Length > 1)
-                            {
-                                if (args.ResponseId != (ResponseType)(buttons.Length - 1))
-                                {
-                                    showDetails = true;
-                                }
-                            }
-                        }
-
-                        dialogCloseEvent.Set();
-                        msgDialog?.Dispose();
-                    };
-
-                    msgDialog.Show();
-                }
-                catch (Exception ex)
-                {
-                    GtkDialog.CreateErrorDialog($"Error displaying ErrorApplet Dialog: {ex}");
-
-                    dialogCloseEvent.Set();
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-
-            return showDetails;
-        }
-
-        public IDynamicTextInputHandler CreateDynamicTextInputHandler()
-        {
-            return new GtkDynamicTextInputHandler(_parent);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Applet/GtkHostUITheme.cs

@@ -1,90 +0,0 @@
-using Gtk;
-using Ryujinx.HLE.UI;
-using System.Diagnostics;
-
-namespace Ryujinx.UI.Applet
-{
-    internal class GtkHostUITheme : IHostUITheme
-    {
-        private const int RenderSurfaceWidth = 32;
-        private const int RenderSurfaceHeight = 32;
-
-        public string FontFamily { get; private set; }
-
-        public ThemeColor DefaultBackgroundColor { get; }
-        public ThemeColor DefaultForegroundColor { get; }
-        public ThemeColor DefaultBorderColor { get; }
-        public ThemeColor SelectionBackgroundColor { get; }
-        public ThemeColor SelectionForegroundColor { get; }
-
-        public GtkHostUITheme(Window parent)
-        {
-            Entry entry = new();
-            entry.SetStateFlags(StateFlags.Selected, true);
-
-            // Get the font and some colors directly from GTK.
-            FontFamily = entry.PangoContext.FontDescription.Family;
-
-            // Get foreground colors from the style context.
-
-            var defaultForegroundColor = entry.StyleContext.GetColor(StateFlags.Normal);
-            var selectedForegroundColor = entry.StyleContext.GetColor(StateFlags.Selected);
-
-            DefaultForegroundColor = new ThemeColor((float)defaultForegroundColor.Alpha, (float)defaultForegroundColor.Red, (float)defaultForegroundColor.Green, (float)defaultForegroundColor.Blue);
-            SelectionForegroundColor = new ThemeColor((float)selectedForegroundColor.Alpha, (float)selectedForegroundColor.Red, (float)selectedForegroundColor.Green, (float)selectedForegroundColor.Blue);
-
-            ListBoxRow row = new();
-            row.SetStateFlags(StateFlags.Selected, true);
-
-            // Request the main thread to render some UI elements to an image to get an approximation for the color.
-            // NOTE (caian): This will only take the color of the top-left corner of the background, which may be incorrect
-            // if someone provides a custom style with a gradient or image.
-
-            using (var surface = new Cairo.ImageSurface(Cairo.Format.Argb32, RenderSurfaceWidth, RenderSurfaceHeight))
-            using (var context = new Cairo.Context(surface))
-            {
-                context.SetSourceRGBA(1, 1, 1, 1);
-                context.Rectangle(0, 0, RenderSurfaceWidth, RenderSurfaceHeight);
-                context.Fill();
-
-                // The background color must be from the main Window because entry uses a different color.
-                parent.StyleContext.RenderBackground(context, 0, 0, RenderSurfaceWidth, RenderSurfaceHeight);
-
-                DefaultBackgroundColor = ToThemeColor(surface.Data);
-
-                context.SetSourceRGBA(1, 1, 1, 1);
-                context.Rectangle(0, 0, RenderSurfaceWidth, RenderSurfaceHeight);
-                context.Fill();
-
-                // Use the background color of the list box row when selected as the text box frame color because they are the
-                // same in the default theme.
-                row.StyleContext.RenderBackground(context, 0, 0, RenderSurfaceWidth, RenderSurfaceHeight);
-
-                DefaultBorderColor = ToThemeColor(surface.Data);
-            }
-
-            // Use the border color as the text selection color.
-            SelectionBackgroundColor = DefaultBorderColor;
-        }
-
-        private static ThemeColor ToThemeColor(byte[] data)
-        {
-            Debug.Assert(data.Length == 4 * RenderSurfaceWidth * RenderSurfaceHeight);
-
-            // Take the center-bottom pixel of the surface.
-            int position = 4 * (RenderSurfaceWidth * (RenderSurfaceHeight - 1) + RenderSurfaceWidth / 2);
-
-            if (position + 4 > data.Length)
-            {
-                return new ThemeColor(1, 0, 0, 0);
-            }
-
-            float a = data[position + 3] / 255.0f;
-            float r = data[position + 2] / 255.0f;
-            float g = data[position + 1] / 255.0f;
-            float b = data[position + 0] / 255.0f;
-
-            return new ThemeColor(a, r, g, b);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Applet/SwkbdAppletDialog.cs

@@ -1,127 +0,0 @@
-using Gtk;
-using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
-using System;
-using System.Linq;
-
-namespace Ryujinx.UI.Applet
-{
-    public class SwkbdAppletDialog : MessageDialog
-    {
-        private int _inputMin;
-        private int _inputMax;
-#pragma warning disable IDE0052 // Remove unread private member
-        private KeyboardMode _mode;
-#pragma warning restore IDE0052
-
-        private string _validationInfoText = "";
-
-        private Predicate<int> _checkLength = _ => true;
-        private Predicate<string> _checkInput = _ => true;
-
-        private readonly Label _validationInfo;
-
-        public Entry InputEntry { get; }
-        public Button OkButton { get; }
-        public Button CancelButton { get; }
-
-        public SwkbdAppletDialog(Window parent) : base(parent, DialogFlags.Modal | DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.None, null)
-        {
-            SetDefaultSize(300, 0);
-
-            _validationInfo = new Label()
-            {
-                Visible = false,
-            };
-
-            InputEntry = new Entry()
-            {
-                Visible = true,
-            };
-
-            InputEntry.Activated += OnInputActivated;
-            InputEntry.Changed += OnInputChanged;
-
-            OkButton = (Button)AddButton("OK", ResponseType.Ok);
-            CancelButton = (Button)AddButton("Cancel", ResponseType.Cancel);
-
-            ((Box)MessageArea).PackEnd(_validationInfo, true, true, 0);
-            ((Box)MessageArea).PackEnd(InputEntry, true, true, 4);
-        }
-
-        private void ApplyValidationInfo()
-        {
-            _validationInfo.Visible = !string.IsNullOrEmpty(_validationInfoText);
-            _validationInfo.Markup = _validationInfoText;
-        }
-
-        public void SetInputLengthValidation(int min, int max)
-        {
-            _inputMin = Math.Min(min, max);
-            _inputMax = Math.Max(min, max);
-
-            _validationInfo.Visible = false;
-
-            if (_inputMin <= 0 && _inputMax == int.MaxValue) // Disable.
-            {
-                _validationInfo.Visible = false;
-
-                _checkLength = _ => true;
-            }
-            else if (_inputMin > 0 && _inputMax == int.MaxValue)
-            {
-                _validationInfoText = $"<i>Must be at least {_inputMin} characters long.</i> ";
-
-                _checkLength = length => _inputMin <= length;
-            }
-            else
-            {
-                _validationInfoText = $"<i>Must be {_inputMin}-{_inputMax} characters long.</i> ";
-
-                _checkLength = length => _inputMin <= length && length <= _inputMax;
-            }
-
-            ApplyValidationInfo();
-            OnInputChanged(this, EventArgs.Empty);
-        }
-
-        public void SetInputValidation(KeyboardMode mode)
-        {
-            _mode = mode;
-
-            switch (mode)
-            {
-                case KeyboardMode.Numeric:
-                    _validationInfoText += "<i>Must be 0-9 or '.' only.</i>";
-                    _checkInput = text => text.All(NumericCharacterValidation.IsNumeric);
-                    break;
-                case KeyboardMode.Alphabet:
-                    _validationInfoText += "<i>Must be non CJK-characters only.</i>";
-                    _checkInput = text => text.All(value => !CJKCharacterValidation.IsCJK(value));
-                    break;
-                case KeyboardMode.ASCII:
-                    _validationInfoText += "<i>Must be ASCII text only.</i>";
-                    _checkInput = text => text.All(char.IsAscii);
-                    break;
-                default:
-                    _checkInput = _ => true;
-                    break;
-            }
-
-            ApplyValidationInfo();
-            OnInputChanged(this, EventArgs.Empty);
-        }
-
-        private void OnInputActivated(object sender, EventArgs e)
-        {
-            if (OkButton.IsSensitive)
-            {
-                Respond(ResponseType.Ok);
-            }
-        }
-
-        private void OnInputChanged(object sender, EventArgs e)
-        {
-            OkButton.Sensitive = _checkLength(InputEntry.Text.Length) && _checkInput(InputEntry.Text);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Helper/ButtonHelper.cs

@@ -1,158 +0,0 @@
-using Ryujinx.Common.Configuration.Hid.Controller;
-using Ryujinx.Input;
-using System;
-using System.Collections.Generic;
-using Key = Ryujinx.Common.Configuration.Hid.Key;
-using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
-
-namespace Ryujinx.UI.Helper
-{
-    public static class ButtonHelper
-    {
-        private static readonly Dictionary<Key, string> _keysMap = new()
-        {
-            { Key.Unknown, "Unknown" },
-            { Key.ShiftLeft, "ShiftLeft" },
-            { Key.ShiftRight, "ShiftRight" },
-            { Key.ControlLeft, "CtrlLeft" },
-            { Key.ControlRight, "CtrlRight" },
-            { Key.AltLeft, OperatingSystem.IsMacOS() ? "OptLeft" : "AltLeft" },
-            { Key.AltRight, OperatingSystem.IsMacOS() ? "OptRight" : "AltRight" },
-            { Key.WinLeft, OperatingSystem.IsMacOS() ? "CmdLeft" : "WinLeft" },
-            { Key.WinRight, OperatingSystem.IsMacOS() ? "CmdRight" : "WinRight" },
-            { Key.Up, "Up" },
-            { Key.Down, "Down" },
-            { Key.Left, "Left" },
-            { Key.Right, "Right" },
-            { Key.Enter, "Enter" },
-            { Key.Escape, "Escape" },
-            { Key.Space, "Space" },
-            { Key.Tab, "Tab" },
-            { Key.BackSpace, "Backspace" },
-            { Key.Insert, "Insert" },
-            { Key.Delete, "Delete" },
-            { Key.PageUp, "PageUp" },
-            { Key.PageDown, "PageDown" },
-            { Key.Home, "Home" },
-            { Key.End, "End" },
-            { Key.CapsLock, "CapsLock" },
-            { Key.ScrollLock, "ScrollLock" },
-            { Key.PrintScreen, "PrintScreen" },
-            { Key.Pause, "Pause" },
-            { Key.NumLock, "NumLock" },
-            { Key.Clear, "Clear" },
-            { Key.Keypad0, "Keypad0" },
-            { Key.Keypad1, "Keypad1" },
-            { Key.Keypad2, "Keypad2" },
-            { Key.Keypad3, "Keypad3" },
-            { Key.Keypad4, "Keypad4" },
-            { Key.Keypad5, "Keypad5" },
-            { Key.Keypad6, "Keypad6" },
-            { Key.Keypad7, "Keypad7" },
-            { Key.Keypad8, "Keypad8" },
-            { Key.Keypad9, "Keypad9" },
-            { Key.KeypadDivide, "KeypadDivide" },
-            { Key.KeypadMultiply, "KeypadMultiply" },
-            { Key.KeypadSubtract, "KeypadSubtract" },
-            { Key.KeypadAdd, "KeypadAdd" },
-            { Key.KeypadDecimal, "KeypadDecimal" },
-            { Key.KeypadEnter, "KeypadEnter" },
-            { Key.Number0, "0" },
-            { Key.Number1, "1" },
-            { Key.Number2, "2" },
-            { Key.Number3, "3" },
-            { Key.Number4, "4" },
-            { Key.Number5, "5" },
-            { Key.Number6, "6" },
-            { Key.Number7, "7" },
-            { Key.Number8, "8" },
-            { Key.Number9, "9" },
-            { Key.Tilde, "~" },
-            { Key.Grave, "`" },
-            { Key.Minus, "-" },
-            { Key.Plus, "+" },
-            { Key.BracketLeft, "[" },
-            { Key.BracketRight, "]" },
-            { Key.Semicolon, ";" },
-            { Key.Quote, "'" },
-            { Key.Comma, "," },
-            { Key.Period, "." },
-            { Key.Slash, "/" },
-            { Key.BackSlash, "\\" },
-            { Key.Unbound, "Unbound" },
-        };
-
-        private static readonly Dictionary<GamepadInputId, string> _gamepadInputIdMap = new()
-        {
-            { GamepadInputId.LeftStick, "LeftStick" },
-            { GamepadInputId.RightStick, "RightStick" },
-            { GamepadInputId.LeftShoulder, "LeftShoulder" },
-            { GamepadInputId.RightShoulder, "RightShoulder" },
-            { GamepadInputId.LeftTrigger, "LeftTrigger" },
-            { GamepadInputId.RightTrigger, "RightTrigger" },
-            { GamepadInputId.DpadUp, "DpadUp" },
-            { GamepadInputId.DpadDown, "DpadDown" },
-            { GamepadInputId.DpadLeft, "DpadLeft" },
-            { GamepadInputId.DpadRight, "DpadRight" },
-            { GamepadInputId.Minus, "Minus" },
-            { GamepadInputId.Plus, "Plus" },
-            { GamepadInputId.Guide, "Guide" },
-            { GamepadInputId.Misc1, "Misc1" },
-            { GamepadInputId.Paddle1, "Paddle1" },
-            { GamepadInputId.Paddle2, "Paddle2" },
-            { GamepadInputId.Paddle3, "Paddle3" },
-            { GamepadInputId.Paddle4, "Paddle4" },
-            { GamepadInputId.Touchpad, "Touchpad" },
-            { GamepadInputId.SingleLeftTrigger0, "SingleLeftTrigger0" },
-            { GamepadInputId.SingleRightTrigger0, "SingleRightTrigger0" },
-            { GamepadInputId.SingleLeftTrigger1, "SingleLeftTrigger1" },
-            { GamepadInputId.SingleRightTrigger1, "SingleRightTrigger1" },
-            { GamepadInputId.Unbound, "Unbound" },
-        };
-
-        private static readonly Dictionary<StickInputId, string> _stickInputIdMap = new()
-        {
-            { StickInputId.Left, "StickLeft" },
-            { StickInputId.Right, "StickRight" },
-            { StickInputId.Unbound, "Unbound" },
-        };
-
-        public static string ToString(Button button)
-        {
-            string keyString = "";
-
-            switch (button.Type)
-            {
-                case ButtonType.Key:
-                    var key = button.AsHidType<Key>();
-
-                    if (!_keysMap.TryGetValue(button.AsHidType<Key>(), out keyString))
-                    {
-                        keyString = key.ToString();
-                    }
-
-                    break;
-                case ButtonType.GamepadButtonInputId:
-                    var gamepadButton = button.AsHidType<GamepadInputId>();
-
-                    if (!_gamepadInputIdMap.TryGetValue(button.AsHidType<GamepadInputId>(), out keyString))
-                    {
-                        keyString = gamepadButton.ToString();
-                    }
-
-                    break;
-                case ButtonType.StickId:
-                    var stickInput = button.AsHidType<StickInputId>();
-
-                    if (!_stickInputIdMap.TryGetValue(button.AsHidType<StickInputId>(), out keyString))
-                    {
-                        keyString = stickInput.ToString();
-                    }
-
-                    break;
-            }
-
-            return keyString;
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Helper/MetalHelper.cs

@@ -1,135 +0,0 @@
-using Gdk;
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.UI.Helper
-{
-    public delegate void UpdateBoundsCallbackDelegate(Window window);
-
-    [SupportedOSPlatform("macos")]
-    static partial class MetalHelper
-    {
-        private const string LibObjCImport = "/usr/lib/libobjc.A.dylib";
-
-        private readonly struct Selector
-        {
-            public readonly IntPtr NativePtr;
-
-            public unsafe Selector(string value)
-            {
-                int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
-                byte* data = stackalloc byte[size];
-
-                fixed (char* pValue = value)
-                {
-                    System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
-                }
-
-                NativePtr = sel_registerName(data);
-            }
-
-            public static implicit operator Selector(string value) => new(value);
-        }
-
-        private static unsafe IntPtr GetClass(string value)
-        {
-            int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
-            byte* data = stackalloc byte[size];
-
-            fixed (char* pValue = value)
-            {
-                System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
-            }
-
-            return objc_getClass(data);
-        }
-
-        private struct NsPoint
-        {
-            public double X;
-            public double Y;
-
-            public NsPoint(double x, double y)
-            {
-                X = x;
-                Y = y;
-            }
-        }
-
-        private struct NsRect
-        {
-            public NsPoint Pos;
-            public NsPoint Size;
-
-            public NsRect(double x, double y, double width, double height)
-            {
-                Pos = new NsPoint(x, y);
-                Size = new NsPoint(width, height);
-            }
-        }
-
-        public static IntPtr GetMetalLayer(Display display, Window window, out IntPtr nsView, out UpdateBoundsCallbackDelegate updateBounds)
-        {
-            nsView = gdk_quartz_window_get_nsview(window.Handle);
-
-            // Create a new CAMetalLayer.
-            IntPtr layerClass = GetClass("CAMetalLayer");
-            IntPtr metalLayer = IntPtr_objc_msgSend(layerClass, "alloc");
-            objc_msgSend(metalLayer, "init");
-
-            // Create a child NSView to render into.
-            IntPtr nsViewClass = GetClass("NSView");
-            IntPtr child = IntPtr_objc_msgSend(nsViewClass, "alloc");
-            objc_msgSend(child, "init", new NsRect());
-
-            // Add it as a child.
-            objc_msgSend(nsView, "addSubview:", child);
-
-            // Make its renderer our metal layer.
-            objc_msgSend(child, "setWantsLayer:", (byte)1);
-            objc_msgSend(child, "setLayer:", metalLayer);
-            objc_msgSend(metalLayer, "setContentsScale:", (double)display.GetMonitorAtWindow(window).ScaleFactor);
-
-            // Set the frame position/location.
-            updateBounds = (Window window) =>
-            {
-                window.GetPosition(out int x, out int y);
-                int width = window.Width;
-                int height = window.Height;
-                objc_msgSend(child, "setFrame:", new NsRect(x, y, width, height));
-            };
-
-            updateBounds(window);
-
-            return metalLayer;
-        }
-
-        [LibraryImport(LibObjCImport)]
-        private static unsafe partial IntPtr sel_registerName(byte* data);
-
-        [LibraryImport(LibObjCImport)]
-        private static unsafe partial IntPtr objc_getClass(byte* data);
-
-        [LibraryImport(LibObjCImport)]
-        private static partial void objc_msgSend(IntPtr receiver, Selector selector);
-
-        [LibraryImport(LibObjCImport)]
-        private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
-
-        [LibraryImport(LibObjCImport)]
-        private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
-
-        [LibraryImport(LibObjCImport)]
-        private static partial void objc_msgSend(IntPtr receiver, Selector selector, NsRect point);
-
-        [LibraryImport(LibObjCImport)]
-        private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
-
-        [LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")]
-        private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
-
-        [LibraryImport("libgdk-3.0.dylib")]
-        private static partial IntPtr gdk_quartz_window_get_nsview(IntPtr gdkWindow);
-    }
-}

src/Ryujinx.Gtk3/UI/Helper/SortHelper.cs

@@ -1,33 +0,0 @@
-using Gtk;
-using Ryujinx.UI.Common.Helper;
-using System;
-
-namespace Ryujinx.UI.Helper
-{
-    static class SortHelper
-    {
-        public static int TimePlayedSort(ITreeModel model, TreeIter a, TreeIter b)
-        {
-            TimeSpan aTimeSpan = ValueFormatUtils.ParseTimeSpan(model.GetValue(a, 5).ToString());
-            TimeSpan bTimeSpan = ValueFormatUtils.ParseTimeSpan(model.GetValue(b, 5).ToString());
-
-            return TimeSpan.Compare(aTimeSpan, bTimeSpan);
-        }
-
-        public static int LastPlayedSort(ITreeModel model, TreeIter a, TreeIter b)
-        {
-            DateTime aDateTime = ValueFormatUtils.ParseDateTime(model.GetValue(a, 6).ToString());
-            DateTime bDateTime = ValueFormatUtils.ParseDateTime(model.GetValue(b, 6).ToString());
-
-            return DateTime.Compare(aDateTime, bDateTime);
-        }
-
-        public static int FileSizeSort(ITreeModel model, TreeIter a, TreeIter b)
-        {
-            long aSize = ValueFormatUtils.ParseFileSize(model.GetValue(a, 8).ToString());
-            long bSize = ValueFormatUtils.ParseFileSize(model.GetValue(b, 8).ToString());
-
-            return aSize.CompareTo(bSize);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Helper/ThemeHelper.cs

@@ -1,36 +0,0 @@
-using Gtk;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.UI.Common.Configuration;
-using System.IO;
-
-namespace Ryujinx.UI.Helper
-{
-    static class ThemeHelper
-    {
-        public static void ApplyTheme()
-        {
-            if (!ConfigurationState.Instance.UI.EnableCustomTheme)
-            {
-                return;
-            }
-
-            if (File.Exists(ConfigurationState.Instance.UI.CustomThemePath) && (Path.GetExtension(ConfigurationState.Instance.UI.CustomThemePath) == ".css"))
-            {
-                CssProvider cssProvider = new();
-
-                cssProvider.LoadFromPath(ConfigurationState.Instance.UI.CustomThemePath);
-
-                StyleContext.AddProviderForScreen(Gdk.Screen.Default, cssProvider, 800);
-            }
-            else
-            {
-                Logger.Warning?.Print(LogClass.Application, $"The \"custom_theme_path\" section in \"{ReleaseInformation.ConfigName}\" contains an invalid path: \"{ConfigurationState.Instance.UI.CustomThemePath}\".");
-
-                ConfigurationState.Instance.UI.CustomThemePath.Value = "";
-                ConfigurationState.Instance.UI.EnableCustomTheme.Value = false;
-                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            }
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/OpenGLRenderer.cs

@@ -1,142 +0,0 @@
-using OpenTK.Graphics.OpenGL;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Input.HLE;
-using SPB.Graphics;
-using SPB.Graphics.Exceptions;
-using SPB.Graphics.OpenGL;
-using SPB.Platform;
-using SPB.Platform.GLX;
-using SPB.Platform.WGL;
-using SPB.Windowing;
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.UI
-{
-    public partial class OpenGLRenderer : RendererWidgetBase
-    {
-        private readonly GraphicsDebugLevel _glLogLevel;
-
-        private bool _initializedOpenGL;
-
-        private OpenGLContextBase _openGLContext;
-        private SwappableNativeWindowBase _nativeWindow;
-
-        public OpenGLRenderer(InputManager inputManager, GraphicsDebugLevel glLogLevel) : base(inputManager, glLogLevel)
-        {
-            _glLogLevel = glLogLevel;
-        }
-
-        protected override bool OnDrawn(Cairo.Context cr)
-        {
-            if (!_initializedOpenGL)
-            {
-                IntializeOpenGL();
-            }
-
-            return true;
-        }
-
-        private void IntializeOpenGL()
-        {
-            _nativeWindow = RetrieveNativeWindow();
-
-            Window.EnsureNative();
-
-            _openGLContext = PlatformHelper.CreateOpenGLContext(GetGraphicsMode(), 3, 3, _glLogLevel == GraphicsDebugLevel.None ? OpenGLContextFlags.Compat : OpenGLContextFlags.Compat | OpenGLContextFlags.Debug);
-            _openGLContext.Initialize(_nativeWindow);
-            _openGLContext.MakeCurrent(_nativeWindow);
-
-            // Release the GL exclusivity that SPB gave us as we aren't going to use it in GTK Thread.
-            _openGLContext.MakeCurrent(null);
-
-            WaitEvent.Set();
-
-            _initializedOpenGL = true;
-        }
-
-        private SwappableNativeWindowBase RetrieveNativeWindow()
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                IntPtr windowHandle = gdk_win32_window_get_handle(Window.Handle);
-
-                return new WGLWindow(new NativeHandle(windowHandle));
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                IntPtr displayHandle = gdk_x11_display_get_xdisplay(Display.Handle);
-                IntPtr windowHandle = gdk_x11_window_get_xid(Window.Handle);
-
-                return new GLXWindow(new NativeHandle(displayHandle), new NativeHandle(windowHandle));
-            }
-
-            throw new NotImplementedException();
-        }
-
-        [LibraryImport("libgdk-3-0.dll")]
-        private static partial IntPtr gdk_win32_window_get_handle(IntPtr d);
-
-        [LibraryImport("libgdk-3.so.0")]
-        private static partial IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
-
-        [LibraryImport("libgdk-3.so.0")]
-        private static partial IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
-
-        private static FramebufferFormat GetGraphicsMode()
-        {
-            return Environment.OSVersion.Platform == PlatformID.Unix ? new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false) : FramebufferFormat.Default;
-        }
-
-        public override void InitializeRenderer()
-        {
-            // First take exclusivity on the OpenGL context.
-            ((Graphics.OpenGL.OpenGLRenderer)Renderer).InitializeBackgroundContext(SPBOpenGLContext.CreateBackgroundContext(_openGLContext));
-
-            _openGLContext.MakeCurrent(_nativeWindow);
-
-            GL.ClearColor(0, 0, 0, 1.0f);
-            GL.Clear(ClearBufferMask.ColorBufferBit);
-            SwapBuffers();
-        }
-
-        public override void SwapBuffers()
-        {
-            _nativeWindow.SwapBuffers();
-        }
-
-        protected override string GetGpuBackendName()
-        {
-            return "OpenGL";
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            // Try to bind the OpenGL context before calling the shutdown event.
-            try
-            {
-                _openGLContext?.MakeCurrent(_nativeWindow);
-            }
-            catch (ContextException e)
-            {
-                Logger.Warning?.Print(LogClass.UI, $"Failed to bind OpenGL context: {e}");
-            }
-
-            Device?.DisposeGpu();
-            NpadManager.Dispose();
-
-            // Unbind context and destroy everything.
-            try
-            {
-                _openGLContext?.MakeCurrent(null);
-            }
-            catch (ContextException e)
-            {
-                Logger.Warning?.Print(LogClass.UI, $"Failed to unbind OpenGL context: {e}");
-            }
-
-            _openGLContext?.Dispose();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/OpenToolkitBindingsContext.cs

@@ -1,20 +0,0 @@
-using SPB.Graphics;
-using System;
-
-namespace Ryujinx.UI
-{
-    public class OpenToolkitBindingsContext : OpenTK.IBindingsContext
-    {
-        private readonly IBindingsContext _bindingContext;
-
-        public OpenToolkitBindingsContext(IBindingsContext bindingsContext)
-        {
-            _bindingContext = bindingsContext;
-        }
-
-        public IntPtr GetProcAddress(string procName)
-        {
-            return _bindingContext.GetProcAddress(procName);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/RendererWidgetBase.cs

@@ -1,813 +0,0 @@
-using Gdk;
-using Gtk;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.GAL.Multithreading;
-using Ryujinx.Graphics.Gpu;
-using Ryujinx.Input;
-using Ryujinx.Input.GTK3;
-using Ryujinx.Input.HLE;
-using Ryujinx.UI.Common.Configuration;
-using Ryujinx.UI.Common.Helper;
-using Ryujinx.UI.Widgets;
-using SkiaSharp;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Key = Ryujinx.Input.Key;
-using ScalingFilter = Ryujinx.Graphics.GAL.ScalingFilter;
-using Switch = Ryujinx.HLE.Switch;
-
-namespace Ryujinx.UI
-{
-    public abstract class RendererWidgetBase : DrawingArea
-    {
-        private const int SwitchPanelWidth = 1280;
-        private const int SwitchPanelHeight = 720;
-        private const int TargetFps = 60;
-        private const float MaxResolutionScale = 4.0f; // Max resolution hotkeys can scale to before wrapping.
-        private const float VolumeDelta = 0.05f;
-
-        public ManualResetEvent WaitEvent { get; set; }
-        public NpadManager NpadManager { get; }
-        public TouchScreenManager TouchScreenManager { get; }
-        public Switch Device { get; private set; }
-        public IRenderer Renderer { get; private set; }
-
-        public bool ScreenshotRequested { get; set; }
-        protected int WindowWidth { get; private set; }
-        protected int WindowHeight { get; private set; }
-
-        public static event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
-
-        private bool _isActive;
-        private bool _isStopped;
-
-        private bool _toggleFullscreen;
-        private bool _toggleDockedMode;
-
-        private readonly long _ticksPerFrame;
-
-        private long _ticks = 0;
-        private float _newVolume;
-
-        private readonly Stopwatch _chrono;
-
-        private KeyboardHotkeyState _prevHotkeyState;
-
-        private readonly ManualResetEvent _exitEvent;
-        private readonly ManualResetEvent _gpuDoneEvent;
-
-        private readonly CancellationTokenSource _gpuCancellationTokenSource;
-
-        // Hide Cursor
-        const int CursorHideIdleTime = 5; // seconds
-        private static readonly Cursor _invisibleCursor = new(Display.Default, CursorType.BlankCursor);
-        private long _lastCursorMoveTime;
-        private HideCursorMode _hideCursorMode;
-        private readonly InputManager _inputManager;
-        private readonly IKeyboard _keyboardInterface;
-        private readonly GraphicsDebugLevel _glLogLevel;
-        private string _gpuBackendName;
-        private string _gpuDriverName;
-        private bool _isMouseInClient;
-
-        public RendererWidgetBase(InputManager inputManager, GraphicsDebugLevel glLogLevel)
-        {
-            var mouseDriver = new GTK3MouseDriver(this);
-
-            _inputManager = inputManager;
-            _inputManager.SetMouseDriver(mouseDriver);
-            NpadManager = _inputManager.CreateNpadManager();
-            TouchScreenManager = _inputManager.CreateTouchScreenManager();
-            _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-
-            WaitEvent = new ManualResetEvent(false);
-
-            _glLogLevel = glLogLevel;
-
-            Destroyed += Renderer_Destroyed;
-
-            _chrono = new Stopwatch();
-
-            _ticksPerFrame = Stopwatch.Frequency / TargetFps;
-
-            AddEvents((int)(EventMask.ButtonPressMask
-                          | EventMask.ButtonReleaseMask
-                          | EventMask.PointerMotionMask
-                          | EventMask.ScrollMask
-                          | EventMask.EnterNotifyMask
-                          | EventMask.LeaveNotifyMask
-                          | EventMask.KeyPressMask
-                          | EventMask.KeyReleaseMask));
-
-            _exitEvent = new ManualResetEvent(false);
-            _gpuDoneEvent = new ManualResetEvent(false);
-
-            _gpuCancellationTokenSource = new CancellationTokenSource();
-
-            _hideCursorMode = ConfigurationState.Instance.HideCursor;
-            _lastCursorMoveTime = Stopwatch.GetTimestamp();
-
-            ConfigurationState.Instance.HideCursor.Event += HideCursorStateChanged;
-            ConfigurationState.Instance.Graphics.AntiAliasing.Event += UpdateAnriAliasing;
-            ConfigurationState.Instance.Graphics.ScalingFilter.Event += UpdateScalingFilter;
-            ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;
-        }
-
-        private void UpdateScalingFilterLevel(object sender, ReactiveEventArgs<int> e)
-        {
-            Renderer.Window.SetScalingFilter((ScalingFilter)ConfigurationState.Instance.Graphics.ScalingFilter.Value);
-            Renderer.Window.SetScalingFilterLevel(ConfigurationState.Instance.Graphics.ScalingFilterLevel.Value);
-        }
-
-        private void UpdateScalingFilter(object sender, ReactiveEventArgs<Ryujinx.Common.Configuration.ScalingFilter> e)
-        {
-            Renderer.Window.SetScalingFilter((ScalingFilter)ConfigurationState.Instance.Graphics.ScalingFilter.Value);
-            Renderer.Window.SetScalingFilterLevel(ConfigurationState.Instance.Graphics.ScalingFilterLevel.Value);
-        }
-
-        public abstract void InitializeRenderer();
-
-        public abstract void SwapBuffers();
-
-        protected abstract string GetGpuBackendName();
-
-        private string GetGpuDriverName()
-        {
-            return Renderer.GetHardwareInfo().GpuDriver;
-        }
-
-        private void HideCursorStateChanged(object sender, ReactiveEventArgs<HideCursorMode> state)
-        {
-            Application.Invoke(delegate
-            {
-                _hideCursorMode = state.NewValue;
-
-                switch (_hideCursorMode)
-                {
-                    case HideCursorMode.Never:
-                        Window.Cursor = null;
-                        break;
-                    case HideCursorMode.OnIdle:
-                        _lastCursorMoveTime = Stopwatch.GetTimestamp();
-                        break;
-                    case HideCursorMode.Always:
-                        Window.Cursor = _invisibleCursor;
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(state));
-                }
-            });
-        }
-
-        private void Renderer_Destroyed(object sender, EventArgs e)
-        {
-            ConfigurationState.Instance.HideCursor.Event -= HideCursorStateChanged;
-            ConfigurationState.Instance.Graphics.AntiAliasing.Event -= UpdateAnriAliasing;
-            ConfigurationState.Instance.Graphics.ScalingFilter.Event -= UpdateScalingFilter;
-            ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event -= UpdateScalingFilterLevel;
-
-            NpadManager.Dispose();
-            Dispose();
-        }
-
-        private void UpdateAnriAliasing(object sender, ReactiveEventArgs<Ryujinx.Common.Configuration.AntiAliasing> e)
-        {
-            Renderer?.Window.SetAntiAliasing((Graphics.GAL.AntiAliasing)e.NewValue);
-        }
-
-        protected override bool OnMotionNotifyEvent(EventMotion evnt)
-        {
-            if (_hideCursorMode == HideCursorMode.OnIdle)
-            {
-                _lastCursorMoveTime = Stopwatch.GetTimestamp();
-            }
-
-            if (ConfigurationState.Instance.Hid.EnableMouse)
-            {
-                Window.Cursor = _invisibleCursor;
-            }
-
-            _isMouseInClient = true;
-
-            return false;
-        }
-
-        protected override bool OnEnterNotifyEvent(EventCrossing evnt)
-        {
-            Window.Cursor = ConfigurationState.Instance.Hid.EnableMouse ? _invisibleCursor : null;
-
-            _isMouseInClient = true;
-
-            return base.OnEnterNotifyEvent(evnt);
-        }
-
-        protected override bool OnLeaveNotifyEvent(EventCrossing evnt)
-        {
-            Window.Cursor = null;
-
-            _isMouseInClient = false;
-
-            return base.OnLeaveNotifyEvent(evnt);
-        }
-
-        protected override void OnGetPreferredHeight(out int minimumHeight, out int naturalHeight)
-        {
-            Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
-
-            // If the monitor is at least 1080p, use the Switch panel size as minimal size.
-            if (monitor.Geometry.Height >= 1080)
-            {
-                minimumHeight = SwitchPanelHeight;
-            }
-            // Otherwise, we default minimal size to 480p 16:9.
-            else
-            {
-                minimumHeight = 480;
-            }
-
-            naturalHeight = minimumHeight;
-        }
-
-        protected override void OnGetPreferredWidth(out int minimumWidth, out int naturalWidth)
-        {
-            Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
-
-            // If the monitor is at least 1080p, use the Switch panel size as minimal size.
-            if (monitor.Geometry.Height >= 1080)
-            {
-                minimumWidth = SwitchPanelWidth;
-            }
-            // Otherwise, we default minimal size to 480p 16:9.
-            else
-            {
-                minimumWidth = 854;
-            }
-
-            naturalWidth = minimumWidth;
-        }
-
-        protected override bool OnConfigureEvent(EventConfigure evnt)
-        {
-            bool result = base.OnConfigureEvent(evnt);
-
-            Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
-
-            WindowWidth = evnt.Width * monitor.ScaleFactor;
-            WindowHeight = evnt.Height * monitor.ScaleFactor;
-
-            Renderer?.Window?.SetSize(WindowWidth, WindowHeight);
-
-            return result;
-        }
-
-        private void HandleScreenState(KeyboardStateSnapshot keyboard)
-        {
-            bool toggleFullscreen = keyboard.IsPressed(Key.F11)
-                                || ((keyboard.IsPressed(Key.AltLeft)
-                                || keyboard.IsPressed(Key.AltRight))
-                                && keyboard.IsPressed(Key.Enter))
-                                || keyboard.IsPressed(Key.Escape);
-
-            bool fullScreenToggled = ParentWindow.State.HasFlag(WindowState.Fullscreen);
-
-            if (toggleFullscreen != _toggleFullscreen)
-            {
-                if (toggleFullscreen)
-                {
-                    if (fullScreenToggled)
-                    {
-                        ParentWindow.Unfullscreen();
-                        (Toplevel as MainWindow)?.ToggleExtraWidgets(true);
-                    }
-                    else
-                    {
-                        if (keyboard.IsPressed(Key.Escape))
-                        {
-                            if (!ConfigurationState.Instance.ShowConfirmExit || GtkDialog.CreateExitDialog())
-                            {
-                                Exit();
-                            }
-                        }
-                        else
-                        {
-                            ParentWindow.Fullscreen();
-                            (Toplevel as MainWindow)?.ToggleExtraWidgets(false);
-                        }
-                    }
-                }
-            }
-
-            _toggleFullscreen = toggleFullscreen;
-
-            bool toggleDockedMode = keyboard.IsPressed(Key.F9);
-
-            if (toggleDockedMode != _toggleDockedMode)
-            {
-                if (toggleDockedMode)
-                {
-                    ConfigurationState.Instance.System.EnableDockedMode.Value =
-                        !ConfigurationState.Instance.System.EnableDockedMode.Value;
-                }
-            }
-
-            _toggleDockedMode = toggleDockedMode;
-
-            if (_isMouseInClient)
-            {
-                if (ConfigurationState.Instance.Hid.EnableMouse.Value)
-                {
-                    Window.Cursor = _invisibleCursor;
-                }
-                else
-                {
-                    switch (_hideCursorMode)
-                    {
-                        case HideCursorMode.OnIdle:
-                            long cursorMoveDelta = Stopwatch.GetTimestamp() - _lastCursorMoveTime;
-                            Window.Cursor = (cursorMoveDelta >= CursorHideIdleTime * Stopwatch.Frequency) ? _invisibleCursor : null;
-                            break;
-                        case HideCursorMode.Always:
-                            Window.Cursor = _invisibleCursor;
-                            break;
-                        case HideCursorMode.Never:
-                            Window.Cursor = null;
-                            break;
-                    }
-                }
-            }
-        }
-
-        public void Initialize(Switch device)
-        {
-            Device = device;
-
-            IRenderer renderer = Device.Gpu.Renderer;
-
-            if (renderer is ThreadedRenderer tr)
-            {
-                renderer = tr.BaseRenderer;
-            }
-
-            Renderer = renderer;
-            Renderer?.Window?.SetSize(WindowWidth, WindowHeight);
-
-            if (Renderer != null)
-            {
-                Renderer.ScreenCaptured += Renderer_ScreenCaptured;
-            }
-
-            NpadManager.Initialize(device, ConfigurationState.Instance.Hid.InputConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
-            TouchScreenManager.Initialize(device);
-        }
-
-        private unsafe void Renderer_ScreenCaptured(object sender, ScreenCaptureImageInfo e)
-        {
-            if (e.Data.Length > 0 && e.Height > 0 && e.Width > 0)
-            {
-                Task.Run(() =>
-                {
-                    lock (this)
-                    {
-                        string applicationName = Device.Processes.ActiveApplication.Name;
-                        string sanitizedApplicationName = FileSystemUtils.SanitizeFileName(applicationName);
-                        DateTime currentTime = DateTime.Now;
-
-                        string filename = $"{sanitizedApplicationName}_{currentTime.Year}-{currentTime.Month:D2}-{currentTime.Day:D2}_{currentTime.Hour:D2}-{currentTime.Minute:D2}-{currentTime.Second:D2}.png";
-
-                        string directory = AppDataManager.Mode switch
-                        {
-                            AppDataManager.LaunchMode.Portable or AppDataManager.LaunchMode.Custom => System.IO.Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
-                            _ => System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx"),
-                        };
-
-                        string path = System.IO.Path.Combine(directory, filename);
-
-                        try
-                        {
-                            Directory.CreateDirectory(directory);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Failed to create directory at path {directory}. Error : {ex.GetType().Name}", "Screenshot");
-
-                            return;
-                        }
-
-                        var colorType = e.IsBgra ? SKColorType.Bgra8888 : SKColorType.Rgba8888;
-                        using var image = new SKBitmap(new SKImageInfo(e.Width, e.Height, colorType, SKAlphaType.Premul));
-
-                        Marshal.Copy(e.Data, 0, image.GetPixels(), e.Data.Length);
-                        using var surface = SKSurface.Create(image.Info);
-                        var canvas = surface.Canvas;
-
-                        if (e.FlipX || e.FlipY)
-                        {
-                            canvas.Clear(SKColors.Transparent);
-
-                            float scaleX = e.FlipX ? -1 : 1;
-                            float scaleY = e.FlipY ? -1 : 1;
-
-                            var matrix = SKMatrix.CreateScale(scaleX, scaleY, image.Width / 2f, image.Height / 2f);
-
-                            canvas.SetMatrix(matrix);
-                        }
-                        canvas.DrawBitmap(image, new SKPoint());
-
-                        surface.Flush();
-                        using var snapshot = surface.Snapshot();
-                        using var encoded = snapshot.Encode(SKEncodedImageFormat.Png, 80);
-                        using var file = File.OpenWrite(path);
-                        encoded.SaveTo(file);
-
-                        image.Dispose();
-
-                        Logger.Notice.Print(LogClass.Application, $"Screenshot saved to {path}", "Screenshot");
-                    }
-                });
-            }
-            else
-            {
-                Logger.Error?.Print(LogClass.Application, $"Screenshot is empty. Size : {e.Data.Length} bytes. Resolution : {e.Width}x{e.Height}", "Screenshot");
-            }
-        }
-
-        public void Render()
-        {
-            Gtk.Window parent = Toplevel as Gtk.Window;
-            parent.Present();
-
-            InitializeRenderer();
-
-            Device.Gpu.Renderer.Initialize(_glLogLevel);
-
-            Renderer.Window.SetAntiAliasing((Graphics.GAL.AntiAliasing)ConfigurationState.Instance.Graphics.AntiAliasing.Value);
-            Renderer.Window.SetScalingFilter((Graphics.GAL.ScalingFilter)ConfigurationState.Instance.Graphics.ScalingFilter.Value);
-            Renderer.Window.SetScalingFilterLevel(ConfigurationState.Instance.Graphics.ScalingFilterLevel.Value);
-
-            _gpuBackendName = GetGpuBackendName();
-            _gpuDriverName = GetGpuDriverName();
-
-            Device.Gpu.Renderer.RunLoop(() =>
-            {
-                Device.Gpu.SetGpuThread();
-                Device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
-
-                Renderer.Window.ChangeVSyncMode(Device.EnableDeviceVsync);
-
-                (Toplevel as MainWindow)?.ActivatePauseMenu();
-
-                while (_isActive)
-                {
-                    if (_isStopped)
-                    {
-                        return;
-                    }
-
-                    _ticks += _chrono.ElapsedTicks;
-
-                    _chrono.Restart();
-
-                    if (Device.WaitFifo())
-                    {
-                        Device.Statistics.RecordFifoStart();
-                        Device.ProcessFrame();
-                        Device.Statistics.RecordFifoEnd();
-                    }
-
-                    while (Device.ConsumeFrameAvailable())
-                    {
-                        Device.PresentFrame(SwapBuffers);
-                    }
-
-                    if (_ticks >= _ticksPerFrame)
-                    {
-                        string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? "Docked" : "Handheld";
-                        float scale = GraphicsConfig.ResScale;
-                        if (scale != 1)
-                        {
-                            dockedMode += $" ({scale}x)";
-                        }
-
-                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                            Device.EnableDeviceVsync,
-                            Device.GetVolume(),
-                            _gpuBackendName,
-                            dockedMode,
-                            ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                            $"Game: {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
-                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
-                            $"GPU: {_gpuDriverName}"));
-
-                        _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
-                    }
-                }
-
-                // Make sure all commands in the run loop are fully executed before leaving the loop.
-                if (Device.Gpu.Renderer is ThreadedRenderer threaded)
-                {
-                    threaded.FlushThreadedCommands();
-                }
-
-                _gpuDoneEvent.Set();
-            });
-        }
-
-        public void Start()
-        {
-            _chrono.Restart();
-
-            _isActive = true;
-
-            Gtk.Window parent = Toplevel as Gtk.Window;
-
-            Application.Invoke(delegate
-            {
-                parent.Present();
-
-                var activeProcess = Device.Processes.ActiveApplication;
-
-                parent.Title = TitleHelper.ActiveApplicationTitle(activeProcess, Program.Version);
-            });
-
-            Thread renderLoopThread = new(Render)
-            {
-                Name = "GUI.RenderLoop",
-            };
-            renderLoopThread.Start();
-
-            Thread nvidiaStutterWorkaround = null;
-            if (Renderer is Graphics.OpenGL.OpenGLRenderer)
-            {
-                nvidiaStutterWorkaround = new Thread(NvidiaStutterWorkaround)
-                {
-                    Name = "GUI.NvidiaStutterWorkaround",
-                };
-                nvidiaStutterWorkaround.Start();
-            }
-
-            MainLoop();
-
-            // NOTE: The render loop is allowed to stay alive until the renderer itself is disposed, as it may handle resource dispose.
-            // We only need to wait for all commands submitted during the main gpu loop to be processed.
-            _gpuDoneEvent.WaitOne();
-            _gpuDoneEvent.Dispose();
-            nvidiaStutterWorkaround?.Join();
-
-            Exit();
-        }
-
-        public void Exit()
-        {
-            TouchScreenManager?.Dispose();
-            NpadManager?.Dispose();
-
-            if (_isStopped)
-            {
-                return;
-            }
-
-            _gpuCancellationTokenSource.Cancel();
-
-            _isStopped = true;
-
-            if (_isActive)
-            {
-                _isActive = false;
-
-                _exitEvent.WaitOne();
-                _exitEvent.Dispose();
-            }
-        }
-
-        private void NvidiaStutterWorkaround()
-        {
-            while (_isActive)
-            {
-                // When NVIDIA Threaded Optimization is on, the driver will snapshot all threads in the system whenever the application creates any new ones.
-                // The ThreadPool has something called a "GateThread" which terminates itself after some inactivity.
-                // However, it immediately starts up again, since the rules regarding when to terminate and when to start differ.
-                // This creates a new thread every second or so.
-                // The main problem with this is that the thread snapshot can take 70ms, is on the OpenGL thread and will delay rendering any graphics.
-                // This is a little over budget on a frame time of 16ms, so creates a large stutter.
-                // The solution is to keep the ThreadPool active so that it never has a reason to terminate the GateThread.
-
-                // TODO: This should be removed when the issue with the GateThread is resolved.
-
-                ThreadPool.QueueUserWorkItem((state) => { });
-                Thread.Sleep(300);
-            }
-        }
-
-        public void MainLoop()
-        {
-            while (_isActive)
-            {
-                UpdateFrame();
-
-                // Polling becomes expensive if it's not slept
-                Thread.Sleep(1);
-            }
-
-            _exitEvent.Set();
-        }
-
-        private bool UpdateFrame()
-        {
-            if (!_isActive)
-            {
-                return true;
-            }
-
-            if (_isStopped)
-            {
-                return false;
-            }
-
-            if ((Toplevel as MainWindow).IsFocused)
-            {
-                Application.Invoke(delegate
-                {
-                    KeyboardStateSnapshot keyboard = _keyboardInterface.GetKeyboardStateSnapshot();
-
-                    HandleScreenState(keyboard);
-
-                    if (keyboard.IsPressed(Key.Delete))
-                    {
-                        if (!ParentWindow.State.HasFlag(WindowState.Fullscreen))
-                        {
-                            Device.Processes.ActiveApplication.DiskCacheLoadState?.Cancel();
-                        }
-                    }
-                });
-            }
-
-            NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
-
-            if ((Toplevel as MainWindow).IsFocused)
-            {
-                KeyboardHotkeyState currentHotkeyState = GetHotkeyState();
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ToggleVSync) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ToggleVSync))
-                {
-                    Device.EnableDeviceVsync = !Device.EnableDeviceVsync;
-                }
-
-                if ((currentHotkeyState.HasFlag(KeyboardHotkeyState.Screenshot) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.Screenshot)) || ScreenshotRequested)
-                {
-                    ScreenshotRequested = false;
-
-                    Renderer.Screenshot();
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ShowUI) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ShowUI))
-                {
-                    (Toplevel as MainWindow).ToggleExtraWidgets(true);
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.Pause) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.Pause))
-                {
-                    (Toplevel as MainWindow)?.TogglePause();
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ToggleMute) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ToggleMute))
-                {
-                    if (Device.IsAudioMuted())
-                    {
-                        Device.SetVolume(ConfigurationState.Instance.System.AudioVolume);
-                    }
-                    else
-                    {
-                        Device.SetVolume(0);
-                    }
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ResScaleUp) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ResScaleUp))
-                {
-                    GraphicsConfig.ResScale = GraphicsConfig.ResScale % MaxResolutionScale + 1;
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ResScaleDown) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ResScaleDown))
-                {
-                    GraphicsConfig.ResScale =
-                    (MaxResolutionScale + GraphicsConfig.ResScale - 2) % MaxResolutionScale + 1;
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.VolumeUp) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.VolumeUp))
-                {
-                    _newVolume = MathF.Round((Device.GetVolume() + VolumeDelta), 2);
-                    Device.SetVolume(_newVolume);
-                }
-
-                if (currentHotkeyState.HasFlag(KeyboardHotkeyState.VolumeDown) &&
-                    !_prevHotkeyState.HasFlag(KeyboardHotkeyState.VolumeDown))
-                {
-                    _newVolume = MathF.Round((Device.GetVolume() - VolumeDelta), 2);
-                    Device.SetVolume(_newVolume);
-                }
-
-                _prevHotkeyState = currentHotkeyState;
-            }
-
-            // Touchscreen
-            bool hasTouch = false;
-
-            // Get screen touch position
-            if ((Toplevel as MainWindow).IsFocused && !ConfigurationState.Instance.Hid.EnableMouse)
-            {
-                hasTouch = TouchScreenManager.Update(true, (_inputManager.MouseDriver as GTK3MouseDriver).IsButtonPressed(MouseButton.Button1), ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
-            }
-
-            if (!hasTouch)
-            {
-                TouchScreenManager.Update(false);
-            }
-
-            Device.Hid.DebugPad.Update();
-
-            return true;
-        }
-
-        [Flags]
-        private enum KeyboardHotkeyState
-        {
-            None = 0,
-            ToggleVSync = 1 << 0,
-            Screenshot = 1 << 1,
-            ShowUI = 1 << 2,
-            Pause = 1 << 3,
-            ToggleMute = 1 << 4,
-            ResScaleUp = 1 << 5,
-            ResScaleDown = 1 << 6,
-            VolumeUp = 1 << 7,
-            VolumeDown = 1 << 8,
-        }
-
-        private KeyboardHotkeyState GetHotkeyState()
-        {
-            KeyboardHotkeyState state = KeyboardHotkeyState.None;
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ToggleVsync))
-            {
-                state |= KeyboardHotkeyState.ToggleVSync;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Screenshot))
-            {
-                state |= KeyboardHotkeyState.Screenshot;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUI))
-            {
-                state |= KeyboardHotkeyState.ShowUI;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Pause))
-            {
-                state |= KeyboardHotkeyState.Pause;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ToggleMute))
-            {
-                state |= KeyboardHotkeyState.ToggleMute;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ResScaleUp))
-            {
-                state |= KeyboardHotkeyState.ResScaleUp;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ResScaleDown))
-            {
-                state |= KeyboardHotkeyState.ResScaleDown;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.VolumeUp))
-            {
-                state |= KeyboardHotkeyState.VolumeUp;
-            }
-
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.VolumeDown))
-            {
-                state |= KeyboardHotkeyState.VolumeDown;
-            }
-
-            return state;
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/SPBOpenGLContext.cs

@@ -1,49 +0,0 @@
-using OpenTK.Graphics.OpenGL;
-using Ryujinx.Graphics.OpenGL;
-using SPB.Graphics;
-using SPB.Graphics.OpenGL;
-using SPB.Platform;
-using SPB.Windowing;
-
-namespace Ryujinx.UI
-{
-    class SPBOpenGLContext : IOpenGLContext
-    {
-        private readonly OpenGLContextBase _context;
-        private readonly NativeWindowBase _window;
-
-        private SPBOpenGLContext(OpenGLContextBase context, NativeWindowBase window)
-        {
-            _context = context;
-            _window = window;
-        }
-
-        public void Dispose()
-        {
-            _context.Dispose();
-            _window.Dispose();
-        }
-
-        public void MakeCurrent()
-        {
-            _context.MakeCurrent(_window);
-        }
-
-        public bool HasContext() => _context.IsCurrent;
-
-        public static SPBOpenGLContext CreateBackgroundContext(OpenGLContextBase sharedContext)
-        {
-            OpenGLContextBase context = PlatformHelper.CreateOpenGLContext(FramebufferFormat.Default, 3, 3, OpenGLContextFlags.Compat, true, sharedContext);
-            NativeWindowBase window = PlatformHelper.CreateOpenGLWindow(FramebufferFormat.Default, 0, 0, 100, 100);
-
-            context.Initialize(window);
-            context.MakeCurrent(window);
-
-            GL.LoadBindings(new OpenToolkitBindingsContext(context));
-
-            context.MakeCurrent(null);
-
-            return new SPBOpenGLContext(context, window);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/StatusUpdatedEventArgs.cs

@@ -1,28 +0,0 @@
-using System;
-
-namespace Ryujinx.UI
-{
-    public class StatusUpdatedEventArgs : EventArgs
-    {
-        public bool VSyncEnabled;
-        public float Volume;
-        public string DockedMode;
-        public string AspectRatio;
-        public string GameStatus;
-        public string FifoStatus;
-        public string GpuName;
-        public string GpuBackend;
-
-        public StatusUpdatedEventArgs(bool vSyncEnabled, float volume, string gpuBackend, string dockedMode, string aspectRatio, string gameStatus, string fifoStatus, string gpuName)
-        {
-            VSyncEnabled = vSyncEnabled;
-            Volume = volume;
-            GpuBackend = gpuBackend;
-            DockedMode = dockedMode;
-            AspectRatio = aspectRatio;
-            GameStatus = gameStatus;
-            FifoStatus = fifoStatus;
-            GpuName = gpuName;
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/VulkanRenderer.cs

@@ -1,93 +0,0 @@
-using Gdk;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Input.HLE;
-using Ryujinx.UI.Helper;
-using SPB.Graphics.Vulkan;
-using SPB.Platform.Metal;
-using SPB.Platform.Win32;
-using SPB.Platform.X11;
-using SPB.Windowing;
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.UI
-{
-    public partial class VulkanRenderer : RendererWidgetBase
-    {
-        public NativeWindowBase NativeWindow { get; private set; }
-        private UpdateBoundsCallbackDelegate _updateBoundsCallback;
-
-        public VulkanRenderer(InputManager inputManager, GraphicsDebugLevel glLogLevel) : base(inputManager, glLogLevel) { }
-
-        private NativeWindowBase RetrieveNativeWindow()
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                IntPtr windowHandle = gdk_win32_window_get_handle(Window.Handle);
-
-                return new SimpleWin32Window(new NativeHandle(windowHandle));
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                IntPtr displayHandle = gdk_x11_display_get_xdisplay(Display.Handle);
-                IntPtr windowHandle = gdk_x11_window_get_xid(Window.Handle);
-
-                return new SimpleX11Window(new NativeHandle(displayHandle), new NativeHandle(windowHandle));
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                IntPtr metalLayer = MetalHelper.GetMetalLayer(Display, Window, out IntPtr nsView, out _updateBoundsCallback);
-
-                return new SimpleMetalWindow(new NativeHandle(nsView), new NativeHandle(metalLayer));
-            }
-
-            throw new NotImplementedException();
-        }
-
-        [LibraryImport("libgdk-3-0.dll")]
-        private static partial IntPtr gdk_win32_window_get_handle(IntPtr d);
-
-        [LibraryImport("libgdk-3.so.0")]
-        private static partial IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
-
-        [LibraryImport("libgdk-3.so.0")]
-        private static partial IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
-
-        protected override bool OnConfigureEvent(EventConfigure evnt)
-        {
-            if (NativeWindow == null)
-            {
-                NativeWindow = RetrieveNativeWindow();
-
-                WaitEvent.Set();
-            }
-
-            bool result = base.OnConfigureEvent(evnt);
-
-            _updateBoundsCallback?.Invoke(Window);
-
-            return result;
-        }
-
-        public unsafe IntPtr CreateWindowSurface(IntPtr instance)
-        {
-            return VulkanHelper.CreateWindowSurface(instance, NativeWindow);
-        }
-
-        public override void InitializeRenderer() { }
-
-        public override void SwapBuffers() { }
-
-        protected override string GetGpuBackendName()
-        {
-            return "Vulkan";
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            Device?.DisposeGpu();
-
-            NpadManager.Dispose();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.Designer.cs

@@ -1,233 +0,0 @@
-using Gtk;
-using System;
-
-namespace Ryujinx.UI.Widgets
-{
-    public partial class GameTableContextMenu : Menu
-    {
-        private MenuItem _openSaveUserDirMenuItem;
-        private MenuItem _openSaveDeviceDirMenuItem;
-        private MenuItem _openSaveBcatDirMenuItem;
-        private MenuItem _manageTitleUpdatesMenuItem;
-        private MenuItem _manageDlcMenuItem;
-        private MenuItem _manageCheatMenuItem;
-        private MenuItem _openTitleModDirMenuItem;
-        private MenuItem _openTitleSdModDirMenuItem;
-        private Menu _extractSubMenu;
-        private MenuItem _extractMenuItem;
-        private MenuItem _extractRomFsMenuItem;
-        private MenuItem _extractExeFsMenuItem;
-        private MenuItem _extractLogoMenuItem;
-        private Menu _manageSubMenu;
-        private MenuItem _manageCacheMenuItem;
-        private MenuItem _purgePtcCacheMenuItem;
-        private MenuItem _purgeShaderCacheMenuItem;
-        private MenuItem _openPtcDirMenuItem;
-        private MenuItem _openShaderCacheDirMenuItem;
-        private MenuItem _createShortcutMenuItem;
-
-        private void InitializeComponent()
-        {
-            //
-            // _openSaveUserDirMenuItem
-            //
-            _openSaveUserDirMenuItem = new MenuItem("Open User Save Directory")
-            {
-                TooltipText = "Open the directory which contains Application's User Saves.",
-            };
-            _openSaveUserDirMenuItem.Activated += OpenSaveUserDir_Clicked;
-
-            //
-            // _openSaveDeviceDirMenuItem
-            //
-            _openSaveDeviceDirMenuItem = new MenuItem("Open Device Save Directory")
-            {
-                TooltipText = "Open the directory which contains Application's Device Saves.",
-            };
-            _openSaveDeviceDirMenuItem.Activated += OpenSaveDeviceDir_Clicked;
-
-            //
-            // _openSaveBcatDirMenuItem
-            //
-            _openSaveBcatDirMenuItem = new MenuItem("Open BCAT Save Directory")
-            {
-                TooltipText = "Open the directory which contains Application's BCAT Saves.",
-            };
-            _openSaveBcatDirMenuItem.Activated += OpenSaveBcatDir_Clicked;
-
-            //
-            // _manageTitleUpdatesMenuItem
-            //
-            _manageTitleUpdatesMenuItem = new MenuItem("Manage Title Updates")
-            {
-                TooltipText = "Open the Title Update management window",
-            };
-            _manageTitleUpdatesMenuItem.Activated += ManageTitleUpdates_Clicked;
-
-            //
-            // _manageDlcMenuItem
-            //
-            _manageDlcMenuItem = new MenuItem("Manage DLC")
-            {
-                TooltipText = "Open the DLC management window",
-            };
-            _manageDlcMenuItem.Activated += ManageDlc_Clicked;
-
-            //
-            // _manageCheatMenuItem
-            //
-            _manageCheatMenuItem = new MenuItem("Manage Cheats")
-            {
-                TooltipText = "Open the Cheat management window",
-            };
-            _manageCheatMenuItem.Activated += ManageCheats_Clicked;
-
-            //
-            // _openTitleModDirMenuItem
-            //
-            _openTitleModDirMenuItem = new MenuItem("Open Mods Directory")
-            {
-                TooltipText = "Open the directory which contains Application's Mods.",
-            };
-            _openTitleModDirMenuItem.Activated += OpenTitleModDir_Clicked;
-
-            //
-            // _openTitleSdModDirMenuItem
-            //
-            _openTitleSdModDirMenuItem = new MenuItem("Open Atmosphere Mods Directory")
-            {
-                TooltipText = "Open the alternative SD card atmosphere directory which contains the Application's Mods.",
-            };
-            _openTitleSdModDirMenuItem.Activated += OpenTitleSdModDir_Clicked;
-
-            //
-            // _extractSubMenu
-            //
-            _extractSubMenu = new Menu();
-
-            //
-            // _extractMenuItem
-            //
-            _extractMenuItem = new MenuItem("Extract Data")
-            {
-                Submenu = _extractSubMenu
-            };
-
-            //
-            // _extractRomFsMenuItem
-            //
-            _extractRomFsMenuItem = new MenuItem("RomFS")
-            {
-                TooltipText = "Extract the RomFS section from Application's current config (including updates).",
-            };
-            _extractRomFsMenuItem.Activated += ExtractRomFs_Clicked;
-
-            //
-            // _extractExeFsMenuItem
-            //
-            _extractExeFsMenuItem = new MenuItem("ExeFS")
-            {
-                TooltipText = "Extract the ExeFS section from Application's current config (including updates).",
-            };
-            _extractExeFsMenuItem.Activated += ExtractExeFs_Clicked;
-
-            //
-            // _extractLogoMenuItem
-            //
-            _extractLogoMenuItem = new MenuItem("Logo")
-            {
-                TooltipText = "Extract the Logo section from Application's current config (including updates).",
-            };
-            _extractLogoMenuItem.Activated += ExtractLogo_Clicked;
-
-            //
-            // _manageSubMenu
-            //
-            _manageSubMenu = new Menu();
-
-            //
-            // _manageCacheMenuItem
-            //
-            _manageCacheMenuItem = new MenuItem("Cache Management")
-            {
-                Submenu = _manageSubMenu,
-            };
-
-            //
-            // _purgePtcCacheMenuItem
-            //
-            _purgePtcCacheMenuItem = new MenuItem("Queue PPTC Rebuild")
-            {
-                TooltipText = "Trigger PPTC to rebuild at boot time on the next game launch.",
-            };
-            _purgePtcCacheMenuItem.Activated += PurgePtcCache_Clicked;
-
-            //
-            // _purgeShaderCacheMenuItem
-            //
-            _purgeShaderCacheMenuItem = new MenuItem("Purge Shader Cache")
-            {
-                TooltipText = "Delete the Application's shader cache.",
-            };
-            _purgeShaderCacheMenuItem.Activated += PurgeShaderCache_Clicked;
-
-            //
-            // _openPtcDirMenuItem
-            //
-            _openPtcDirMenuItem = new MenuItem("Open PPTC Directory")
-            {
-                TooltipText = "Open the directory which contains the Application's PPTC cache.",
-            };
-            _openPtcDirMenuItem.Activated += OpenPtcDir_Clicked;
-
-            //
-            // _openShaderCacheDirMenuItem
-            //
-            _openShaderCacheDirMenuItem = new MenuItem("Open Shader Cache Directory")
-            {
-                TooltipText = "Open the directory which contains the Application's shader cache.",
-            };
-            _openShaderCacheDirMenuItem.Activated += OpenShaderCacheDir_Clicked;
-
-            //
-            // _createShortcutMenuItem
-            //
-            _createShortcutMenuItem = new MenuItem("Create Application Shortcut")
-            {
-                TooltipText = OperatingSystem.IsMacOS() ? "Create a shortcut in macOS's Applications folder that launches the selected Application" : "Create a Desktop Shortcut that launches the selected Application."
-            };
-            _createShortcutMenuItem.Activated += CreateShortcut_Clicked;
-
-            ShowComponent();
-        }
-
-        private void ShowComponent()
-        {
-            _extractSubMenu.Append(_extractExeFsMenuItem);
-            _extractSubMenu.Append(_extractRomFsMenuItem);
-            _extractSubMenu.Append(_extractLogoMenuItem);
-
-            _manageSubMenu.Append(_purgePtcCacheMenuItem);
-            _manageSubMenu.Append(_purgeShaderCacheMenuItem);
-            _manageSubMenu.Append(_openPtcDirMenuItem);
-            _manageSubMenu.Append(_openShaderCacheDirMenuItem);
-
-            Add(_createShortcutMenuItem);
-            Add(new SeparatorMenuItem());
-            Add(_openSaveUserDirMenuItem);
-            Add(_openSaveDeviceDirMenuItem);
-            Add(_openSaveBcatDirMenuItem);
-            Add(new SeparatorMenuItem());
-            Add(_manageTitleUpdatesMenuItem);
-            Add(_manageDlcMenuItem);
-            Add(_manageCheatMenuItem);
-            Add(_openTitleModDirMenuItem);
-            Add(_openTitleSdModDirMenuItem);
-            Add(new SeparatorMenuItem());
-            Add(_manageCacheMenuItem);
-            Add(_extractMenuItem);
-
-            ShowAll();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.cs

@@ -1,634 +0,0 @@
-using Gtk;
-using LibHac;
-using LibHac.Account;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.Fs.Shim;
-using LibHac.FsSystem;
-using LibHac.Ns;
-using LibHac.Tools.Fs;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.Loaders.Processes.Extensions;
-using Ryujinx.HLE.Utilities;
-using Ryujinx.UI.App.Common;
-using Ryujinx.UI.Common.Configuration;
-using Ryujinx.UI.Common.Helper;
-using Ryujinx.UI.Windows;
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Threading;
-
-namespace Ryujinx.UI.Widgets
-{
-    public partial class GameTableContextMenu : Menu
-    {
-        private readonly MainWindow _parent;
-        private readonly VirtualFileSystem _virtualFileSystem;
-        private readonly AccountManager _accountManager;
-        private readonly HorizonClient _horizonClient;
-
-        private readonly ApplicationData _applicationData;
-
-        private MessageDialog _dialog;
-        private bool _cancel;
-
-        public GameTableContextMenu(MainWindow parent, VirtualFileSystem virtualFileSystem, AccountManager accountManager, HorizonClient horizonClient, ApplicationData applicationData)
-        {
-            _parent = parent;
-
-            InitializeComponent();
-
-            _virtualFileSystem = virtualFileSystem;
-            _accountManager = accountManager;
-            _horizonClient = horizonClient;
-            _applicationData = applicationData;
-
-            if (!_applicationData.ControlHolder.ByteSpan.IsZeros())
-            {
-                _openSaveUserDirMenuItem.Sensitive = _applicationData.ControlHolder.Value.UserAccountSaveDataSize > 0;
-                _openSaveDeviceDirMenuItem.Sensitive = _applicationData.ControlHolder.Value.DeviceSaveDataSize > 0;
-                _openSaveBcatDirMenuItem.Sensitive = _applicationData.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
-            }
-            else
-            {
-                _openSaveUserDirMenuItem.Sensitive = false;
-                _openSaveDeviceDirMenuItem.Sensitive = false;
-                _openSaveBcatDirMenuItem.Sensitive = false;
-            }
-
-            string fileExt = System.IO.Path.GetExtension(_applicationData.Path).ToLower();
-            bool hasNca = fileExt == ".nca" || fileExt == ".nsp" || fileExt == ".pfs0" || fileExt == ".xci";
-
-            _extractRomFsMenuItem.Sensitive = hasNca;
-            _extractExeFsMenuItem.Sensitive = hasNca;
-            _extractLogoMenuItem.Sensitive = hasNca;
-
-            _createShortcutMenuItem.Sensitive = !ReleaseInformation.IsFlatHubBuild;
-
-            PopupAtPointer(null);
-        }
-
-        private bool TryFindSaveData(string titleName, ulong titleId, BlitStruct<ApplicationControlProperty> controlHolder, in SaveDataFilter filter, out ulong saveDataId)
-        {
-            saveDataId = default;
-
-            Result result = _horizonClient.Fs.FindSaveDataWithFilter(out SaveDataInfo saveDataInfo, SaveDataSpaceId.User, in filter);
-
-            if (ResultFs.TargetNotFound.Includes(result))
-            {
-                ref ApplicationControlProperty control = ref controlHolder.Value;
-
-                Logger.Info?.Print(LogClass.Application, $"Creating save directory for Title: {titleName} [{titleId:x16}]");
-
-                if (Utilities.IsZeros(controlHolder.ByteSpan))
-                {
-                    // If the current application doesn't have a loaded control property, create a dummy one
-                    // and set the savedata sizes so a user savedata will be created.
-                    control = ref new BlitStruct<ApplicationControlProperty>(1).Value;
-
-                    // The set sizes don't actually matter as long as they're non-zero because we use directory savedata.
-                    control.UserAccountSaveDataSize = 0x4000;
-                    control.UserAccountSaveDataJournalSize = 0x4000;
-
-                    Logger.Warning?.Print(LogClass.Application, "No control file was found for this game. Using a dummy one instead. This may cause inaccuracies in some games.");
-                }
-
-                Uid user = new((ulong)_accountManager.LastOpenedUser.UserId.High, (ulong)_accountManager.LastOpenedUser.UserId.Low);
-
-                result = _horizonClient.Fs.EnsureApplicationSaveData(out _, new LibHac.Ncm.ApplicationId(titleId), in control, in user);
-
-                if (result.IsFailure())
-                {
-                    GtkDialog.CreateErrorDialog($"There was an error creating the specified savedata: {result.ToStringWithName()}");
-
-                    return false;
-                }
-
-                // Try to find the savedata again after creating it
-                result = _horizonClient.Fs.FindSaveDataWithFilter(out saveDataInfo, SaveDataSpaceId.User, in filter);
-            }
-
-            if (result.IsSuccess())
-            {
-                saveDataId = saveDataInfo.SaveDataId;
-
-                return true;
-            }
-
-            GtkDialog.CreateErrorDialog($"There was an error finding the specified savedata: {result.ToStringWithName()}");
-
-            return false;
-        }
-
-        private void OpenSaveDir(in SaveDataFilter saveDataFilter)
-        {
-            if (!TryFindSaveData(_applicationData.Name, _applicationData.Id, _applicationData.ControlHolder, in saveDataFilter, out ulong saveDataId))
-            {
-                return;
-            }
-
-            string saveRootPath = System.IO.Path.Combine(VirtualFileSystem.GetNandPath(), $"user/save/{saveDataId:x16}");
-
-            if (!Directory.Exists(saveRootPath))
-            {
-                // Inconsistent state. Create the directory
-                Directory.CreateDirectory(saveRootPath);
-            }
-
-            string committedPath = System.IO.Path.Combine(saveRootPath, "0");
-            string workingPath = System.IO.Path.Combine(saveRootPath, "1");
-
-            // If the committed directory exists, that path will be loaded the next time the savedata is mounted
-            if (Directory.Exists(committedPath))
-            {
-                OpenHelper.OpenFolder(committedPath);
-            }
-            else
-            {
-                // If the working directory exists and the committed directory doesn't,
-                // the working directory will be loaded the next time the savedata is mounted
-                if (!Directory.Exists(workingPath))
-                {
-                    Directory.CreateDirectory(workingPath);
-                }
-
-                OpenHelper.OpenFolder(workingPath);
-            }
-        }
-
-        private void ExtractSection(NcaSectionType ncaSectionType, int programIndex = 0)
-        {
-            FileChooserNative fileChooser = new("Choose the folder to extract into", _parent, FileChooserAction.SelectFolder, "Extract", "Cancel");
-
-            ResponseType response = (ResponseType)fileChooser.Run();
-            string destination = fileChooser.Filename;
-
-            fileChooser.Dispose();
-
-            if (response == ResponseType.Accept)
-            {
-                Thread extractorThread = new(() =>
-                {
-                    Gtk.Application.Invoke(delegate
-                    {
-                        _dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Cancel, null)
-                        {
-                            Title = "Ryujinx - NCA Section Extractor",
-                            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png"),
-                            SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(_applicationData.Path)}...",
-                            WindowPosition = WindowPosition.Center,
-                        };
-
-                        int dialogResponse = _dialog.Run();
-                        if (dialogResponse == (int)ResponseType.Cancel || dialogResponse == (int)ResponseType.DeleteEvent)
-                        {
-                            _cancel = true;
-                            _dialog.Dispose();
-                        }
-                    });
-
-                    using FileStream file = new(_applicationData.Path, FileMode.Open, FileAccess.Read);
-
-                    Nca mainNca = null;
-                    Nca patchNca = null;
-
-                    if ((System.IO.Path.GetExtension(_applicationData.Path).ToLower() == ".nsp") ||
-                        (System.IO.Path.GetExtension(_applicationData.Path).ToLower() == ".pfs0") ||
-                        (System.IO.Path.GetExtension(_applicationData.Path).ToLower() == ".xci"))
-                    {
-                        IFileSystem pfs = PartitionFileSystemUtils.OpenApplicationFileSystem(_applicationData.Path, _virtualFileSystem);
-
-                        foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
-                        {
-                            using var ncaFile = new UniqueRef<IFile>();
-
-                            pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                            Nca nca = new(_virtualFileSystem.KeySet, ncaFile.Release().AsStorage());
-
-                            if (nca.Header.ContentType == NcaContentType.Program)
-                            {
-                                int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, NcaContentType.Program);
-
-                                if (nca.SectionExists(NcaSectionType.Data) && nca.Header.GetFsHeader(dataIndex).IsPatchSection())
-                                {
-                                    patchNca = nca;
-                                }
-                                else
-                                {
-                                    mainNca = nca;
-                                }
-                            }
-                        }
-                    }
-                    else if (System.IO.Path.GetExtension(_applicationData.Path).ToLower() == ".nca")
-                    {
-                        mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage());
-                    }
-
-                    if (mainNca == null)
-                    {
-                        Logger.Error?.Print(LogClass.Application, "Extraction failure. The main NCA is not present in the selected file.");
-
-                        Gtk.Application.Invoke(delegate
-                            {
-                                GtkDialog.CreateErrorDialog("Extraction failure. The main NCA is not present in the selected file.");
-                            });
-
-                        return;
-                    }
-
-                    IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                        ? IntegrityCheckLevel.ErrorOnInvalid
-                        : IntegrityCheckLevel.None;
-
-                    (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, checkLevel, programIndex, out _);
-
-                    if (updatePatchNca != null)
-                    {
-                        patchNca = updatePatchNca;
-                    }
-
-                    int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
-
-                    bool sectionExistsInPatch = false;
-
-                    if (patchNca != null)
-                    {
-                        sectionExistsInPatch = patchNca.CanOpenSection(index);
-                    }
-
-                    IFileSystem ncaFileSystem = sectionExistsInPatch ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
-                                                                         : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
-
-                    FileSystemClient fsClient = _horizonClient.Fs;
-
-                    string source = DateTime.Now.ToFileTime().ToString()[10..];
-                    string output = DateTime.Now.ToFileTime().ToString()[10..];
-
-                    using var uniqueSourceFs = new UniqueRef<IFileSystem>(ncaFileSystem);
-                    using var uniqueOutputFs = new UniqueRef<IFileSystem>(new LocalFileSystem(destination));
-
-                    fsClient.Register(source.ToU8Span(), ref uniqueSourceFs.Ref);
-                    fsClient.Register(output.ToU8Span(), ref uniqueOutputFs.Ref);
-
-                    (Result? resultCode, bool canceled) = CopyDirectory(fsClient, $"{source}:/", $"{output}:/");
-
-                    if (!canceled)
-                    {
-                        if (resultCode.Value.IsFailure())
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"LibHac returned error code: {resultCode.Value.ErrorCode}");
-
-                            Gtk.Application.Invoke(delegate
-                                {
-                                    _dialog?.Dispose();
-
-                                    GtkDialog.CreateErrorDialog("Extraction failed. Read the log file for further information.");
-                                });
-                        }
-                        else if (resultCode.Value.IsSuccess())
-                        {
-                            Gtk.Application.Invoke(delegate
-                                {
-                                    _dialog?.Dispose();
-
-                                    MessageDialog dialog = new(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, null)
-                                    {
-                                        Title = "Ryujinx - NCA Section Extractor",
-                                        Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png"),
-                                        SecondaryText = "Extraction completed successfully.",
-                                        WindowPosition = WindowPosition.Center,
-                                    };
-
-                                    dialog.Run();
-                                    dialog.Dispose();
-                                });
-                        }
-                    }
-
-                    fsClient.Unmount(source.ToU8Span());
-                    fsClient.Unmount(output.ToU8Span());
-                })
-                {
-                    Name = "GUI.NcaSectionExtractorThread",
-                    IsBackground = true,
-                };
-                extractorThread.Start();
-            }
-        }
-
-        private (Result? result, bool canceled) CopyDirectory(FileSystemClient fs, string sourcePath, string destPath)
-        {
-            Result rc = fs.OpenDirectory(out DirectoryHandle sourceHandle, sourcePath.ToU8Span(), OpenDirectoryMode.All);
-            if (rc.IsFailure())
-            {
-                return (rc, false);
-            }
-
-            using (sourceHandle)
-            {
-                foreach (DirectoryEntryEx entry in fs.EnumerateEntries(sourcePath, "*", SearchOptions.Default))
-                {
-                    if (_cancel)
-                    {
-                        return (null, true);
-                    }
-
-                    string subSrcPath = PathTools.Normalize(PathTools.Combine(sourcePath, entry.Name));
-                    string subDstPath = PathTools.Normalize(PathTools.Combine(destPath, entry.Name));
-
-                    if (entry.Type == DirectoryEntryType.Directory)
-                    {
-                        fs.EnsureDirectoryExists(subDstPath);
-
-                        (Result? result, bool canceled) = CopyDirectory(fs, subSrcPath, subDstPath);
-                        if (canceled || result.Value.IsFailure())
-                        {
-                            return (result, canceled);
-                        }
-                    }
-
-                    if (entry.Type == DirectoryEntryType.File)
-                    {
-                        fs.CreateOrOverwriteFile(subDstPath, entry.Size);
-
-                        rc = CopyFile(fs, subSrcPath, subDstPath);
-                        if (rc.IsFailure())
-                        {
-                            return (rc, false);
-                        }
-                    }
-                }
-            }
-
-            return (Result.Success, false);
-        }
-
-        public static Result CopyFile(FileSystemClient fs, string sourcePath, string destPath)
-        {
-            Result rc = fs.OpenFile(out FileHandle sourceHandle, sourcePath.ToU8Span(), OpenMode.Read);
-            if (rc.IsFailure())
-            {
-                return rc;
-            }
-
-            using (sourceHandle)
-            {
-                rc = fs.OpenFile(out FileHandle destHandle, destPath.ToU8Span(), OpenMode.Write | OpenMode.AllowAppend);
-                if (rc.IsFailure())
-                {
-                    return rc;
-                }
-
-                using (destHandle)
-                {
-                    const int MaxBufferSize = 1024 * 1024;
-
-                    rc = fs.GetFileSize(out long fileSize, sourceHandle);
-                    if (rc.IsFailure())
-                    {
-                        return rc;
-                    }
-
-                    int bufferSize = (int)Math.Min(MaxBufferSize, fileSize);
-
-                    byte[] buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
-                    try
-                    {
-                        for (long offset = 0; offset < fileSize; offset += bufferSize)
-                        {
-                            int toRead = (int)Math.Min(fileSize - offset, bufferSize);
-                            Span<byte> buf = buffer.AsSpan(0, toRead);
-
-                            rc = fs.ReadFile(out long _, sourceHandle, offset, buf);
-                            if (rc.IsFailure())
-                            {
-                                return rc;
-                            }
-
-                            rc = fs.WriteFile(destHandle, offset, buf, WriteOption.None);
-                            if (rc.IsFailure())
-                            {
-                                return rc;
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        ArrayPool<byte>.Shared.Return(buffer);
-                    }
-
-                    rc = fs.FlushFile(destHandle);
-                    if (rc.IsFailure())
-                    {
-                        return rc;
-                    }
-                }
-            }
-
-            return Result.Success;
-        }
-
-        //
-        // Events
-        //
-        private void OpenSaveUserDir_Clicked(object sender, EventArgs args)
-        {
-            var userId = new LibHac.Fs.UserId((ulong)_accountManager.LastOpenedUser.UserId.High, (ulong)_accountManager.LastOpenedUser.UserId.Low);
-            var saveDataFilter = SaveDataFilter.Make(_applicationData.Id, saveType: default, userId, saveDataId: default, index: default);
-
-            OpenSaveDir(in saveDataFilter);
-        }
-
-        private void OpenSaveDeviceDir_Clicked(object sender, EventArgs args)
-        {
-            var saveDataFilter = SaveDataFilter.Make(_applicationData.Id, SaveDataType.Device, userId: default, saveDataId: default, index: default);
-
-            OpenSaveDir(in saveDataFilter);
-        }
-
-        private void OpenSaveBcatDir_Clicked(object sender, EventArgs args)
-        {
-            var saveDataFilter = SaveDataFilter.Make(_applicationData.Id, SaveDataType.Bcat, userId: default, saveDataId: default, index: default);
-
-            OpenSaveDir(in saveDataFilter);
-        }
-
-        private void ManageTitleUpdates_Clicked(object sender, EventArgs args)
-        {
-            new TitleUpdateWindow(_parent, _virtualFileSystem, _applicationData).Show();
-        }
-
-        private void ManageDlc_Clicked(object sender, EventArgs args)
-        {
-            new DlcWindow(_virtualFileSystem, _applicationData.IdBaseString, _applicationData).Show();
-        }
-
-        private void ManageCheats_Clicked(object sender, EventArgs args)
-        {
-            new CheatWindow(_virtualFileSystem, _applicationData.Id, _applicationData.Name, _applicationData.Path).Show();
-        }
-
-        private void OpenTitleModDir_Clicked(object sender, EventArgs args)
-        {
-            string modsBasePath = ModLoader.GetModsBasePath();
-            string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, _applicationData.IdString);
-
-            OpenHelper.OpenFolder(titleModsPath);
-        }
-
-        private void OpenTitleSdModDir_Clicked(object sender, EventArgs args)
-        {
-            string sdModsBasePath = ModLoader.GetSdModsBasePath();
-            string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, _applicationData.IdString);
-
-            OpenHelper.OpenFolder(titleModsPath);
-        }
-
-        private void ExtractRomFs_Clicked(object sender, EventArgs args)
-        {
-            ExtractSection(NcaSectionType.Data);
-        }
-
-        private void ExtractExeFs_Clicked(object sender, EventArgs args)
-        {
-            ExtractSection(NcaSectionType.Code);
-        }
-
-        private void ExtractLogo_Clicked(object sender, EventArgs args)
-        {
-            ExtractSection(NcaSectionType.Logo);
-        }
-
-        private void OpenPtcDir_Clicked(object sender, EventArgs args)
-        {
-            string ptcDir = System.IO.Path.Combine(AppDataManager.GamesDirPath, _applicationData.IdString, "cache", "cpu");
-
-            string mainPath = System.IO.Path.Combine(ptcDir, "0");
-            string backupPath = System.IO.Path.Combine(ptcDir, "1");
-
-            if (!Directory.Exists(ptcDir))
-            {
-                Directory.CreateDirectory(ptcDir);
-                Directory.CreateDirectory(mainPath);
-                Directory.CreateDirectory(backupPath);
-            }
-
-            OpenHelper.OpenFolder(ptcDir);
-        }
-
-        private void OpenShaderCacheDir_Clicked(object sender, EventArgs args)
-        {
-            string shaderCacheDir = System.IO.Path.Combine(AppDataManager.GamesDirPath, _applicationData.IdString, "cache", "shader");
-
-            if (!Directory.Exists(shaderCacheDir))
-            {
-                Directory.CreateDirectory(shaderCacheDir);
-            }
-
-            OpenHelper.OpenFolder(shaderCacheDir);
-        }
-
-        private void PurgePtcCache_Clicked(object sender, EventArgs args)
-        {
-            DirectoryInfo mainDir = new(System.IO.Path.Combine(AppDataManager.GamesDirPath, _applicationData.IdString, "cache", "cpu", "0"));
-            DirectoryInfo backupDir = new(System.IO.Path.Combine(AppDataManager.GamesDirPath, _applicationData.IdString, "cache", "cpu", "1"));
-
-            MessageDialog warningDialog = GtkDialog.CreateConfirmationDialog("Warning", $"You are about to queue a PPTC rebuild on the next boot of:\n\n<b>{_applicationData.Name}</b>\n\nAre you sure you want to proceed?");
-
-            List<FileInfo> cacheFiles = new();
-
-            if (mainDir.Exists)
-            {
-                cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-            }
-
-            if (backupDir.Exists)
-            {
-                cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-            }
-
-            if (cacheFiles.Count > 0 && warningDialog.Run() == (int)ResponseType.Yes)
-            {
-                foreach (FileInfo file in cacheFiles)
-                {
-                    try
-                    {
-                        file.Delete();
-                    }
-                    catch (Exception e)
-                    {
-                        GtkDialog.CreateErrorDialog($"Error purging PPTC cache {file.Name}: {e}");
-                    }
-                }
-            }
-
-            warningDialog.Dispose();
-        }
-
-        private void PurgeShaderCache_Clicked(object sender, EventArgs args)
-        {
-            DirectoryInfo shaderCacheDir = new(System.IO.Path.Combine(AppDataManager.GamesDirPath, _applicationData.IdString, "cache", "shader"));
-
-            using MessageDialog warningDialog = GtkDialog.CreateConfirmationDialog("Warning", $"You are about to delete the shader cache for :\n\n<b>{_applicationData.Name}</b>\n\nAre you sure you want to proceed?");
-
-            List<DirectoryInfo> oldCacheDirectories = new();
-            List<FileInfo> newCacheFiles = new();
-
-            if (shaderCacheDir.Exists)
-            {
-                oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
-                newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
-                newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
-            }
-
-            if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0) && warningDialog.Run() == (int)ResponseType.Yes)
-            {
-                foreach (DirectoryInfo directory in oldCacheDirectories)
-                {
-                    try
-                    {
-                        directory.Delete(true);
-                    }
-                    catch (Exception e)
-                    {
-                        GtkDialog.CreateErrorDialog($"Error purging shader cache at {directory.Name}: {e}");
-                    }
-                }
-
-                foreach (FileInfo file in newCacheFiles)
-                {
-                    try
-                    {
-                        file.Delete();
-                    }
-                    catch (Exception e)
-                    {
-                        GtkDialog.CreateErrorDialog($"Error purging shader cache at {file.Name}: {e}");
-                    }
-                }
-            }
-        }
-
-        private void CreateShortcut_Clicked(object sender, EventArgs args)
-        {
-            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                ? IntegrityCheckLevel.ErrorOnInvalid
-                : IntegrityCheckLevel.None;
-            byte[] appIcon = new ApplicationLibrary(_virtualFileSystem, checkLevel).GetApplicationIcon(_applicationData.Path, ConfigurationState.Instance.System.Language, _applicationData.Id);
-            ShortcutHelper.CreateAppShortcut(_applicationData.Path, _applicationData.Name, _applicationData.IdString, appIcon);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/GtkDialog.cs

@@ -1,114 +0,0 @@
-using Gtk;
-using Ryujinx.Common.Logging;
-using Ryujinx.UI.Common.Configuration;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Ryujinx.UI.Widgets
-{
-    internal class GtkDialog : MessageDialog
-    {
-        private static bool _isChoiceDialogOpen;
-
-        private GtkDialog(string title, string mainText, string secondaryText, MessageType messageType = MessageType.Other, ButtonsType buttonsType = ButtonsType.Ok)
-            : base(null, DialogFlags.Modal, messageType, buttonsType, null)
-        {
-            Title = title;
-            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
-            Text = mainText;
-            SecondaryText = secondaryText;
-            WindowPosition = WindowPosition.Center;
-            SecondaryUseMarkup = true;
-
-            Response += GtkDialog_Response;
-
-            SetSizeRequest(200, 20);
-        }
-
-        private void GtkDialog_Response(object sender, ResponseArgs args)
-        {
-            Dispose();
-        }
-
-        internal static void CreateInfoDialog(string mainText, string secondaryText)
-        {
-            new GtkDialog("Ryujinx - Info", mainText, secondaryText, MessageType.Info).Run();
-        }
-
-        internal static void CreateUpdaterInfoDialog(string mainText, string secondaryText)
-        {
-            new GtkDialog("Ryujinx - Updater", mainText, secondaryText, MessageType.Info).Run();
-        }
-
-        internal static MessageDialog CreateWaitingDialog(string mainText, string secondaryText)
-        {
-            return new GtkDialog("Ryujinx - Waiting", mainText, secondaryText, MessageType.Info, ButtonsType.None);
-        }
-
-        internal static void CreateWarningDialog(string mainText, string secondaryText)
-        {
-            new GtkDialog("Ryujinx - Warning", mainText, secondaryText, MessageType.Warning).Run();
-        }
-
-        internal static void CreateErrorDialog(string errorMessage)
-        {
-            Logger.Error?.Print(LogClass.Application, errorMessage);
-
-            new GtkDialog("Ryujinx - Error", "Ryujinx has encountered an error", errorMessage, MessageType.Error).Run();
-        }
-
-        internal static MessageDialog CreateConfirmationDialog(string mainText, string secondaryText = "")
-        {
-            return new GtkDialog("Ryujinx - Confirmation", mainText, secondaryText, MessageType.Question, ButtonsType.YesNo);
-        }
-
-        internal static bool CreateChoiceDialog(string title, string mainText, string secondaryText)
-        {
-            if (_isChoiceDialogOpen)
-            {
-                return false;
-            }
-
-            _isChoiceDialogOpen = true;
-
-            ResponseType response = (ResponseType)new GtkDialog(title, mainText, secondaryText, MessageType.Question, ButtonsType.YesNo).Run();
-
-            _isChoiceDialogOpen = false;
-
-            return response == ResponseType.Yes;
-        }
-
-        internal static ResponseType CreateCustomDialog(string title, string mainText, string secondaryText, Dictionary<int, string> buttons, MessageType messageType = MessageType.Other)
-        {
-            GtkDialog gtkDialog = new(title, mainText, secondaryText, messageType, ButtonsType.None);
-
-            foreach (var button in buttons)
-            {
-                gtkDialog.AddButton(button.Value, button.Key);
-            }
-
-            return (ResponseType)gtkDialog.Run();
-        }
-
-        internal static string CreateInputDialog(Window parent, string title, string mainText, uint inputMax)
-        {
-            GtkInputDialog gtkDialog = new(parent, title, mainText, inputMax);
-            ResponseType response = (ResponseType)gtkDialog.Run();
-            string responseText = gtkDialog.InputEntry.Text.TrimEnd();
-
-            gtkDialog.Dispose();
-
-            if (response == ResponseType.Ok)
-            {
-                return responseText;
-            }
-
-            return "";
-        }
-
-        internal static bool CreateExitDialog()
-        {
-            return CreateChoiceDialog("Ryujinx - Exit", "Are you sure you want to close Ryujinx?", "All unsaved data will be lost!");
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/GtkInputDialog.cs

@@ -1,37 +0,0 @@
-using Gtk;
-
-namespace Ryujinx.UI.Widgets
-{
-    public class GtkInputDialog : MessageDialog
-    {
-        public Entry InputEntry { get; }
-
-        public GtkInputDialog(Window parent, string title, string mainText, uint inputMax) : base(parent, DialogFlags.Modal | DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.OkCancel, null)
-        {
-            SetDefaultSize(300, 0);
-
-            Title = title;
-
-            Label mainTextLabel = new()
-            {
-                Text = mainText,
-            };
-
-            InputEntry = new Entry
-            {
-                MaxLength = (int)inputMax,
-            };
-
-            Label inputMaxTextLabel = new()
-            {
-                Text = $"(Max length: {inputMax})",
-            };
-
-            ((Box)MessageArea).PackStart(mainTextLabel, true, true, 0);
-            ((Box)MessageArea).PackStart(InputEntry, true, true, 5);
-            ((Box)MessageArea).PackStart(inputMaxTextLabel, true, true, 0);
-
-            ShowAll();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.cs

@@ -1,57 +0,0 @@
-using Gtk;
-using Ryujinx.UI.Common.Configuration;
-using System;
-using System.Reflection;
-using GUI = Gtk.Builder.ObjectAttribute;
-
-namespace Ryujinx.UI.Widgets
-{
-    public class ProfileDialog : Dialog
-    {
-        public string FileName { get; private set; }
-
-#pragma warning disable CS0649, IDE0044 // Field is never assigned to, Add readonly modifier
-        [GUI] Entry _profileEntry;
-        [GUI] Label _errorMessage;
-#pragma warning restore CS0649, IDE0044
-
-        public ProfileDialog() : this(new Builder("Ryujinx.Gtk3.UI.Widgets.ProfileDialog.glade")) { }
-
-        private ProfileDialog(Builder builder) : base(builder.GetRawOwnedObject("_profileDialog"))
-        {
-            builder.Autoconnect(this);
-            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
-        }
-
-        private void OkToggle_Activated(object sender, EventArgs args)
-        {
-            ((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true);
-
-            bool validFileName = true;
-
-            foreach (char invalidChar in System.IO.Path.GetInvalidFileNameChars())
-            {
-                if (_profileEntry.Text.Contains(invalidChar))
-                {
-                    validFileName = false;
-                }
-            }
-
-            if (validFileName && !string.IsNullOrEmpty(_profileEntry.Text))
-            {
-                FileName = $"{_profileEntry.Text}.json";
-
-                Respond(ResponseType.Ok);
-            }
-            else
-            {
-                _errorMessage.Text = "The file name contains invalid characters. Please try again.";
-            }
-        }
-
-        private void CancelToggle_Activated(object sender, EventArgs args)
-        {
-            Respond(ResponseType.Cancel);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.glade

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkDialog" id="_profileDialog">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Ryujinx - Profile Dialog</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="default_width">400</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkToggleButton" id="OkToggle">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="toggled" handler="OkToggle_Activated" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="CancelToggle">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="toggled" handler="CancelToggle_Activated" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">10</property>
-                <property name="margin_right">10</property>
-                <property name="margin_top">20</property>
-                <property name="margin_bottom">10</property>
-                <property name="label" translatable="yes">Enter a name for the new profile:</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="_profileEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_left">20</property>
-                <property name="margin_right">20</property>
-                <property name="margin_top">20</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="_errorMessage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="margin_left">20</property>
-                <property name="margin_right">10</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
-                <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

src/Ryujinx.Gtk3/UI/Widgets/RawInputToTextEntry.cs

@@ -1,27 +0,0 @@
-using Gtk;
-
-namespace Ryujinx.UI.Widgets
-{
-    public class RawInputToTextEntry : Entry
-    {
-        public void SendKeyPressEvent(object o, KeyPressEventArgs args)
-        {
-            base.OnKeyPressEvent(args.Event);
-        }
-
-        public void SendKeyReleaseEvent(object o, KeyReleaseEventArgs args)
-        {
-            base.OnKeyReleaseEvent(args.Event);
-        }
-
-        public void SendButtonPressEvent(object o, ButtonPressEventArgs args)
-        {
-            base.OnButtonPressEvent(args.Event);
-        }
-
-        public void SendButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
-        {
-            base.OnButtonReleaseEvent(args.Event);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Widgets/UserErrorDialog.cs

@@ -1,123 +0,0 @@
-using Gtk;
-using Ryujinx.UI.Common;
-using Ryujinx.UI.Common.Helper;
-
-namespace Ryujinx.UI.Widgets
-{
-    internal class UserErrorDialog : MessageDialog
-    {
-        private const string SetupGuideUrl = "https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide";
-        private const int OkResponseId = 0;
-        private const int SetupGuideResponseId = 1;
-
-        private readonly UserError _userError;
-
-        private UserErrorDialog(UserError error) : base(null, DialogFlags.Modal, MessageType.Error, ButtonsType.None, null)
-        {
-            _userError = error;
-
-            WindowPosition = WindowPosition.Center;
-            SecondaryUseMarkup = true;
-
-            Response += UserErrorDialog_Response;
-
-            SetSizeRequest(120, 50);
-
-            AddButton("OK", OkResponseId);
-
-            bool isInSetupGuide = IsCoveredBySetupGuide(error);
-
-            if (isInSetupGuide)
-            {
-                AddButton("Open the Setup Guide", SetupGuideResponseId);
-            }
-
-            string errorCode = GetErrorCode(error);
-
-            SecondaryUseMarkup = true;
-
-            Title = $"Ryujinx error ({errorCode})";
-            Text = $"{errorCode}: {GetErrorTitle(error)}";
-            SecondaryText = GetErrorDescription(error);
-
-            if (isInSetupGuide)
-            {
-                SecondaryText += "\n<b>For more information on how to fix this error, follow our Setup Guide.</b>";
-            }
-        }
-
-        private static string GetErrorCode(UserError error)
-        {
-            return $"RYU-{(uint)error:X4}";
-        }
-
-        private static string GetErrorTitle(UserError error)
-        {
-            return error switch
-            {
-                UserError.NoKeys => "Keys not found",
-                UserError.NoFirmware => "Firmware not found",
-                UserError.FirmwareParsingFailed => "Firmware parsing error",
-                UserError.ApplicationNotFound => "Application not found",
-                UserError.Unknown => "Unknown error",
-                _ => "Undefined error",
-            };
-        }
-
-        private static string GetErrorDescription(UserError error)
-        {
-            return error switch
-            {
-                UserError.NoKeys => "Ryujinx was unable to find your 'prod.keys' file",
-                UserError.NoFirmware => "Ryujinx was unable to find any firmwares installed",
-                UserError.FirmwareParsingFailed => "Ryujinx was unable to parse the provided firmware. This is usually caused by outdated keys.",
-                UserError.ApplicationNotFound => "Ryujinx couldn't find a valid application at the given path.",
-                UserError.Unknown => "An unknown error occured!",
-                _ => "An undefined error occured! This shouldn't happen, please contact a dev!",
-            };
-        }
-
-        private static bool IsCoveredBySetupGuide(UserError error)
-        {
-            return error switch
-            {
-                UserError.NoKeys or
-                UserError.NoFirmware or
-                UserError.FirmwareParsingFailed => true,
-                _ => false,
-            };
-        }
-
-        private static string GetSetupGuideUrl(UserError error)
-        {
-            if (!IsCoveredBySetupGuide(error))
-            {
-                return null;
-            }
-
-            return error switch
-            {
-                UserError.NoKeys => SetupGuideUrl + "#initial-setup---placement-of-prodkeys",
-                UserError.NoFirmware => SetupGuideUrl + "#initial-setup-continued---installation-of-firmware",
-                _ => SetupGuideUrl,
-            };
-        }
-
-        private void UserErrorDialog_Response(object sender, ResponseArgs args)
-        {
-            int responseId = (int)args.ResponseId;
-
-            if (responseId == SetupGuideResponseId)
-            {
-                OpenHelper.OpenUrl(GetSetupGuideUrl(_userError));
-            }
-
-            Dispose();
-        }
-
-        public static void CreateUserErrorDialog(UserError error)
-        {
-            new UserErrorDialog(error).Run();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Windows/AboutWindow.Designer.cs

@@ -1,511 +0,0 @@
-using Gtk;
-using Pango;
-using Ryujinx.UI.Common.Configuration;
-using System.Reflection;
-
-namespace Ryujinx.UI.Windows
-{
-    public partial class AboutWindow : Window
-    {
-        private Box _mainBox;
-        private Box _leftBox;
-        private Box _logoBox;
-        private Image _ryujinxLogo;
-        private Box _logoTextBox;
-        private Label _ryujinxLabel;
-        private Label _ryujinxPhoneticLabel;
-        private EventBox _ryujinxLink;
-        private Label _ryujinxLinkLabel;
-        private Label _versionLabel;
-        private Label _disclaimerLabel;
-        private EventBox _amiiboApiLink;
-        private Label _amiiboApiLinkLabel;
-        private Box _socialBox;
-        private EventBox _patreonEventBox;
-        private Box _patreonBox;
-        private Image _patreonLogo;
-        private Label _patreonLabel;
-        private EventBox _githubEventBox;
-        private Box _githubBox;
-        private Image _githubLogo;
-        private Label _githubLabel;
-        private Box _discordBox;
-        private EventBox _discordEventBox;
-        private Image _discordLogo;
-        private Label _discordLabel;
-        private EventBox _twitterEventBox;
-        private Box _twitterBox;
-        private Image _twitterLogo;
-        private Label _twitterLabel;
-        private Separator _separator;
-        private Box _rightBox;
-        private Label _aboutLabel;
-        private Label _aboutDescriptionLabel;
-        private Label _createdByLabel;
-        private TextView _createdByText;
-        private EventBox _contributorsEventBox;
-        private Label _contributorsLinkLabel;
-        private Label _patreonNamesLabel;
-        private ScrolledWindow _patreonNamesScrolled;
-        private TextView _patreonNamesText;
-        private EventBox _changelogEventBox;
-        private Label _changelogLinkLabel;
-
-        private void InitializeComponent()
-        {
-
-            //
-            // AboutWindow
-            //
-            CanFocus = false;
-            Resizable = false;
-            Modal = true;
-            WindowPosition = WindowPosition.Center;
-            DefaultWidth = 800;
-            DefaultHeight = 450;
-            TypeHint = Gdk.WindowTypeHint.Dialog;
-
-            //
-            // _mainBox
-            //
-            _mainBox = new Box(Orientation.Horizontal, 0);
-
-            //
-            // _leftBox
-            //
-            _leftBox = new Box(Orientation.Vertical, 0)
-            {
-                Margin = 15,
-                MarginStart = 30,
-                MarginEnd = 0,
-            };
-
-            //
-            // _logoBox
-            //
-            _logoBox = new Box(Orientation.Horizontal, 0);
-
-            //
-            // _ryujinxLogo
-            //
-            _ryujinxLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png", 100, 100))
-            {
-                Margin = 10,
-                MarginStart = 15,
-            };
-
-            //
-            // _logoTextBox
-            //
-            _logoTextBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _ryujinxLabel
-            //
-            _ryujinxLabel = new Label("Ryujinx")
-            {
-                MarginTop = 15,
-                Justify = Justification.Center,
-                Attributes = new AttrList(),
-            };
-            _ryujinxLabel.Attributes.Insert(new Pango.AttrScale(2.7f));
-
-            //
-            // _ryujinxPhoneticLabel
-            //
-            _ryujinxPhoneticLabel = new Label("(REE-YOU-JINX)")
-            {
-                Justify = Justification.Center,
-            };
-
-            //
-            // _ryujinxLink
-            //
-            _ryujinxLink = new EventBox()
-            {
-                Margin = 5
-            };
-            _ryujinxLink.ButtonPressEvent += RyujinxButton_Pressed;
-
-            //
-            // _ryujinxLinkLabel
-            //
-            _ryujinxLinkLabel = new Label("www.ryujinx.org")
-            {
-                TooltipText = "Click to open the Ryujinx website in your default browser.",
-                Justify = Justification.Center,
-                Attributes = new AttrList(),
-            };
-            _ryujinxLinkLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _versionLabel
-            //
-            _versionLabel = new Label(Program.Version)
-            {
-                Expand = true,
-                Justify = Justification.Center,
-                Margin = 5,
-            };
-
-            //
-            // _changelogEventBox
-            //
-            _changelogEventBox = new EventBox();
-            _changelogEventBox.ButtonPressEvent += ChangelogButton_Pressed;
-
-            //
-            // _changelogLinkLabel
-            //
-            _changelogLinkLabel = new Label("View Changelog on GitHub")
-            {
-                TooltipText = "Click to open the changelog for this version in your default browser.",
-                Justify = Justification.Center,
-                Attributes = new AttrList(),
-            };
-            _changelogLinkLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _disclaimerLabel
-            //
-            _disclaimerLabel = new Label("Ryujinx is not affiliated with Nintendo™,\nor any of its partners, in any way.")
-            {
-                Expand = true,
-                Justify = Justification.Center,
-                Margin = 5,
-                Attributes = new AttrList(),
-            };
-            _disclaimerLabel.Attributes.Insert(new Pango.AttrScale(0.8f));
-
-            //
-            // _amiiboApiLink
-            //
-            _amiiboApiLink = new EventBox()
-            {
-                Margin = 5,
-            };
-            _amiiboApiLink.ButtonPressEvent += AmiiboApiButton_Pressed;
-
-            //
-            // _amiiboApiLinkLabel
-            //
-            _amiiboApiLinkLabel = new Label("AmiiboAPI (www.amiiboapi.com) is used\nin our Amiibo emulation.")
-            {
-                TooltipText = "Click to open the AmiiboAPI website in your default browser.",
-                Justify = Justification.Center,
-                Attributes = new AttrList(),
-            };
-            _amiiboApiLinkLabel.Attributes.Insert(new Pango.AttrScale(0.9f));
-
-            //
-            // _socialBox
-            //
-            _socialBox = new Box(Orientation.Horizontal, 0)
-            {
-                Margin = 25,
-                MarginBottom = 10,
-            };
-
-            //
-            // _patreonEventBox
-            //
-            _patreonEventBox = new EventBox()
-            {
-                TooltipText = "Click to open the Ryujinx Patreon page in your default browser.",
-            };
-            _patreonEventBox.ButtonPressEvent += PatreonButton_Pressed;
-
-            //
-            // _patreonBox
-            //
-            _patreonBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _patreonLogo
-            //
-            _patreonLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Patreon_Light.png", 30, 30))
-            {
-                Margin = 10,
-            };
-
-            //
-            // _patreonLabel
-            //
-            _patreonLabel = new Label("Patreon")
-            {
-                Justify = Justification.Center,
-            };
-
-            //
-            // _githubEventBox
-            //
-            _githubEventBox = new EventBox()
-            {
-                TooltipText = "Click to open the Ryujinx GitHub page in your default browser.",
-            };
-            _githubEventBox.ButtonPressEvent += GitHubButton_Pressed;
-
-            //
-            // _githubBox
-            //
-            _githubBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _githubLogo
-            //
-            _githubLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_GitHub_Light.png", 30, 30))
-            {
-                Margin = 10,
-            };
-
-            //
-            // _githubLabel
-            //
-            _githubLabel = new Label("GitHub")
-            {
-                Justify = Justification.Center,
-            };
-
-            //
-            // _discordBox
-            //
-            _discordBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _discordEventBox
-            //
-            _discordEventBox = new EventBox()
-            {
-                TooltipText = "Click to open an invite to the Ryujinx Discord server in your default browser.",
-            };
-            _discordEventBox.ButtonPressEvent += DiscordButton_Pressed;
-
-            //
-            // _discordLogo
-            //
-            _discordLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Discord_Light.png", 30, 30))
-            {
-                Margin = 10,
-            };
-
-            //
-            // _discordLabel
-            //
-            _discordLabel = new Label("Discord")
-            {
-                Justify = Justification.Center,
-            };
-
-            //
-            // _twitterEventBox
-            //
-            _twitterEventBox = new EventBox()
-            {
-                TooltipText = "Click to open the Ryujinx Twitter page in your default browser.",
-            };
-            _twitterEventBox.ButtonPressEvent += TwitterButton_Pressed;
-
-            //
-            // _twitterBox
-            //
-            _twitterBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _twitterLogo
-            //
-            _twitterLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Twitter_Light.png", 30, 30))
-            {
-                Margin = 10,
-            };
-
-            //
-            // _twitterLabel
-            //
-            _twitterLabel = new Label("Twitter")
-            {
-                Justify = Justification.Center,
-            };
-
-            //
-            // _separator
-            //
-            _separator = new Separator(Orientation.Vertical)
-            {
-                Margin = 15,
-            };
-
-            //
-            // _rightBox
-            //
-            _rightBox = new Box(Orientation.Vertical, 0)
-            {
-                Margin = 15,
-                MarginTop = 40,
-            };
-
-            //
-            // _aboutLabel
-            //
-            _aboutLabel = new Label("About :")
-            {
-                Halign = Align.Start,
-                Attributes = new AttrList(),
-            };
-            _aboutLabel.Attributes.Insert(new Pango.AttrWeight(Weight.Bold));
-            _aboutLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _aboutDescriptionLabel
-            //
-            _aboutDescriptionLabel = new Label("Ryujinx is an emulator for the Nintendo Switch™.\n" +
-                                               "Please support us on Patreon.\n" +
-                                               "Get all the latest news on our Twitter or Discord.\n" +
-                                               "Developers interested in contributing can find out more on our GitHub or Discord.")
-            {
-                Margin = 15,
-                Halign = Align.Start,
-            };
-
-            //
-            // _createdByLabel
-            //
-            _createdByLabel = new Label("Maintained by :")
-            {
-                Halign = Align.Start,
-                Attributes = new AttrList(),
-            };
-            _createdByLabel.Attributes.Insert(new Pango.AttrWeight(Weight.Bold));
-            _createdByLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _createdByText
-            //
-            _createdByText = new TextView()
-            {
-                WrapMode = Gtk.WrapMode.Word,
-                Editable = false,
-                CursorVisible = false,
-                Margin = 15,
-                MarginEnd = 30,
-            };
-            _createdByText.Buffer.Text = "gdkchan, Ac_K, Thog, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, Xpl0itR, GoffyDude, »jD« and more...";
-
-            //
-            // _contributorsEventBox
-            //
-            _contributorsEventBox = new EventBox();
-            _contributorsEventBox.ButtonPressEvent += ContributorsButton_Pressed;
-
-            //
-            // _contributorsLinkLabel
-            //
-            _contributorsLinkLabel = new Label("See All Contributors...")
-            {
-                TooltipText = "Click to open the Contributors page in your default browser.",
-                MarginEnd = 30,
-                Halign = Align.End,
-                Attributes = new AttrList(),
-            };
-            _contributorsLinkLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _patreonNamesLabel
-            //
-            _patreonNamesLabel = new Label("Supported on Patreon by :")
-            {
-                Halign = Align.Start,
-                Attributes = new AttrList(),
-            };
-            _patreonNamesLabel.Attributes.Insert(new Pango.AttrWeight(Weight.Bold));
-            _patreonNamesLabel.Attributes.Insert(new Pango.AttrUnderline(Underline.Single));
-
-            //
-            // _patreonNamesScrolled
-            //
-            _patreonNamesScrolled = new ScrolledWindow()
-            {
-                Margin = 15,
-                MarginEnd = 30,
-                Expand = true,
-                ShadowType = ShadowType.In,
-            };
-            _patreonNamesScrolled.SetPolicy(PolicyType.Never, PolicyType.Automatic);
-
-            //
-            // _patreonNamesText
-            //
-            _patreonNamesText = new TextView()
-            {
-                WrapMode = Gtk.WrapMode.Word,
-            };
-            _patreonNamesText.Buffer.Text = "Loading...";
-            _patreonNamesText.SetProperty("editable", new GLib.Value(false));
-
-            ShowComponent();
-        }
-
-        private void ShowComponent()
-        {
-            _logoBox.Add(_ryujinxLogo);
-
-            _ryujinxLink.Add(_ryujinxLinkLabel);
-
-            _logoTextBox.Add(_ryujinxLabel);
-            _logoTextBox.Add(_ryujinxPhoneticLabel);
-            _logoTextBox.Add(_ryujinxLink);
-
-            _logoBox.Add(_logoTextBox);
-
-            _amiiboApiLink.Add(_amiiboApiLinkLabel);
-
-            _patreonBox.Add(_patreonLogo);
-            _patreonBox.Add(_patreonLabel);
-            _patreonEventBox.Add(_patreonBox);
-
-            _githubBox.Add(_githubLogo);
-            _githubBox.Add(_githubLabel);
-            _githubEventBox.Add(_githubBox);
-
-            _discordBox.Add(_discordLogo);
-            _discordBox.Add(_discordLabel);
-            _discordEventBox.Add(_discordBox);
-
-            _twitterBox.Add(_twitterLogo);
-            _twitterBox.Add(_twitterLabel);
-            _twitterEventBox.Add(_twitterBox);
-
-            _socialBox.Add(_patreonEventBox);
-            _socialBox.Add(_githubEventBox);
-            _socialBox.Add(_discordEventBox);
-            _socialBox.Add(_twitterEventBox);
-
-            _changelogEventBox.Add(_changelogLinkLabel);
-
-            _leftBox.Add(_logoBox);
-            _leftBox.Add(_versionLabel);
-            _leftBox.Add(_changelogEventBox);
-            _leftBox.Add(_disclaimerLabel);
-            _leftBox.Add(_amiiboApiLink);
-            _leftBox.Add(_socialBox);
-
-            _contributorsEventBox.Add(_contributorsLinkLabel);
-            _patreonNamesScrolled.Add(_patreonNamesText);
-
-            _rightBox.Add(_aboutLabel);
-            _rightBox.Add(_aboutDescriptionLabel);
-            _rightBox.Add(_createdByLabel);
-            _rightBox.Add(_createdByText);
-            _rightBox.Add(_contributorsEventBox);
-            _rightBox.Add(_patreonNamesLabel);
-            _rightBox.Add(_patreonNamesScrolled);
-
-            _mainBox.Add(_leftBox);
-            _mainBox.Add(_separator);
-            _mainBox.Add(_rightBox);
-
-            Add(_mainBox);
-
-            ShowAll();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Windows/AboutWindow.cs

@@ -1,85 +0,0 @@
-using Gtk;
-using Ryujinx.Common.Utilities;
-using Ryujinx.UI.Common.Helper;
-using System.Net.Http;
-using System.Net.NetworkInformation;
-using System.Reflection;
-using System.Threading.Tasks;
-
-namespace Ryujinx.UI.Windows
-{
-    public partial class AboutWindow : Window
-    {
-        public AboutWindow() : base($"Ryujinx {Program.Version} - About")
-        {
-            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(OpenHelper)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
-            InitializeComponent();
-
-            _ = DownloadPatronsJson();
-        }
-
-        private async Task DownloadPatronsJson()
-        {
-            if (!NetworkInterface.GetIsNetworkAvailable())
-            {
-                _patreonNamesText.Buffer.Text = "Connection Error.";
-            }
-
-            HttpClient httpClient = new();
-
-            try
-            {
-                string patreonJsonString = await httpClient.GetStringAsync("https://patreon.ryujinx.org/");
-
-                _patreonNamesText.Buffer.Text = string.Join(", ", JsonHelper.Deserialize(patreonJsonString, CommonJsonContext.Default.StringArray));
-            }
-            catch
-            {
-                _patreonNamesText.Buffer.Text = "API Error.";
-            }
-        }
-
-        //
-        // Events
-        //
-        private void RyujinxButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://ryujinx.org");
-        }
-
-        private void AmiiboApiButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://amiiboapi.com");
-        }
-
-        private void PatreonButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://www.patreon.com/ryujinx");
-        }
-
-        private void GitHubButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://github.com/Ryujinx/Ryujinx");
-        }
-
-        private void DiscordButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://discordapp.com/invite/N2FmfVc");
-        }
-
-        private void TwitterButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://twitter.com/RyujinxEmu");
-        }
-
-        private void ContributorsButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://github.com/Ryujinx/Ryujinx/graphs/contributors?type=a");
-        }
-
-        private void ChangelogButton_Pressed(object sender, ButtonPressEventArgs args)
-        {
-            OpenHelper.OpenUrl("https://github.com/Ryujinx/Ryujinx/wiki/Changelog#ryujinx-changelog");
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.Designer.cs

@@ -1,190 +0,0 @@
-using Gtk;
-
-namespace Ryujinx.UI.Windows
-{
-    public partial class AmiiboWindow : Window
-    {
-        private Box _mainBox;
-        private ButtonBox _buttonBox;
-        private Button _scanButton;
-        private Button _cancelButton;
-        private CheckButton _randomUuidCheckBox;
-        private Box _amiiboBox;
-        private Box _amiiboHeadBox;
-        private Box _amiiboSeriesBox;
-        private Label _amiiboSeriesLabel;
-        private ComboBoxText _amiiboSeriesComboBox;
-        private Box _amiiboCharsBox;
-        private Label _amiiboCharsLabel;
-        private ComboBoxText _amiiboCharsComboBox;
-        private CheckButton _showAllCheckBox;
-        private Image _amiiboImage;
-        private Label _gameUsageLabel;
-
-        private void InitializeComponent()
-        {
-            //
-            // AmiiboWindow
-            //
-            CanFocus = false;
-            Resizable = false;
-            Modal = true;
-            WindowPosition = WindowPosition.Center;
-            DefaultWidth = 600;
-            DefaultHeight = 470;
-            TypeHint = Gdk.WindowTypeHint.Dialog;
-
-            //
-            // _mainBox
-            //
-            _mainBox = new Box(Orientation.Vertical, 2);
-
-            //
-            // _buttonBox
-            //
-            _buttonBox = new ButtonBox(Orientation.Horizontal)
-            {
-                Margin = 20,
-                LayoutStyle = ButtonBoxStyle.End,
-            };
-
-            //
-            // _scanButton
-            //
-            _scanButton = new Button()
-            {
-                Label = "Scan It!",
-                CanFocus = true,
-                ReceivesDefault = true,
-                MarginStart = 10,
-            };
-            _scanButton.Clicked += ScanButton_Pressed;
-
-            //
-            // _randomUuidCheckBox
-            //
-            _randomUuidCheckBox = new CheckButton()
-            {
-                Label = "Hack: Use Random Tag Uuid",
-                TooltipText = "This allows multiple scans of a single Amiibo.\n(used in The Legend of Zelda: Breath of the Wild)",
-            };
-
-            //
-            // _cancelButton
-            //
-            _cancelButton = new Button()
-            {
-                Label = "Cancel",
-                CanFocus = true,
-                ReceivesDefault = true,
-                MarginStart = 10,
-            };
-            _cancelButton.Clicked += CancelButton_Pressed;
-
-            //
-            // _amiiboBox
-            //
-            _amiiboBox = new Box(Orientation.Vertical, 0);
-
-            //
-            // _amiiboHeadBox
-            //
-            _amiiboHeadBox = new Box(Orientation.Horizontal, 0)
-            {
-                Margin = 20,
-                Hexpand = true,
-            };
-
-            //
-            // _amiiboSeriesBox
-            //
-            _amiiboSeriesBox = new Box(Orientation.Horizontal, 0)
-            {
-                Hexpand = true,
-            };
-
-            //
-            // _amiiboSeriesLabel
-            //
-            _amiiboSeriesLabel = new Label("Amiibo Series:");
-
-            //
-            // _amiiboSeriesComboBox
-            //
-            _amiiboSeriesComboBox = new ComboBoxText();
-
-            //
-            // _amiiboCharsBox
-            //
-            _amiiboCharsBox = new Box(Orientation.Horizontal, 0)
-            {
-                Hexpand = true,
-            };
-
-            //
-            // _amiiboCharsLabel
-            //
-            _amiiboCharsLabel = new Label("Character:");
-
-            //
-            // _amiiboCharsComboBox
-            //
-            _amiiboCharsComboBox = new ComboBoxText();
-
-            //
-            // _showAllCheckBox
-            //
-            _showAllCheckBox = new CheckButton()
-            {
-                Label = "Show All Amiibo",
-            };
-
-            //
-            // _amiiboImage
-            //
-            _amiiboImage = new Image()
-            {
-                HeightRequest = 350,
-                WidthRequest = 350,
-            };
-
-            //
-            // _gameUsageLabel
-            //
-            _gameUsageLabel = new Label("")
-            {
-                MarginTop = 20,
-            };
-
-            ShowComponent();
-        }
-
-        private void ShowComponent()
-        {
-            _buttonBox.Add(_showAllCheckBox);
-            _buttonBox.Add(_randomUuidCheckBox);
-            _buttonBox.Add(_scanButton);
-            _buttonBox.Add(_cancelButton);
-
-            _amiiboSeriesBox.Add(_amiiboSeriesLabel);
-            _amiiboSeriesBox.Add(_amiiboSeriesComboBox);
-
-            _amiiboCharsBox.Add(_amiiboCharsLabel);
-            _amiiboCharsBox.Add(_amiiboCharsComboBox);
-
-            _amiiboHeadBox.Add(_amiiboSeriesBox);
-            _amiiboHeadBox.Add(_amiiboCharsBox);
-
-            _amiiboBox.PackStart(_amiiboHeadBox, true, true, 0);
-            _amiiboBox.PackEnd(_gameUsageLabel, false, false, 0);
-            _amiiboBox.PackEnd(_amiiboImage, false, false, 0);
-
-            _mainBox.Add(_amiiboBox);
-            _mainBox.PackEnd(_buttonBox, false, false, 0);
-
-            Add(_mainBox);
-
-            ShowAll();
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs

@@ -1,438 +0,0 @@
-using Gdk;
-using Gtk;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.UI.Common.Configuration;
-using Ryujinx.UI.Common.Models.Amiibo;
-using Ryujinx.UI.Widgets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Window = Gtk.Window;
-
-namespace Ryujinx.UI.Windows
-{
-    public partial class AmiiboWindow : Window
-    {
-        private const string DefaultJson = "{ \"amiibo\": [] }";
-
-        public string AmiiboId { get; private set; }
-
-        public int DeviceId { get; set; }
-        public string TitleId { get; set; }
-        public string LastScannedAmiiboId { get; set; }
-        public bool LastScannedAmiiboShowAll { get; set; }
-
-        public ResponseType Response { get; private set; }
-
-        public bool UseRandomUuid
-        {
-            get
-            {
-                return _randomUuidCheckBox.Active;
-            }
-        }
-
-        private readonly HttpClient _httpClient;
-        private readonly string _amiiboJsonPath;
-
-        private readonly byte[] _amiiboLogoBytes;
-
-        private List<AmiiboApi> _amiiboList;
-
-        private static readonly AmiiboJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
-
-        public AmiiboWindow() : base($"Ryujinx {Program.Version} - Amiibo")
-        {
-            Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
-
-            InitializeComponent();
-
-            _httpClient = new HttpClient
-            {
-                Timeout = TimeSpan.FromSeconds(30),
-            };
-
-            Directory.CreateDirectory(System.IO.Path.Join(AppDataManager.BaseDirPath, "system", "amiibo"));
-
-            _amiiboJsonPath = System.IO.Path.Join(AppDataManager.BaseDirPath, "system", "amiibo", "Amiibo.json");
-            _amiiboList = new List<AmiiboApi>();
-
-            _amiiboLogoBytes = EmbeddedResources.Read("Ryujinx.UI.Common/Resources/Logo_Amiibo.png");
-            _amiiboImage.Pixbuf = new Pixbuf(_amiiboLogoBytes);
-
-            _scanButton.Sensitive = false;
-            _randomUuidCheckBox.Sensitive = false;
-
-            _ = LoadContentAsync();
-        }
-
-        private static bool TryGetAmiiboJson(string json, out AmiiboJson amiiboJson)
-        {
-            if (string.IsNullOrEmpty(json))
-            {
-                amiiboJson = JsonHelper.Deserialize(DefaultJson, _serializerContext.AmiiboJson);
-
-                return false;
-            }
-
-            try
-            {
-                amiiboJson = JsonHelper.Deserialize(json, _serializerContext.AmiiboJson);
-
-                return true;
-            }
-            catch (JsonException exception)
-            {
-                Logger.Error?.Print(LogClass.Application, $"Unable to deserialize amiibo data: {exception}");
-                amiiboJson = JsonHelper.Deserialize(DefaultJson, _serializerContext.AmiiboJson);
-
-                return false;
-            }
-        }
-
-        private async Task<AmiiboJson> GetMostRecentAmiiboListOrDefaultJson()
-        {
-            bool localIsValid = false;
-            bool remoteIsValid = false;
-            AmiiboJson amiiboJson = new();
-
-            try
-            {
-                try
-                {
-                    if (File.Exists(_amiiboJsonPath))
-                    {
-                        localIsValid = TryGetAmiiboJson(await File.ReadAllTextAsync(_amiiboJsonPath), out amiiboJson);
-                    }
-                }
-                catch (Exception exception)
-                {
-                    Logger.Warning?.Print(LogClass.Application, $"Unable to read data from '{_amiiboJsonPath}': {exception}");
-                }
-
-                if (!localIsValid || await NeedsUpdate(amiiboJson.LastUpdated))
-                {
-                    remoteIsValid = TryGetAmiiboJson(await DownloadAmiiboJson(), out amiiboJson);
-                }
-            }
-            catch (Exception exception)
-            {
-                if (!(localIsValid || remoteIsValid))
-                {
-                    Logger.Error?.Print(LogClass.Application, $"Couldn't get valid amiibo data: {exception}");
-
-                    // Neither local or remote files are valid JSON, close window.
-                    ShowInfoDialog();
-                    Close();
-                }
-                else if (!remoteIsValid)
-                {
-                    Logger.Warning?.Print(LogClass.Application, $"Couldn't update amiibo data: {exception}");
-
-                    // Only the local file is valid, the local one should be used
-                    // but the user should be warned.
-                    ShowInfoDialog();
-                }
-            }
-
-            return amiiboJson;
-        }
-
-        private async Task LoadContentAsync()
-        {
-            AmiiboJson amiiboJson = await GetMostRecentAmiiboListOrDefaultJson();
-
-            _amiiboList = amiiboJson.Amiibo.OrderBy(amiibo => amiibo.AmiiboSeries).ToList();
-
-            if (LastScannedAmiiboShowAll)
-            {
-                _showAllCheckBox.Click();
-            }
-
-            ParseAmiiboData();
-
-            _showAllCheckBox.Clicked += ShowAllCheckBox_Clicked;
-        }
-
-        private void ParseAmiiboData()
-        {
-            List<string> comboxItemList = new();
-
-            for (int i = 0; i < _amiiboList.Count; i++)
-            {
-                if (!comboxItemList.Contains(_amiiboList[i].AmiiboSeries))
-                {
-                    if (!_showAllCheckBox.Active)
-                    {
-                        foreach (var game in _amiiboList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    comboxItemList.Add(_amiiboList[i].AmiiboSeries);
-                                    _amiiboSeriesComboBox.Append(_amiiboList[i].AmiiboSeries, _amiiboList[i].AmiiboSeries);
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        comboxItemList.Add(_amiiboList[i].AmiiboSeries);
-                        _amiiboSeriesComboBox.Append(_amiiboList[i].AmiiboSeries, _amiiboList[i].AmiiboSeries);
-                    }
-                }
-            }
-
-            _amiiboSeriesComboBox.Changed += SeriesComboBox_Changed;
-            _amiiboCharsComboBox.Changed += CharacterComboBox_Changed;
-
-            if (LastScannedAmiiboId != "")
-            {
-                SelectLastScannedAmiibo();
-            }
-            else
-            {
-                _amiiboSeriesComboBox.Active = 0;
-            }
-        }
-
-        private void SelectLastScannedAmiibo()
-        {
-            bool isSet = _amiiboSeriesComboBox.SetActiveId(_amiiboList.Find(amiibo => amiibo.Head + amiibo.Tail == LastScannedAmiiboId).AmiiboSeries);
-            isSet = _amiiboCharsComboBox.SetActiveId(LastScannedAmiiboId);
-
-            if (isSet == false)
-            {
-                _amiiboSeriesComboBox.Active = 0;
-            }
-        }
-
-        private async Task<bool> NeedsUpdate(DateTime oldLastModified)
-        {
-            try
-            {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://amiibo.ryujinx.org/"));
-
-                if (response.IsSuccessStatusCode)
-                {
-                    return response.Content.Headers.LastModified != oldLastModified;
-                }
-            }
-            catch (HttpRequestException exception)
-            {
-                Logger.Error?.Print(LogClass.Application, $"Unable to check for amiibo data updates: {exception}");
-            }
-
-            return false;
-        }
-
-        private async Task<string> DownloadAmiiboJson()
-        {
-            try
-            {
-                HttpResponseMessage response = await _httpClient.GetAsync("https://amiibo.ryujinx.org/");
-
-                if (response.IsSuccessStatusCode)
-                {
-                    string amiiboJsonString = await response.Content.ReadAsStringAsync();
-
-                    try
-                    {
-                        using FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough);
-                        dlcJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString));
-                    }
-                    catch (Exception exception)
-                    {
-                        Logger.Warning?.Print(LogClass.Application, $"Couldn't write amiibo data to file '{_amiiboJsonPath}: {exception}'");
-                    }
-
-                    return amiiboJsonString;
-                }
-
-                Logger.Error?.Print(LogClass.Application, $"Failed to download amiibo data. Response status code: {response.StatusCode}");
-            }
-            catch (HttpRequestException exception)
-            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to request amiibo data: {exception}");
-            }
-
-            GtkDialog.CreateInfoDialog("Amiibo API", "An error occured while fetching information from the API.");
-
-            return null;
-        }
-
-        private async Task UpdateAmiiboPreview(string imageUrl)
-        {
-            HttpResponseMessage response = await _httpClient.GetAsync(imageUrl);
-
-            if (response.IsSuccessStatusCode)
-            {
-                byte[] amiiboPreviewBytes = await response.Content.ReadAsByteArrayAsync();
-                Pixbuf amiiboPreview = new(amiiboPreviewBytes);
-
-                float ratio = Math.Min((float)_amiiboImage.AllocatedWidth / amiiboPreview.Width,
-                                       (float)_amiiboImage.AllocatedHeight / amiiboPreview.Height);
-
-                int resizeHeight = (int)(amiiboPreview.Height * ratio);
-                int resizeWidth = (int)(amiiboPreview.Width * ratio);
-
-                _amiiboImage.Pixbuf = amiiboPreview.ScaleSimple(resizeWidth, resizeHeight, InterpType.Bilinear);
-            }
-            else
-            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to get amiibo preview. Response status code: {response.StatusCode}");
-            }
-        }
-
-        private static void ShowInfoDialog()
-        {
-            GtkDialog.CreateInfoDialog("Amiibo API", "Unable to connect to Amiibo API server. The service may be down or you may need to verify your internet connection is online.");
-        }
-
-        //
-        // Events
-        //
-        private void SeriesComboBox_Changed(object sender, EventArgs args)
-        {
-            _amiiboCharsComboBox.Changed -= CharacterComboBox_Changed;
-
-            _amiiboCharsComboBox.RemoveAll();
-
-            List<AmiiboApi> amiiboSortedList = _amiiboList.Where(amiibo => amiibo.AmiiboSeries == _amiiboSeriesComboBox.ActiveId).OrderBy(amiibo => amiibo.Name).ToList();
-
-            List<string> comboxItemList = new();
-
-            for (int i = 0; i < amiiboSortedList.Count; i++)
-            {
-                if (!comboxItemList.Contains(amiiboSortedList[i].Head + amiiboSortedList[i].Tail))
-                {
-                    if (!_showAllCheckBox.Active)
-                    {
-                        foreach (var game in amiiboSortedList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    comboxItemList.Add(amiiboSortedList[i].Head + amiiboSortedList[i].Tail);
-                                    _amiiboCharsComboBox.Append(amiiboSortedList[i].Head + amiiboSortedList[i].Tail, amiiboSortedList[i].Name);
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        comboxItemList.Add(amiiboSortedList[i].Head + amiiboSortedList[i].Tail);
-                        _amiiboCharsComboBox.Append(amiiboSortedList[i].Head + amiiboSortedList[i].Tail, amiiboSortedList[i].Name);
-                    }
-                }
-            }
-
-            _amiiboCharsComboBox.Changed += CharacterComboBox_Changed;
-
-            _amiiboCharsComboBox.Active = 0;
-
-            _scanButton.Sensitive = true;
-            _randomUuidCheckBox.Sensitive = true;
-        }
-
-        private void CharacterComboBox_Changed(object sender, EventArgs args)
-        {
-            AmiiboId = _amiiboCharsComboBox.ActiveId;
-
-            _amiiboImage.Pixbuf = new Pixbuf(_amiiboLogoBytes);
-
-            string imageUrl = _amiiboList.Find(amiibo => amiibo.Head + amiibo.Tail == _amiiboCharsComboBox.ActiveId).Image;
-
-            var usageStringBuilder = new StringBuilder();
-
-            for (int i = 0; i < _amiiboList.Count; i++)
-            {
-                if (_amiiboList[i].Head + _amiiboList[i].Tail == _amiiboCharsComboBox.ActiveId)
-                {
-                    bool writable = false;
-
-                    foreach (var item in _amiiboList[i].GamesSwitch)
-                    {
-                        if (item.GameId.Contains(TitleId))
-                        {
-                            foreach (AmiiboApiUsage usageItem in item.AmiiboUsage)
-                            {
-                                usageStringBuilder.Append(Environment.NewLine);
-                                usageStringBuilder.Append($"- {usageItem.Usage.Replace("/", Environment.NewLine + "-")}");
-
-                                writable = usageItem.Write;
-                            }
-                        }
-                    }
-
-                    if (usageStringBuilder.Length == 0)
-                    {
-                        usageStringBuilder.Append("Unknown.");
-                    }
-
-                    _gameUsageLabel.Text = $"Usage{(writable ? " (Writable)" : "")} : {usageStringBuilder}";
-                }
-            }
-
-            _ = UpdateAmiiboPreview(imageUrl);
-        }
-
-        private void ShowAllCheckBox_Clicked(object sender, EventArgs e)
-        {
-            _amiiboImage.Pixbuf = new Pixbuf(_amiiboLogoBytes);
-
-            _amiiboSeriesComboBox.Changed -= SeriesComboBox_Changed;
-            _amiiboCharsComboBox.Changed -= CharacterComboBox_Changed;
-
-            _amiiboSeriesComboBox.RemoveAll();
-            _amiiboCharsComboBox.RemoveAll();
-
-            _scanButton.Sensitive = false;
-            _randomUuidCheckBox.Sensitive = false;
-
-            new Task(ParseAmiiboData).Start();
-        }
-
-        private void ScanButton_Pressed(object sender, EventArgs args)
-        {
-            LastScannedAmiiboShowAll = _showAllCheckBox.Active;
-
-            Response = ResponseType.Ok;
-
-            Close();
-        }
-
-        private void CancelButton_Pressed(object sender, EventArgs args)
-        {
-            AmiiboId = "";
-            LastScannedAmiiboId = "";
-            LastScannedAmiiboShowAll = false;
-
-            Response = ResponseType.Cancel;
-
-            Close();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            _httpClient.Dispose();
-
-            base.Dispose(disposing);
-        }
-    }
-}

src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs

@@ -1,298 +0,0 @@
-using Gtk;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
-using LibHac.Ncm;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Common.Memory;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.UI.Common.Configuration;
-using SkiaSharp;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.UI.Windows
-{
-    public class AvatarWindow : Window
-    {
-        public byte[] SelectedProfileImage;
-        public bool NewUser;
-
-        private static readonly Dictionary<string, byte[]> _avatarDict = new();
-
-        private readonly ListStore _listStore;
-        private readonly IconView _iconView;
-        private readonly Button _setBackgroungColorButton;
-        private Gdk.RGBA _backgroundColor;
-
-        public AvatarWindow() : base($"Ryujinx {Program.Version} - Manage Accounts - Avatar")
-        {
-            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
-
-            CanFocus = false;
-            Resizable = false;
-            Modal = true;
-            TypeHint = Gdk.WindowTypeHint.Dialog;
-
-            SetDefaultSize(740, 400);
-            SetPosition(WindowPosition.Center);
-
-            Box vbox = new(Orientation.Vertical, 0);
-            Add(vbox);
-
-            ScrolledWindow scrolledWindow = new()
-            {
-                ShadowType = ShadowType.EtchedIn,
-            };
-            scrolledWindow.SetPolicy(PolicyType.Automatic, PolicyType.Automatic);
-
-            Box hbox = new(Orientation.Horizontal, 0);
-
-            Button chooseButton = new()
-            {
-                Label = "Choose",
-                CanFocus = true,
-                ReceivesDefault = true,
-            };
-            chooseButton.Clicked += ChooseButton_Pressed;
-
-            _setBackgroungColorButton = new Button()
-            {
-                Label = "Set Background Color",
-                CanFocus = true,
-            };
-            _setBackgroungColorButton.Clicked += SetBackgroungColorButton_Pressed;
-
-            _backgroundColor.Red = 1;
-            _backgroundColor.Green = 1;
-            _backgroundColor.Blue = 1;
-            _backgroundColor.Alpha = 1;
-
-            Button closeButton = new()
-            {
-                Label = "Close",
-                CanFocus = true,
-            };
-            closeButton.Clicked += CloseButton_Pressed;
-
-            vbox.PackStart(scrolledWindow, true, true, 0);
-            hbox.PackStart(chooseButton, true, true, 0);
-            hbox.PackStart(_setBackgroungColorButton, true, true, 0);
-            hbox.PackStart(closeButton, true, true, 0);
-            vbox.PackStart(hbox, false, false, 0);
-
-            _listStore = new ListStore(typeof(string), typeof(Gdk.Pixbuf));
-            _listStore.SetSortColumnId(0, SortType.Ascending);
-
-            _iconView = new IconView(_listStore)
-            {
-                ItemWidth = 64,
-                ItemPadding = 10,
-                PixbufColumn = 1,
-            };
-
-            _iconView.SelectionChanged += IconView_SelectionChanged;
-
-            scrolledWindow.Add(_iconView);
-
-            _iconView.GrabFocus();
-
-            ProcessAvatars();
-
-            ShowAll();
-        }
-
-        public static void PreloadAvatars(ContentManager contentManager, VirtualFileSystem virtualFileSystem)
-        {
-            if (_avatarDict.Count > 0)
-            {
-                return;
-            }
-
-            string contentPath = contentManager.GetInstalledContentPath(0x010000000000080A, StorageId.BuiltInSystem, NcaContentType.Data);
-            string avatarPath = VirtualFileSystem.SwitchPathToSystemPath(contentPath);
-
-            if (!string.IsNullOrWhiteSpace(avatarPath))
-            {
-                using IStorage ncaFileStream = new LocalStorage(avatarPath, FileAccess.Read, FileMode.Open);
-
-                Nca nca = new(virtualFileSystem.KeySet, ncaFileStream);
-                IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
-
-                foreach (var item in romfs.EnumerateEntries())
-                {
-                    // TODO: Parse DatabaseInfo.bin and table.bin files for more accuracy.
-
-                    if (item.Type == DirectoryEntryType.File && item.FullPath.Contains("chara") && item.FullPath.Contains("szs"))
-                    {
-                        using var file = new UniqueRef<IFile>();
-
-                        romfs.OpenFile(ref file.Ref, ("/" + item.FullPath).ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                        using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-                        using MemoryStream streamPng = MemoryStreamManager.Shared.GetStream();
-                        file.Get.AsStream().CopyTo(stream);
-
-                        stream.Position = 0;
-
-                        using var avatarImage = new SKBitmap(new SKImageInfo(256, 256, SKColorType.Rgba8888));
-                        var data = DecompressYaz0(stream);
-                        Marshal.Copy(data, 0, avatarImage.GetPixels(), data.Length);
-
-                        avatarImage.Encode(streamPng, SKEncodedImageFormat.Png, 80);
-
-                        _avatarDict.Add(item.FullPath, streamPng.ToArray());
-                    }
-                }
-            }
-        }
-
-        private void ProcessAvatars()
-        {
-            _listStore.Clear();
-
-            foreach (var avatar in _avatarDict)
-            {
-                _listStore.AppendValues(avatar.Key, new Gdk.Pixbuf(ProcessImage(avatar.Value), 96, 96));
-            }
-
-            _iconView.SelectPath(new TreePath(new[] { 0 }));
-        }
-
-        private byte[] ProcessImage(byte[] data)
-        {
-            using MemoryStream streamJpg = MemoryStreamManager.Shared.GetStream();
-
-            using var avatarImage = SKBitmap.Decode(data);
-            using var surface = SKSurface.Create(avatarImage.Info);
-
-            var background = new SKColor(
-                (byte)(_backgroundColor.Red * 255),
-                (byte)(_backgroundColor.Green * 255),
-                (byte)(_backgroundColor.Blue * 255),
-                (byte)(_backgroundColor.Alpha * 255)
-            );
-            var canvas = surface.Canvas;
-            canvas.Clear(background);
-            canvas.DrawBitmap(avatarImage, new SKPoint());
-
-            surface.Flush();
-            using var snapshot = surface.Snapshot();
-            using var encoded = snapshot.Encode(SKEncodedImageFormat.Jpeg, 80);
-            encoded.SaveTo(streamJpg);
-
-            return streamJpg.ToArray();
-        }
-
-        private void CloseButton_Pressed(object sender, EventArgs e)
-        {
-            SelectedProfileImage = null;
-
-            Close();
-        }
-
-        private void IconView_SelectionChanged(object sender, EventArgs e)
-        {
-            if (_iconView.SelectedItems.Length > 0)
-            {
-                _listStore.GetIter(out TreeIter iter, _iconView.SelectedItems[0]);
-
-                SelectedProfileImage = ProcessImage(_avatarDict[(string)_listStore.GetValue(iter, 0)]);
-            }
-        }
-
-        private void SetBackgroungColorButton_Pressed(object sender, EventArgs e)
-        {
-            using ColorChooserDialog colorChooserDialog = new("Set Background Color", this);
-
-            colorChooserDialog.UseAlpha = false;
-            colorChooserDialog.Rgba = _backgroundColor;
-
-            if (colorChooserDialog.Run() == (int)ResponseType.Ok)
-            {
-                _backgroundColor = colorChooserDialog.Rgba;
-
-                ProcessAvatars();
-            }
-
-            colorChooserDialog.Hide();
-        }
-
-        private void ChooseButton_Pressed(object sender, EventArgs e)
-        {
-            Close();
-        }
-
-        private static byte[] DecompressYaz0(Stream stream)
-        {
-            using BinaryReader reader = new(stream);
-
-            reader.ReadInt32(); // Magic
-
-            uint decodedLength = BinaryPrimitives.ReverseEndianness(reader.ReadUInt32());
-
-            reader.ReadInt64(); // Padding
-
-            byte[] input = new byte[stream.Length - stream.Position];
-            stream.ReadExactly(input, 0, input.Length);
-
-            long inputOffset = 0;
-
-            byte[] output = new byte[decodedLength];
-            long outputOffset = 0;
-
-            ushort mask = 0;
-            byte header = 0;
-
-            while (outputOffset < decodedLength)
-            {
-                if ((mask >>= 1) == 0)
-                {
-                    header = input[inputOffset++];
-                    mask = 0x80;
-                }
-
-                if ((header & mask) > 0)
-                {
-                    if (outputOffset == output.Length)
-                    {
-                        break;
-                    }
-
-                    output[outputOffset++] = input[inputOffset++];
-                }
-                else
-                {
-                    byte byte1 = input[inputOffset++];
-                    byte byte2 = input[inputOffset++];
-
-                    int dist = ((byte1 & 0xF) << 8) | byte2;
-                    int position = (int)outputOffset - (dist + 1);
-
-                    int length = byte1 >> 4;
-                    if (length == 0)
-                    {
-                        length = input[inputOffset++] + 0x12;
-                    }
-                    else
-                    {
-                        length += 2;
-                    }
-
-                    while (length-- > 0)
-                    {
-                        output[outputOffset++] = output[position++];
-                    }
-                }
-            }
-
-            return output;
-        }
-    }
-}