ios: Add auto-accelerate for touch controls (#250 )

* ios: add mobile touch auto-accelerate support Port KartPad's auto-accelerate accessibility feature to WiiCompiled: - Holding button A on touch controls for 1 second locks acceleration. - Latched acceleration renders with a prominent cyan highlight ring/glow, matching KartPad's visual feedback. - Tapping button A while locked immediately unlocks acceleration. - Auto-accelerate is enabled by default with persistent opt-out in Config.toml (`touch_auto_accelerate = false`) and an in-game checkbox under Controller Settings. - Disabling auto-accelerate or connecting a physical controller immediately cancels any active latch while preserving genuine physical holds. - Includes comprehensive automated unit tests in touch_auto_accelerate_tests. * test, ios: address review feedback on touch auto-accelerate * touch_pad: ignore active controls in PollFpsTap and use triggerL/triggerR
feature: iOS Support (#116 )
2026-10-17 12:48:15 -04:00 · 2026-09-24 12:35:21 +02:00 · 2026-09-05 10:12:53 +02:00
219 changed files with 2834 additions and 14882 deletions
@@ -3,4 +3,3 @@

 # Patch files must stay LF: git apply matches context bytes against LF upstream sources
 *.patch -text
-translator/tests/Translator.Tests/TestAssets/**/*.bin binary
@@ -14,10 +14,6 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  recompilation:
-    name: Recompilation test
-    uses: ./.github/workflows/recomp-test.yml
-
  translator:
    name: Translator (build + test)
    runs-on: windows-latest
@@ -30,14 +26,6 @@ jobs:
        with:
          dotnet-version: '8.0.x'

-      - name: Cache NuGet packages
-        uses: actions/cache@v5
-        with:
-          path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('translator/Translator.sln', '**/*.csproj', '**/*.props', '**/*.targets', '**/packages.lock.json', 'global.json', 'NuGet.config', 'nuget.config') }}
-          restore-keys: |
-            ${{ runner.os }}-nuget-
-
      - name: Restore
        run: dotnet restore translator/Translator.sln

@@ -47,66 +35,45 @@ jobs:
      - name: Test
        run: dotnet test translator/Translator.sln -c Release --no-build --verbosity normal

-  platform_tests:
-    name: Host platform (${{ matrix.runner }})
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [ubuntu-24.04, macos-14, macos-15-intel]
-    runs-on: ${{ matrix.runner }}
+  ios-crosscompile:
+    name: iOS arm64 (cross-compile, no Xcode)
+    runs-on: ubuntu-24.04
+    env:
+      IOS_SDK_DIR: ${{ github.workspace }}/iOS-SDKs/iPhoneOS26.5.sdk
    steps:
      - uses: actions/checkout@v7
        with:
          persist-credentials: false

-      - name: Configure without graphics dependencies or game assets
-        run: >-
-          cmake -S runtime -B build-platform -G Ninja
-          -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-          -DMKW_BUILD_PRODUCTS=OFF -DMKW_PLATFORM_TESTS_ONLY=ON
-
-      - name: Build and run host-platform tests
+      # The runner images carry clang up to 18; the iOS toolchain file is tested
+      # against upstream 19, so take it from apt.llvm.org rather than the archive.
+      - name: Install clang 19, lld and ninja
        run: |
-          cmake --build build-platform --parallel 3
-          ctest --test-dir build-platform --output-on-failure
+          wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh
+          chmod +x /tmp/llvm.sh
+          sudo /tmp/llvm.sh 19
+          sudo apt-get install -y lld-19 ninja-build

-  macos_substrate:
-    name: macOS arm64 (configure + substrate tests)
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          persist-credentials: false
-
-      - name: Test macOS app dependency packaging
-        shell: bash
-        run: bash Launcher/macos/test-publish-app.command
-
-      - name: Configure native runtime
-        shell: bash
+      # The only Apple piece in the build. Sparse-cloned so the checkout is one
+      # SDK (~50 MB) rather than every SDK the repository carries.
+      - name: Fetch the iPhoneOS SDK
        run: |
-          test "$(uname -m)" = arm64
-          cmake -S runtime -B build-macos -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release -DMKW_BUILD_PRODUCTS=OFF
-          grep -qx 'CMAKE_OSX_DEPLOYMENT_TARGET:STRING=12.0' \
-            build-macos/CMakeCache.txt
+          git clone --depth 1 --filter=blob:none --sparse \
+              https://github.com/xybp888/iOS-SDKs.git "${{ github.workspace }}/iOS-SDKs"
+          git -C "${{ github.workspace }}/iOS-SDKs" sparse-checkout set --no-cone iPhoneOS26.5.sdk

-      - name: Build macOS portability targets
-        shell: bash
+      # Compile-only: linking a product needs the translated shards, which come
+      # from the user's own Mario Kart Wii dump and are not in this repository.
+      # This proves the runtime's own sources still build for iOS arm64.
+      - name: Configure
        run: |
-          cmake --build build-macos --target \
-            mkw_platform_paths_tests \
-            mkw_runtime_config_tests \
-            mkw_nand_save_tests \
-            mkw_nand_settings_tests \
-            mkw_sc_serial_tests \
-            mkw_input_expr_tests \
-            mkw_macos_native_compile \
-            mkw_macos_context_abi_tests \
-            mkw_macos_host_context_tests \
-            mkw_macos_guest_flat_memory_tests \
-            mkw_macos_external_audio_tests
+          cmake -S runtime -B build-ios -G Ninja -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/runtime/cmake/ios-linux-toolchain.cmake" \
+              -DIOS_SDK="$IOS_SDK_DIR" \
+              -DMKW_IOS_LLVM_BIN=/usr/lib/llvm-19/bin \
+              -DMKW_BUILD_PRODUCTS=OFF \
+              -DCMAKE_DISABLE_FIND_PACKAGE_absl=TRUE \
+              -DAURORA_DAWN_PROVIDER=package

-      - name: Test execution substrate
-        shell: bash
-        run: ctest --test-dir build-macos --output-on-failure
+      - name: Compile the runtime sources for iOS
+        run: cmake --build build-ios --target mkw_macos_native_compile
@@ -1,8 +1,8 @@
 name: Package installers

 # Builds the per-platform installer/setup tool (WiiCompiled-Setup.exe /
-# WiiCompiled-Setup-x86_64.AppImage / WiiCompiled-Setup.pkg) via the platform packaging scripts -
-# the same scripts a maintainer runs by hand today to
+# WiiCompiled-Setup-x86_64.AppImage) via Launcher/Build-Installer.ps1 and
+# Launcher/build-appimage.sh respectively - the same scripts a maintainer runs by hand today to
 # produce a GitHub Release asset. This does NOT build the actual translated game executable:
 # that step requires the end user's own Mario Kart Wii dump (Assets/main.dol, Assets/StaticR.rel),
 # which is proprietary and not present in this repository or in CI.
@@ -11,11 +11,6 @@ on:
    tags:
      - '*'
  workflow_dispatch:
-    inputs:
-      version:
-        description: Package version
-        required: true
-        type: string

 permissions:
  contents: read
@@ -25,10 +20,6 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  recompilation:
-    name: Recompilation test
-    uses: ./.github/workflows/recomp-test.yml
-
  linux-appimage:
    name: Linux (AppImage, ${{ matrix.arch }})
    strategy:
@@ -95,139 +86,14 @@ jobs:
          if-no-files-found: error
          archive: false

-  macos-setup-package:
-    name: macOS (universal Setup.pkg)
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          persist-credentials: false
-
-      - uses: actions/setup-dotnet@v6
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Verify Apple Silicon runner
-        shell: bash
-        run: |
-          test "$(uname -m)" = arm64
-          xcode-select -p
-
-      - name: Download pinned Nod tools
-        shell: bash
-        run: |
-          mkdir -p Launcher/artifacts/macos
-          nodtool_version=v2.0.0-alpha.10
-          nodtool_arm64_asset=nodtool-macos-arm64
-          nodtool_arm64_sha256=e23ca466999b720c55e6d29c9683fce8cc74451ba64ead2e543d50129f24528a
-          nodtool_x86_64_asset=nodtool-macos-x86_64
-          nodtool_x86_64_sha256=f68f504dc2b72694b468ca78b6a24142c7aa5c8800f77564297f4143682e6575
-          curl -fsSL --retry 3 \
-            "https://github.com/encounter/nod/releases/download/${nodtool_version}/${nodtool_arm64_asset}" \
-            -o Launcher/artifacts/macos/nodtool-arm64
-          curl -fsSL --retry 3 \
-            "https://github.com/encounter/nod/releases/download/${nodtool_version}/${nodtool_x86_64_asset}" \
-            -o Launcher/artifacts/macos/nodtool-x86_64
-          printf '%s  %s\n' "$nodtool_arm64_sha256" Launcher/artifacts/macos/nodtool-arm64 | shasum -a 256 -c -
-          printf '%s  %s\n' "$nodtool_x86_64_sha256" Launcher/artifacts/macos/nodtool-x86_64 | shasum -a 256 -c -
-          chmod +x Launcher/artifacts/macos/nodtool-arm64 Launcher/artifacts/macos/nodtool-x86_64
-
-      - name: Publish self-contained Translator tools
-        shell: bash
-        run: |
-          dotnet publish translator/src/Translator.Cli/Translator.Cli.csproj \
-            -c Release -r osx-arm64 --self-contained true \
-            -p:PublishSingleFile=true \
-            -o Launcher/artifacts/macos/translator-arm64
-          dotnet publish translator/src/Translator.Cli/Translator.Cli.csproj \
-            -c Release -r osx-x64 --self-contained true \
-            -p:PublishSingleFile=true \
-            -o Launcher/artifacts/macos/translator-x86_64
-
-      - name: Download pinned universal Ninja
-        shell: bash
-        run: |
-          ninja_version=1.13.2
-          ninja_sha256=c99048673aa765960a99cf10c6ddb9f1fad506099ff0a0e137ad8960a88f321b
-          curl -fsSL --retry 3 "https://github.com/ninja-build/ninja/releases/download/v${ninja_version}/ninja-mac.zip" -o ninja-mac.zip
-          printf '%s  %s\n' "$ninja_sha256" ninja-mac.zip | shasum -a 256 -c -
-          unzip -q ninja-mac.zip -d Launcher/artifacts/macos/ninja
-          chmod +x Launcher/artifacts/macos/ninja/ninja
-
-      - name: Download pinned portable CMake
-        shell: bash
-        run: |
-          cmake_version=4.4.3
-          archive="cmake-${cmake_version}-macos-universal.tar.gz"
-          base_url="https://github.com/Kitware/CMake/releases/download/v${cmake_version}"
-          expected_sha256=0c5d65251c14cc884bfa16bdbed3c263ce5bffe2e21c0d0d00962cb0610464fa
-          curl -fsSL --retry 3 "$base_url/$archive" -o "$archive"
-          printf '%s  %s\n' "$expected_sha256" "$archive" | shasum -a 256 -c -
-          tar -xzf "$archive"
-          mv "cmake-${cmake_version}-macos-universal/CMake.app/Contents" Launcher/artifacts/macos/cmake
-
-      - name: Build Setup.pkg
-        env:
-          PACKAGE_VERSION: ${{ inputs.version }}
-          TAG_VERSION: ${{ github.ref_name }}
-        shell: bash
-        run: |
-          package_version="$PACKAGE_VERSION"
-          if [[ -z "$package_version" ]]; then
-            if [[ "${TAG_VERSION:-}" =~ ^v?[0-9] ]]; then
-              package_version="${TAG_VERSION#v}"
-            elif [[ -f "Launcher/Directory.Build.props" ]]; then
-              package_version=$(grep -m1 '<Version>' Launcher/Directory.Build.props | sed -E 's/.*<Version>([^<]+)<\/Version>.*/\1/')
-            fi
-          fi
-          mkdir -p Launcher/dist
-          Launcher/macos/build-setup-pkg.command \
-            --nodtool-arm64 Launcher/artifacts/macos/nodtool-arm64 \
-            --nodtool-x86_64 Launcher/artifacts/macos/nodtool-x86_64 \
-            --translator-arm64 Launcher/artifacts/macos/translator-arm64/Translator.Cli \
-            --translator-x86_64 Launcher/artifacts/macos/translator-x86_64/Translator.Cli \
-            --cmake-root Launcher/artifacts/macos/cmake \
-            --ninja-arm64 Launcher/artifacts/macos/ninja/ninja \
-            --ninja-x86_64 Launcher/artifacts/macos/ninja/ninja \
-            --output Launcher/dist/WiiCompiled-Setup.pkg \
-            ${package_version:+--version "$package_version"}
-
-      - name: Verify package layout and architecture-specific tools
-        shell: bash
-        run: |
-          pkgutil --check-signature Launcher/dist/WiiCompiled-Setup.pkg || true
-          if pkgutil --payload-files Launcher/dist/WiiCompiled-Setup.pkg | \
-            grep -E '/(Assets|generated|PulsarPacks|WiiCompiled.app|RetroRewind.app)(/|$)'; then
-            echo "::error::Setup.pkg contains a forbidden payload"
-            exit 1
-          fi
-          expanded="$RUNNER_TEMP/wiicompiled-setup-expanded"
-          pkgutil --expand-full Launcher/dist/WiiCompiled-Setup.pkg "$expanded"
-          resources="$expanded/Payload/Applications/WiiCompiled Setup.app/Contents/Resources"
-          for arch in arm64 x86_64; do
-            for tool in nodtool Translator.Cli ninja; do
-              lipo "$resources/tools/$arch/$tool" -verify_arch "$arch"
-            done
-          done
-          lipo "$resources/tools/cmake/bin/cmake" -verify_arch arm64 x86_64
-          bash "$resources/setup.command" --help
-          /usr/bin/arch -x86_64 /bin/bash "$resources/setup.command" --help
-
-      - uses: actions/upload-artifact@v7
-        with:
-          name: WiiCompiled-Setup-macos-universal
-          path: Launcher/dist/WiiCompiled-Setup.pkg
-          if-no-files-found: error
-          archive: false
-
  # Publishes the packaged installers as a GitHub Release whenever a v* tag is pushed. Wheel Wizard
  # discovers updates from these releases, so the contract it relies on is enforced here: a full
-  # (non-prerelease) release whose tag is v<semver>, carrying the expected platform assets,
-  # produced by setup hosts that report that same version.
+  # (non-prerelease) release whose tag is v<semver>, carrying an asset named exactly
+  # WiiCompiled-Setup.exe, produced by a setup host that reports that same version.
  release:
    name: Publish GitHub Release
    if: startsWith(github.ref, 'refs/tags/v')
-    needs: [linux-appimage, windows-installer, macos-setup-package, recompilation]
+    needs: [linux-appimage, windows-installer]
    runs-on: ubuntu-latest
    permissions:
      contents: write
@@ -237,7 +103,7 @@ jobs:
          persist-credentials: false

      # Wheel Wizard runs the downloaded setup with --version and refuses it when the reported
-      # version differs from the release tag, so a tag that was pushed without bumping the pinned
+      # version differs from the release tag, so a tag that was pushed without bumping every pinned
      # version would ship an update nobody can install. Catch that before anything is published.
      - name: Verify the tag matches the pinned setup version
        env:
@@ -252,7 +118,9 @@ jobs:
              status=1
            fi
          }
-          check Launcher/Directory.Build.props "<Version>$version</Version>"
+          check Launcher/WiiCompiled.Setup.Windows/Program.cs "public const string Version = \"$version\";"
+          check Launcher/WiiCompiled.Setup.Windows/WiiCompiled.Setup.Windows.csproj "<Version>$version</Version>"
+          check Launcher/Build-Installer.ps1 "ProductVersion = '$version'"
          exit $status

      # The build jobs upload with `archive: false`, which stores each installer as a raw file
@@ -271,7 +139,7 @@ jobs:
          set -euo pipefail
          ls -lR artifacts
          assets=()
-          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage WiiCompiled-Setup.pkg; do
+          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage; do
            found="$(find artifacts -type f -name "$name" | head -n 1)"
            [ -n "$found" ] && [ -s "$found" ] || { echo "::error::missing release asset $name"; exit 1; }
            assets+=("$found")
@@ -1,75 +0,0 @@
-name: Synthetic recompilation
-
-on:
-  workflow_call:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  windows:
-    name: Windows runtime (synthetic DOL)
-    runs-on: windows-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          persist-credentials: false
-
-      - uses: actions/setup-dotnet@v6
-        with:
-          dotnet-version: '8.0.x'
-
-      # Cache downloads only. Preparation still validates pins, and every run
-      # compiles current Aurora, runtime, and generated sources from scratch.
-      - uses: actions/cache@v5
-        with:
-          path: Launcher/artifacts/downloads
-          key: windows-recomp-downloads-${{ hashFiles('Launcher/Prepare-PortableTools.ps1', 'Launcher/Prepare-Dependencies.ps1') }}
-
-      # Install sccache.
-      - name: Run sccache-action
-        uses: mozilla/sccache-action@v0.0.11
-
-      # Tell CMake to use sccache and use GitHub's API.
-      - name: Configure sccache environment
-        shell: pwsh
-        run: |
-          "SCCACHE_GHA_ENABLED=true" | Add-Content -Path $env:GITHUB_ENV
-          "ACTIONS_CACHE_SERVICE_V2=on" | Add-Content -Path $env:GITHUB_ENV
-          "CMAKE_C_COMPILER_LAUNCHER=$env:SCCACHE_PATH" | Add-Content -Path $env:GITHUB_ENV
-          "CMAKE_CXX_COMPILER_LAUNCHER=$env:SCCACHE_PATH" | Add-Content -Path $env:GITHUB_ENV
-
-      - name: Prepare the shipped Windows toolchain
-        shell: pwsh
-        run: ./Launcher/Prepare-PortableTools.ps1
-
-      - name: Build and run Windows host-platform tests
-        shell: pwsh
-        run: |
-          $tools = Join-Path $PWD 'Launcher/artifacts/portable-tools'
-          $env:PATH = "$tools/llvm-mingw/bin;$tools/CMake/bin;$tools/Ninja;$env:PATH"
-          cmake -S runtime -B build-platform -G Ninja `
-            -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ `
-            -DMKW_BUILD_PRODUCTS=OFF -DMKW_PLATFORM_TESTS_ONLY=ON
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          cmake --build build-platform --parallel 3
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          ctest --test-dir build-platform --output-on-failure
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-      - name: Prepare pinned native dependencies
-        shell: pwsh
-        run: ./Launcher/Prepare-Dependencies.ps1
-
-      # Expose cache token context to the build script.
-      - name: Translate, compile the full runtime, and link
-        shell: pwsh
-        run: ./Launcher/Test-Recompilation.ps1 -Parallel 4
-
-      # Print cache results (even if the build fails)
-      - name: Show sccache stats
-        if: always()
-        shell: pwsh
-        run: sccache --show-stats
@@ -26,8 +26,6 @@ Code.pul
 /build/
 /build-*/
 /native-build/
-/native-build-macos/
-/local-products/
 /dist/
 /out/
 [Bb]in/
@@ -72,5 +70,3 @@ project.lock.json
 *.log
 output.txt

-# Operating System
-.DS_Store
@@ -279,12 +279,9 @@ foreach ($required in @('ToolkitFingerprint','TranslationFingerprint','NativeToo
    if ([string]::IsNullOrWhiteSpace($identities.$required)) { throw "Payload identity output is missing $required." }
 }

-$productVersion = ((& $setupHost --version) -join '').Trim()
-if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($productVersion)) { throw 'The setup host did not report its version.' }
-
 $manifest = [ordered]@{
    SchemaVersion = 2
-    ProductVersion = $productVersion
+    ProductVersion = '0.2.27'
    ExpectedGameId = $pins.GameId
    ExpectedDolSha256 = $pins.DolSha256
    ExpectedRelSha256 = $pins.RelSha256
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- The one product version. Release tags must match it. -->
-    <Version>0.2.34</Version>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-  </PropertyGroup>
-</Project>
@@ -103,7 +103,7 @@ function Write-MkwBuildStep([string]$StepId, [string]$Message) {
 function Reset-LocalDirectory([string]$Path) {
    $full = [IO.Path]::GetFullPath($Path)
    $root = [IO.Path]::GetFullPath($Workspace).TrimEnd('\') + '\'
-    $installRoot = [IO.Path]::GetFullPath((Split-Path -Parent $realWorkspace)).TrimEnd('\') + '\'
+    $installRoot = [IO.Path]::GetFullPath((Split-Path -Parent $Workspace)).TrimEnd('\') + '\'
    # The caller-supplied output destinations are legitimate reset targets by
    # definition, wherever the caller placed them: a fresh install's operation
    # scratch lives beside the installation directory rather than inside it.
@@ -150,16 +150,8 @@ if ($Profile -eq 'both' -and [string]::IsNullOrWhiteSpace($BaseOutputDirectory))
 if ($Profile -ne 'both' -and -not [string]::IsNullOrWhiteSpace($BaseOutputDirectory)) {
    throw '-BaseOutputDirectory is valid only with -Profile both.'
 }
-$realWorkspace = $Workspace.TrimEnd('\')
-$Workspace = Get-MkwBuildSafePath $realWorkspace 'workspace' 'runtime\CMakeLists.txt'
-# A selected package inside the install may also name the same Code.pul through the real path.
-# Give it the workspace spelling before comparing it with the staged copy.
-if (-not [string]::IsNullOrWhiteSpace($RetroRewindPackageDirectory) -and
-    $RetroRewindPackageDirectory.StartsWith($realWorkspace + '\', [StringComparison]::OrdinalIgnoreCase)) {
-    $RetroRewindPackageDirectory = $Workspace + $RetroRewindPackageDirectory.Substring($realWorkspace.Length)
-}
 $translator = Join-Path $Toolkit 'Translator\Translator.Cli.exe'
-$toolchain = Get-MkwBuildSafePath $Toolkit 'toolchain' 'CMake\bin\cmake.exe'
+$toolchain = Get-MkwShellSafeToolchainRoot $Toolkit
 $cmake = Join-Path $toolchain 'CMake\bin\cmake.exe'
 $ninja = Join-Path $toolchain 'Ninja\ninja.exe'
 $toolchainBin = Join-Path $toolchain 'llvm-mingw\bin'
@@ -40,55 +40,41 @@ function Get-MkwToolchainPath([string]$ToolchainRoot) {
    ) -join ';')
 }

-function Get-MkwBuildSafePath([string]$Path, [string]$Kind, [string]$MarkerFile) {
-    <#
-    The Windows native build passes workspace paths through CMake, Ninja response files and
-    clang, which do not all interpret quotes the same way. Keep those paths plain even when the
-    user's install directory contains an apostrophe, ampersand or other punctuation.
-    #>
-    if ([string]::IsNullOrWhiteSpace($Path)) { throw "A $Kind path is required." }
-    $full = [IO.Path]::GetFullPath($Path)
+function Get-MkwShellSafeToolchainRoot([string]$ToolchainRoot) {
+    if ([string]::IsNullOrWhiteSpace($ToolchainRoot)) { throw 'A toolchain root is required.' }
+    $full = [IO.Path]::GetFullPath($ToolchainRoot)
    # A drive root keeps its separator: "C:" is relative to the current directory on that drive.
    if ($full -ne [IO.Path]::GetPathRoot($full)) { $full = $full.TrimEnd('\') }
-    if ($full -cmatch '^[A-Za-z0-9 ._\\:-]+$') { return $full }
-
-    Assert-File (Join-Path $full $MarkerFile) "$Kind marker"
+    if ($full -notmatch '[()&^%!]') { return $full }

    $sha = [Security.Cryptography.SHA256]::Create()
    try {
        $bytes = $sha.ComputeHash([Text.Encoding]::UTF8.GetBytes($full.ToLowerInvariant()))
    } finally { $sha.Dispose() }
-    $linkName = "$Kind-" + ((($bytes[0..7]) | ForEach-Object { $_.ToString('x2') }) -join '')
+    $linkName = 'toolchain-' + ((($bytes[0..7]) | ForEach-Object { $_.ToString('x2') }) -join '')

    $failures = @()
    foreach ($base in @($env:ProgramData, $env:PUBLIC)) {
-        if ([string]::IsNullOrWhiteSpace($base) -or $base -cnotmatch '^[A-Za-z0-9._\\:-]+$') { continue }
+        if ([string]::IsNullOrWhiteSpace($base) -or $base -match '[()&^%! ]') { continue }
        $link = Join-Path (Join-Path $base 'WiiCompiled') $linkName
        try {
            [IO.Directory]::CreateDirectory((Split-Path -Parent $link)) | Out-Null
-            $existing = Get-Item -LiteralPath $link -Force -ErrorAction SilentlyContinue
-            if ($null -ne $existing) {
-                # Never trust a directory just because it has the marker: it could point at a
-                # different installation. Nor may we remove a directory we did not create.
-                if ($existing.LinkType -ne 'Junction' -or
-                    @($existing.Target).Count -ne 1 -or
-                    -not [string]::Equals([IO.Path]::GetFullPath(@($existing.Target)[0]),
-                        $full, [StringComparison]::OrdinalIgnoreCase)) {
-                    throw "An existing path is not the expected junction: $link"
-                }
-            } else {
+            # The name already identifies the target, so an existing junction that still resolves is
+            # this one; only a broken leftover is replaced. Directory.Delete removes the reparse
+            # point itself, where Remove-Item -Recurse would delete the toolchain it points at.
+            if (-not (Test-Path -LiteralPath (Join-Path $link 'CMake\bin\cmake.exe') -PathType Leaf)) {
+                if (Test-Path -LiteralPath $link) { [IO.Directory]::Delete($link) }
                New-Item -ItemType Junction -Path $link -Target $full -ErrorAction Stop | Out-Null
            }
-            Assert-File (Join-Path $link $MarkerFile) "$Kind junction marker"
-            Write-Host "MKWCBUILD: Building the $Kind through $link, because $full contains characters the native build cannot quote reliably"
+            Write-Host "MKWCBUILD: Building through $link, because $full contains characters cmd.exe cannot parse"
            return $link
        } catch {
            $failures += "$link ($($_.Exception.Message))"
        }
    }
-    throw ("The $Kind path $full cannot be passed safely to the native build, and no junction " +
-        'to it could be created: ' + ($failures -join '; ') + '. Install to a path of plain ' +
-        'letters, digits and spaces, or make a safe junction location available.')
+    throw ("The toolchain path $full contains a character (one of ( ) & ^ % !) that the compiler " +
+        'cannot be invoked through, and no junction to it could be created: ' + ($failures -join '; ') +
+        '. Install to a path without those characters.')
 }

 function Get-MkwProjectPins([string]$ProjectFile) {
@@ -131,13 +117,12 @@ function Get-MkwProjectPins([string]$ProjectFile) {
 }

 function Invoke-Checked([string]$FilePath, [string[]]$Arguments, [string]$Description,
-    [string]$LogPrefix = 'MKWCBUILD', [string]$StepId = '', [bool]$WaitForProcessTree = $true) {
+    [string]$LogPrefix = 'MKWCBUILD', [string]$StepId = '') {
    <#
-    Runs a build tool and turns a non-zero exit code into a described failure. By default,
-    Start-Process -Wait waits for the whole process tree, since a .NET single-file bundle host may
-    hand off to an extracted child that PowerShell's call operator would not wait for. Callers that
-    need to avoid waiting on unrelated descendants can opt into the call-operator path.
-    Start-Process doesn't publish $LASTEXITCODE, so this sets it manually for callers that check it.
+    Runs a build tool and turns a non-zero exit code into a described failure. Start-Process -Wait
+    is deliberate: it waits for the whole process tree, since a .NET single-file bundle host may
+    hand off to an extracted child that PowerShell's call operator would not wait for. Start-Process
+    doesn't publish $LASTEXITCODE, so this sets it manually for callers that check it.
    -StepId emits the machine-readable form the installer's progress bar consumes (BuildStepIds in
    WiiCompiled.Setup/InstallProgress.cs); the human sentence stays on the same log line.
    #>
@@ -147,14 +132,9 @@ function Invoke-Checked([string]$FilePath, [string[]]$Arguments, [string]$Descri
        if ($_.Contains('"')) { throw "A native build argument contains an unsupported quote: $_" }
        '"' + $_ + '"'
    })
-    if ($WaitForProcessTree) {
-        $process = Start-Process -FilePath $FilePath -ArgumentList $quotedArguments `
-            -NoNewWindow -Wait -PassThru
-        $exitCode = $process.ExitCode
-    } else {
-        & $FilePath @Arguments
-        $exitCode = $LASTEXITCODE
-    }
+    $process = Start-Process -FilePath $FilePath -ArgumentList $quotedArguments `
+        -NoNewWindow -Wait -PassThru
+    $exitCode = $process.ExitCode
    $global:LASTEXITCODE = $exitCode
    if ($exitCode -ne 0) { throw "$Description failed with exit code $exitCode." }
 }
@@ -39,9 +39,9 @@ $packages = @(
    },
    [pscustomobject]@{
        Name = 'dawn_prebuilt'; File = 'dawn-v20260603.191052-windows-amd64.tar.gz'
-        Uris = @('https://github.com/theofficialgman/dawn-build/releases/download/v20260603.191052/dawn-windows-amd64.tar.gz')
+        Uris = @('https://github.com/encounter/dawn-build/releases/download/v20260603.191052/dawn-windows-amd64.tar.gz')
        Pins = @(@{ File = $auroraCMake; Text = 'set(AURORA_DAWN_VERSION "v20260603.191052"' },
-                 @{ File = $auroraDawn; Text = 'SHA256=13be9cff8b9b179c42dcd16aeabb6effcc8f0dfdcc14463eda2a5caeda225142' })
+                 @{ File = $auroraDawn; Text = 'SHA256=7785373d569b3b0237918ec9c523239f7d0667857c5ea8242e3cdfde95e6aeab' })
    },
    [pscustomobject]@{
        Name = 'fmt'; File = 'fmt-11.1.4.tar.gz'
@@ -82,9 +82,9 @@ $packages = @(
        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz' })
    },
    [pscustomobject]@{
-        Name = 'xxhash'; File = 'xxHash-0.8.4.tar.gz'
-        Uris = @('https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.4.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.4.tar.gz' })
+        Name = 'xxhash'; File = 'xxHash-0.8.3.tar.gz'
+        Uris = @('https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz')
+        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz' })
    },
    [pscustomobject]@{
        Name = 'zlib'; File = 'zlib-1.3.2.tar.gz'
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Builds the redistributable precompiled aurora + third-party package for native Linux: aurora
-# (~43% of local build CPU time per Prepare-NativePrebuilt.ps1), Crypto++ and mbed TLS are identical
+# (~43% of local build CPU time per Prepare-NativePrebuilt.ps1) and vendored Crypto++ are identical
 # for every user under the pinned toolchain prepare-portable-tools.sh bundles, so this configures
 # runtime/ against that toolchain, builds just that closure, and harvests the archives plus a
 # generated CMake description into an output package - the Linux counterpart to
@@ -22,17 +22,11 @@ workspace=$(cd "$script_dir/.." && pwd)

 arch=""
 output_dir=""
-toolchain_dir=""
-ninja_bin=""
-cmake_bin=""
-llvm_dir=""
-sysroot=""
 stage_dir="$workspace/build/native-prebuilt-stage"
 keep_stage=0
 reuse_stage=0
 parallel=0
 print_fingerprint_only=0
-disconnected=0

 usage() {
    cat <<'EOF'
@@ -45,7 +39,8 @@ Usage: Prepare-NativePrebuilt.sh --arch {x86_64|aarch64} [options]
  --reuse-stage           Reuse an existing staging build directory (maintainer iteration aid: a
                          re-harvest does not recompile aurora from scratch)
  --parallel N            Ninja build parallelism (default: nproc)
-  --print-fingerprint-only  Print the provenance inputs as "key=value" lines and
+  --print-fingerprint-only  Print the four provenance inputs (compiler_sha256, flag_fingerprint,
+                          aurora_fingerprint, third_party_fingerprint) as "key=value" lines and
                          exit, without configuring/building/harvesting anything - lets a caller
                          (build-appimage.sh) decide whether an existing package is still current
                          without paying for a full aurora rebuild just to find out.
@@ -61,12 +56,6 @@ while [[ $# -gt 0 ]]; do
        --reuse-stage) reuse_stage=1; shift ;;
        --parallel) parallel=$2; shift 2 ;;
        --print-fingerprint-only) print_fingerprint_only=1; shift ;;
-        --toolchain-dir) toolchain_dir=$2; shift 2 ;;
-        --ninja-bin) ninja_bin=$2; shift 2 ;;
-        --cmake-bin) cmake_bin=$2; shift 2 ;;
-        --llvm-dir) llvm_dir=$2; shift 2 ;;
-        --sysroot) sysroot=$2; shift 2 ;;
-        --disconnected) disconnected=1; shift ;;
        -h|--help) usage; exit 0 ;;
        *) echo "Prepare-NativePrebuilt.sh: unknown argument: $1" >&2; exit 1 ;;
    esac
@@ -83,22 +72,14 @@ assert_dir() { [[ -d "$1" ]] || fail "$2 is missing: $1"; }
 sha256_of() { sha256sum "$1" | awk '{print $1}'; }
 normalize() { readlink -f "$1"; }

-# Environment check: Ensure the `SOURCE_DATE_EPOCH` value is not invalid
-# before trying to build anything (fail-fast)
-if [[ -n "${SOURCE_DATE_EPOCH:-}" ]] && ! python3 -c \
-    'import datetime, os; datetime.datetime.fromtimestamp(int(os.environ.get("SOURCE_DATE_EPOCH")), datetime.timezone.utc)'
-then
-    fail "SOURCE_DATE_EPOCH must be a valid UNIX timestamp"
-fi
-
 [[ -n "$output_dir" ]] || output_dir="$script_dir/artifacts/native-prebuilt-$arch"
 [[ "$stage_dir" = /* ]] || stage_dir="$workspace/$stage_dir"

-toolchain_dir="${toolchain_dir:-$script_dir/artifacts/portable-tools/toolchain-$arch}"
-cc="${llvm_dir:-$toolchain_dir}/bin/clang"
-cxx="${llvm_dir:-$toolchain_dir}/bin/clang++"
-cmake_bin="${cmake_bin:-$toolchain_dir/bin/cmake}"
-ninja_bin="${ninja_bin:-$toolchain_dir/bin/ninja}"
+toolchain_dir="$script_dir/artifacts/portable-tools/toolchain-$arch"
+cc="$toolchain_dir/bin/clang"
+cxx="$toolchain_dir/bin/clang++"
+cmake_bin="$toolchain_dir/bin/cmake"
+ninja_bin="$toolchain_dir/bin/ninja"
 runtime_source="$workspace/runtime"
 aurora_source="$workspace/aurora-main"

@@ -107,7 +88,7 @@ assert_file "$ninja_bin" "Portable Ninja"
 assert_file "$cc" "Portable C compiler"
 assert_file "$cxx" "Portable C++ compiler"
 assert_dir "$aurora_source" "aurora-main source tree"
-clang_binary=$(normalize "${llvm_dir:-$toolchain_dir}/bin/clang-22")
+clang_binary=$(normalize "$toolchain_dir/bin/clang-23")
 assert_file "$clang_binary" "Portable clang driver binary"

 (( parallel > 0 )) || parallel=$(nproc)
@@ -150,8 +131,6 @@ fixed_configure_flags=(
    -DCMAKE_DISABLE_FIND_PACKAGE_absl=ON
    -DCMAKE_DISABLE_FIND_PACKAGE_PNG=ON
    -DCMAKE_DISABLE_FIND_PACKAGE_Freetype=ON
-    -DUSE_STATIC_MBEDTLS_LIBRARY=ON
-    -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
    # Freetype's own vendored CMakeLists.txt separately probes for system BZip2 (optional
    # bzip2-compressed-font support aurora-main never asked for) regardless of the Freetype
    # find_package disable above, since that only stops aurora's own outer find_package(Freetype)
@@ -162,16 +141,6 @@ fixed_configure_flags=(
    -DFT_DISABLE_BZIP2=ON
    -DCMAKE_POLICY_DEFAULT_CMP0168=NEW
 )
-if [[ "$disconnected" -eq 1 ]]; then
-    fixed_configure_flags+=(
-        -DFETCHCONTENT_FULLY_DISCONNECTED=ON
-    )
-fi
-if [[ -n "$sysroot" ]]; then
-    fixed_configure_flags+=(
-        -DCMAKE_SYSROOT="$sysroot"
-    )
-fi
 flag_fingerprint=$(printf '%s\n' "${fixed_configure_flags[@]}" | sha256sum | awk '{print $1}')

 # extern/ is excluded because the payload ships that tree separately (aurora-main/extern is bundled
@@ -179,24 +148,19 @@ flag_fingerprint=$(printf '%s\n' "${fixed_configure_flags[@]}" | sha256sum | awk
 aurora_fingerprint=$(fingerprint_tree "$aurora_source" extern build)
 [[ -n "$aurora_fingerprint" ]] || fail "The aurora source tree could not be fingerprinted: $aurora_source"

-# The harvested Crypto++ archive is consumed against this tree's headers, so it is fingerprinted.
+# The harvested Crypto++ archive is consumed against this tree's headers, so it is fingerprinted
+# for the same reason as aurora above. No exclusions: unlike aurora's extern/, nothing under
+# runtime/third_party is shipped separately.
 third_party_fingerprint=$(fingerprint_tree "$runtime_source/third_party")
 [[ -n "$third_party_fingerprint" ]] || fail "The vendored third-party tree could not be fingerprinted: $runtime_source/third_party"
-mbedtls_fingerprint=$(sha256_of "$runtime_source/cmake/MbedTLSPin.cmake")

-compiler_sha256=$(sha256_of "$cc")
-cxx_sha256=$(sha256_of "$cxx")
-# Append the CXX SHA256 if it doesn't match the hash of CC
-if [[ "${cxx_sha256}" != "${compiler_sha256}" ]]; then
-    compiler_sha256="${compiler_sha256}:${cxx_sha256}"
-fi
+compiler_sha256=$(sha256_of "$clang_binary")

 if [[ "$print_fingerprint_only" -eq 1 ]]; then
    printf 'compiler_sha256=%s\n' "$compiler_sha256"
    printf 'flag_fingerprint=%s\n' "$flag_fingerprint"
    printf 'aurora_fingerprint=%s\n' "$aurora_fingerprint"
    printf 'third_party_fingerprint=%s\n' "$third_party_fingerprint"
-    printf 'mbedtls_fingerprint=%s\n' "$mbedtls_fingerprint"
    exit 0
 fi

@@ -397,21 +361,6 @@ while IFS='|' read -r name type file linkerfile; do
        linker_file_to_reference["$linkerfile"]="@PKG@/$relative_linker"
    fi
 done < "$targets_txt"
-mbedtls_refs=()
-mbedtls_txt="$export_dir/mbedtls.txt"
-assert_file "$mbedtls_txt" "Mbed TLS export targets list"
-while IFS='|' read -r name linkerfile; do
-    [[ -n "$name" ]] || continue
-    linkerfile=$(normalize "$linkerfile")
-    ref=${linker_file_to_reference["$linkerfile"]:-}
-    [[ -n "$ref" ]] || fail "Mbed TLS archive was not harvested: $name ($linkerfile)"
-    mbedtls_refs+=("$ref")
-done < "$mbedtls_txt"
-[[ ${#mbedtls_refs[@]} -ge 3 ]] || fail "Expected at least three Mbed TLS archives, got ${#mbedtls_refs[@]}"
-mbedtls_source_dir=$(get_meta mbedtls_source_dir)
-assert_dir "$mbedtls_source_dir/include/mbedtls" "Mbed TLS headers"
-mkdir -p "$output_dir/include/mbedtls"
-cp -a "$mbedtls_source_dir/include/." "$output_dir/include/mbedtls/"
 # Unlike Windows (SDL/zlib/libpng ship as DLLs by default), everything here was forced static above
 # and Dawn's own Linux package (verified directly) ships libwebgpu_dawn.a, also static - so zero
 # shared imports is the expected, normal outcome, not a failure.
@@ -477,9 +426,6 @@ for item in "${link_items[@]}"; do
    if [[ "$item" = /* ]]; then item_abs=$(normalize "$item"); else item_abs=$(normalize "$stage_dir/$item"); fi
    ref=${linker_file_to_reference["$item_abs"]:-}
    if [[ -n "$ref" ]]; then
-        for mbedtls_ref in "${mbedtls_refs[@]}"; do
-            [[ "$ref" == "$mbedtls_ref" ]] && continue 2
-        done
        package_link_items+=("$ref")
        continue
    fi
@@ -559,9 +505,6 @@ generated_cmake="$output_dir/native_prebuilt.cmake"
    format_cmake_block MKW_NP_COMPILE_DEFINITIONS "${package_definitions[@]}"
    format_cmake_block MKW_NP_COMPILE_OPTIONS "${package_compile_options[@]}"
    format_cmake_block MKW_NP_LINK_LIBRARIES "${package_link_items[@]}"
-    format_cmake_block MKW_NP_MBEDTLS_LIBRARIES "${mbedtls_refs[@]}"
-    echo 'set(MKW_NP_MBEDTLS_INCLUDE_DIR "@PKG@/include/mbedtls")'
-    printf 'set(MKW_NP_MBEDTLS_FINGERPRINT "%s")\n' "$mbedtls_fingerprint"
    format_cmake_block MKW_NP_AURORA_TARGETS "aurora::gx" "aurora::pad" "aurora::si" "aurora::vi" "aurora::mtx"
    echo ""
    printf 'set(MKW_NP_DAWN_CONFIG_DIR "%s")\n' "$dawn_config_token"
@@ -597,12 +540,12 @@ harvested_count=${#linker_file_to_reference[@]}

 python3 - "$output_dir" "$compiler_sha256" "$compiler_version" "$flag_fingerprint" \
    "$dawn_version" "$dawn_runtime_sha256" "$aurora_fingerprint" "$third_party_fingerprint" \
-    "$sdl3_target" "$harvested_count" "$mbedtls_fingerprint" <<'PY'
+    "$sdl3_target" "$harvested_count" <<'PY'
 import hashlib, json, os, sys, datetime

 (output_dir, compiler_sha256, compiler_version, flag_fingerprint, dawn_version,
 dawn_runtime_sha256, aurora_fingerprint, third_party_fingerprint, sdl3_target,
- harvested_count, mbedtls_fingerprint) = sys.argv[1:]
+ harvested_count) = sys.argv[1:]

 contents = []
 for root, dirs, files in os.walk(output_dir):
@@ -617,21 +560,9 @@ for root, dirs, files in os.walk(output_dir):
        contents.append({"Path": rel, "Bytes": os.path.getsize(path), "Sha256": digest})
 contents.sort(key=lambda c: c["Path"])

-source_date_epoch = os.environ.get("SOURCE_DATE_EPOCH") or None
-utc = datetime.timezone.utc
-if source_date_epoch is not None:
-    built_utc = datetime.datetime.fromtimestamp(
-        int(source_date_epoch),
-        utc
-    )
-else:
-    built_utc = datetime.datetime.now(utc)
-
-built_utc = built_utc.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
-
 provenance = {
    "SchemaVersion": 1,
-    "BuiltUtc": built_utc,
+    "BuiltUtc": datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
    "CompilerSha256": compiler_sha256,
    "CompilerVersion": compiler_version,
    "FlagFingerprint": flag_fingerprint,
@@ -639,7 +570,6 @@ provenance = {
    "DawnRuntimeSha256": dawn_runtime_sha256,
    "AuroraSourceFingerprint": aurora_fingerprint,
    "ThirdPartySourceFingerprint": third_party_fingerprint,
-    "MbedTlsFingerprint": mbedtls_fingerprint,
    "Sdl3Target": sdl3_target,
    "HarvestedLibraryCount": int(harvested_count),
    "Contents": contents,
@@ -1,6 +1,6 @@
 # Fails the release build when a fact duplicated across the repo stops agreeing with the copy
 # that owns it (recomp.yml). Scripts read pinned facts through Get-MkwProjectPins, but three
-# consumers can't read YAML (the C++ runtime header, the C# constants, shell scripts, and hand-written lists on
+# consumers can't read YAML (the C++ runtime header, the C# constants, hand-written lists on
 # both sides of the C#/PowerShell boundary), so those are checked here instead.
 [CmdletBinding()]
 param([string]$RepositoryRoot)
@@ -58,12 +58,6 @@ $hostUri = Get-CapturedValue $retroWfcPayload 'CurrentRetroWfcPayloadUri\s*=\s*"
 if ($hostUri -cne $pins.RetroWfcPayloadUri) {
    Add-Failure "InputValidation.CurrentRetroWfcPayloadUri is '$hostUri' but recomp.yml pins '$($pins.RetroWfcPayloadUri)'."
 }
-$macosSetup = Read-SourceFile (Join-Path $launcher 'macos\setup.command') 'macOS setup.command'
-$macosUri = Get-CapturedValue $macosSetup "'([^']*/api/wfc/payload\?g=RMCPD00)'" `
-    'The macOS Retro-WFC endpoint'
-if ($macosUri -cne $pins.RetroWfcPayloadUri) {
-    Add-Failure "macOS setup.command downloads '$macosUri' but recomp.yml pins '$($pins.RetroWfcPayloadUri)'."
-}

 # --- The game identity: the manifest carries it, but the host also compiles a fallback for a
 # --- manifest that predates the field, and that fallback decides which disc is accepted.
@@ -1,148 +0,0 @@
-# Build the real Windows runtime with translated, entirely synthetic PowerPC code.
-# No game dump, game symbol map, REL, mod download, or existing generated/ output is used.
-[CmdletBinding()]
-param(
-    [string]$PortableToolsDirectory = 'Launcher/artifacts/portable-tools',
-    [string]$DependencySourceDirectory = 'Launcher/artifacts/dependencies',
-    [string]$StageDirectory = 'build/recomp-test',
-    [ValidateRange(1, 64)] [int]$Parallel = 3
-)
-
-$ErrorActionPreference = 'Stop'
-Set-StrictMode -Version 3.0
-. (Join-Path $PSScriptRoot 'NativeBuildFlags.ps1')
-
-$repoRoot = [IO.Path]::GetFullPath((Join-Path $PSScriptRoot '..'))
-function Full([string]$Path) {
-    if ([IO.Path]::IsPathRooted($Path)) { return [IO.Path]::GetFullPath($Path) }
-    return [IO.Path]::GetFullPath((Join-Path $repoRoot $Path))
-}
-$portableTools = Full $PortableToolsDirectory
-$dependencies = Full $DependencySourceDirectory
-$stage = Full $StageDirectory
-$dotnet = (Get-Command dotnet -CommandType Application).Source
-$cmake = Join-Path $portableTools 'CMake/bin/cmake.exe'
-$ninja = Join-Path $portableTools 'Ninja/ninja.exe'
-$compilerBin = Join-Path $portableTools 'llvm-mingw/bin'
-Assert-File $cmake 'Pinned CMake (run Prepare-PortableTools.ps1 first)'
-Assert-File $ninja 'Pinned Ninja'
-Assert-File (Join-Path $dependencies 'cppwinrt/winrt/base.h') 'Pinned dependencies (run Prepare-Dependencies.ps1 first)'
-
-# Refuse reuse so a developer's game translation or an earlier build cannot make
-# the test pass. Keep the staging tree after the run for diagnostics.
-if (Test-Path -LiteralPath $stage) { throw "Test stage already exists; choose a fresh -StageDirectory: $stage" }
-[IO.Directory]::CreateDirectory($stage) | Out-Null
-Write-Host "Synthetic recompilation workspace: $stage"
-
-# Copy current sources, including uncommitted edits, but no ignored build output.
-# An isolated workspace preserves the developer's real generated/ directory.
-$sourceFiles = & git -C $repoRoot -c core.quotepath=false ls-files --cached --others --exclude-standard -- runtime aurora-main
-if ($LASTEXITCODE -ne 0) { throw 'Could not enumerate runtime and Aurora sources.' }
-foreach ($relative in $sourceFiles | Sort-Object -Unique) {
-    $destination = Join-Path $stage $relative
-    [IO.Directory]::CreateDirectory([IO.Path]::GetDirectoryName($destination)) | Out-Null
-    Copy-Item -LiteralPath (Join-Path $repoRoot $relative) -Destination $destination
-}
-
-# One synthetic text section: li r3,40; addi r3,r3,2; nop; blr.
-# Native HLE wrappers also call these eight guest symbols directly. Give each
-# its own generated blr function so the real product can link without game code.
-# Keep this list explicit: a new unresolved guest dependency must fail the test.
-[uint32]$entry = 0x80001000L
-[uint32[]]$guestCallbacks = @(
-    0x8012B830L, 0x801A0620L, 0x801A1ED8L, 0x801A961CL,
-    0x801AADE0L, 0x801D8D30L, 0x801D9E94L, 0x8055531CL
-)
-$textSize = [int]($guestCallbacks[-1] - $entry + 4)
-$dataOffset = 0x100 + $textSize
-$dol = [byte[]]::new($dataOffset + 4)
-function Write-BigEndian32([int]$Offset, [uint32]$Value) {
-    $dol[$Offset] = [byte](($Value -shr 24) -band 255)
-    $dol[$Offset + 1] = [byte](($Value -shr 16) -band 255)
-    $dol[$Offset + 2] = [byte](($Value -shr 8) -band 255)
-    $dol[$Offset + 3] = [byte]($Value -band 255)
-}
-Write-BigEndian32 0x00 0x100       # text[0] file offset
-Write-BigEndian32 0x48 $entry      # text[0] guest address
-Write-BigEndian32 0x90 $textSize   # text[0] length (unreachable gaps are zero)
-Write-BigEndian32 0x1C $dataOffset # data[0] file offset
-Write-BigEndian32 0x64 0x80600000L # data[0] guest address
-Write-BigEndian32 0xAC 4           # data[0] length
-Write-BigEndian32 0xD8 0x80601000L # BSS address
-Write-BigEndian32 0xDC 32          # BSS length
-Write-BigEndian32 0xE0 $entry      # entry point
-Write-BigEndian32 0x100 0x38600028 # li r3,40
-Write-BigEndian32 0x104 0x38630002 # addi r3,r3,2
-Write-BigEndian32 0x108 0x60000000 # nop
-Write-BigEndian32 0x10C 0x4E800020 # blr
-foreach ($address in $guestCallbacks) {
-    Write-BigEndian32 ([int](0x100 + $address - $entry)) 0x4E800020
-}
-Write-BigEndian32 $dataOffset 0x12345678
-[IO.File]::WriteAllBytes((Join-Path $stage 'synthetic.dol'), $dol)
-$entryPoints = (@($entry) + $guestCallbacks | ForEach-Object { '0x{0:X8}' -f $_ }) -join ', '
-$functionMap = (@($entry) + $guestCallbacks | ForEach-Object { '{0:X8} func_{0:X8}' -f $_ }) -join "`n"
-[IO.File]::WriteAllText((Join-Path $stage 'synthetic-functions.txt'), $functionMap)
-$manifest = Join-Path $stage 'recomp.yml'
-[IO.File]::WriteAllText($manifest, @"
-schema_version: 1
-workspace_root: .
-project:
-  id: ci-synthetic-dol
-  display_name: CI Synthetic DOL
-memory:
-  base: 0x80000000
-  size: 0x01800000
-  sda_base: 0x80600000
-  sda2_base: 0x80600000
-inputs:
-  dol:
-    path: synthetic.dol
-translation:
-  entry_points: [$entryPoints]
-  function_map:
-    path: synthetic-functions.txt
-  allow_unsupported_instructions: false
-runtime:
-  native_abi_directories: []
-  native_registration_root: runtime/src
-output:
-  root: generated
-"@)
-
-$translatorProject = Join-Path $repoRoot 'translator/src/Translator.Cli/Translator.Cli.csproj'
-Invoke-Checked $dotnet @('build', $translatorProject, '-c', 'Release', '--disable-build-servers') 'Building the translator'
-$translator = Join-Path $repoRoot 'translator/src/Translator.Cli/bin/Release/net8.0/Translator.Cli.dll'
-$metadata = Join-Path $stage 'generated/base_translation_output.json'
-Invoke-Checked $dotnet @($translator, 'translate-recursive', '0x80001000', '--project', $manifest,
-    '--output-metadata', $metadata, '--threads', "$Parallel") `
-    'Translating the synthetic DOL'
-# Function-map seeds can be skipped by discovery; do not accept a partial fixture.
-$translated = Get-Content -LiteralPath $metadata -Raw | ConvertFrom-Json
-foreach ($address in @($entry) + $guestCallbacks) {
-    if ($address -notin $translated.functions.entryPoint) {
-        throw ('Synthetic function 0x{0:X8} was not translated.' -f $address)
-    }
-}
-Invoke-Checked $dotnet @($translator, 'generate-data-init', '--project', $manifest) 'Generating synthetic data and runtime configuration'
-Invoke-Checked $dotnet @($translator, 'emit-build-shards', '--project', $manifest) 'Emitting the production build graph'
-
-$nativeBuild = Join-Path $stage 'native-build'
-$oldPath = $env:PATH
-try {
-    $env:PATH = Get-MkwToolchainPath $portableTools
-    $configure = Get-MkwNativeConfigureArguments -SourceDirectory (Join-Path $stage 'runtime') -BuildDirectory $nativeBuild `
-        -Ninja $ninja -CCompiler (Join-Path $compilerBin 'x86_64-w64-mingw32-clang.exe') `
-        -CxxCompiler (Join-Path $compilerBin 'x86_64-w64-mingw32-clang++.exe') `
-        -ResourceCompiler (Join-Path $compilerBin 'x86_64-w64-mingw32-windres.exe') `
-        -DependenciesDirectory $dependencies -AdditionalArguments @('-DMKW_BUILD_PRODUCTS=ON')
-    Invoke-Checked $cmake $configure 'Configuring the production Windows runtime' `
-        -WaitForProcessTree $false
-    Invoke-Checked $cmake @('--build', $nativeBuild, '--target', 'WiiCompiled', '--parallel', "$Parallel") `
-        'Compiling and linking the synthetic product with the full runtime' `
-        -WaitForProcessTree $false
-    Assert-File (Join-Path $nativeBuild 'WiiCompiled.exe') 'Linked synthetic product'
-} finally {
-    $env:PATH = $oldPath
-}
-Write-Host 'Synthetic recompilation passed (translation, data generation, runtime compilation, and product link).'
@@ -6,6 +6,7 @@
    <Nullable>enable</Nullable>
    <RootNamespace>WiiCompiled.Setup.Common.Cli</RootNamespace>
    <AssemblyName>WiiCompiled.Setup.Common.Cli</AssemblyName>
+    <Version>0.2.22</Version>
    <Authors>patchzy</Authors>
    <Product>WiiCompiled</Product>
    <Description>Packaging-time helper: resolves (downloading if needed) the nodtool binary bundled by build-appimage.sh and Build-Installer.ps1</Description>
@@ -1,56 +0,0 @@
-using System.Text;
-
-namespace WiiCompiled.Setup.Common;
-
-/// <summary>The disc identity read from an extracted game's <c>sys/boot.bin</c>.</summary>
-public sealed record ExtractedGameHeader(string GameId, int Revision, string InternalName);
-
-/// <summary>
-/// A game Wheel Wizard already extracted, in the layout Dolphin's "Extract Entire Disc" writes:
-/// <c>&lt;root&gt;/DATA/{sys,files}</c>. WiiCompiled reads it in place (<c>dvd_root</c>) instead of extracting a
-/// copy of its own, so it is only ever read, never written or deleted.
-/// </summary>
-public static class ExtractedGameDirectory
-{
-    private const int BootSize = 0x440;
-    private const uint WiiMagic = 0x5D1C9EA3;
-
-    /// <summary>
-    /// The <c>DATA</c> folder of an extracted game: <paramref name="path"/> may be the game root holding
-    /// <c>DATA/</c>, or the <c>DATA</c> folder itself.
-    /// </summary>
-    public static string ResolveDataDirectory(string path)
-    {
-        if (string.IsNullOrWhiteSpace(path))
-            throw new ArgumentException("--game-dir needs the folder of the extracted game.");
-        var full = FileSystemUtilities.NormalizePath(path);
-        if (!Directory.Exists(full))
-            throw new DirectoryNotFoundException($"The extracted game folder does not exist: {full}");
-
-        foreach (var candidate in new[] { Path.Combine(full, "DATA"), full })
-        {
-            if (File.Exists(Path.Combine(candidate, "sys", "main.dol")) && File.Exists(Path.Combine(candidate, "sys", "boot.bin")))
-                return FileSystemUtilities.NormalizePath(candidate);
-        }
-
-        throw new InvalidDataException(
-            $"{full} is not an extracted Wii game: expected DATA/sys/main.dol and DATA/sys/boot.bin.");
-    }
-
-    /// <summary>Reads the disc header from <c>sys/boot.bin</c>, which starts with the same bytes as the disc.</summary>
-    public static ExtractedGameHeader ReadHeader(string dataDirectory)
-    {
-        var boot = File.ReadAllBytes(Path.Combine(dataDirectory, "sys", "boot.bin"));
-        if (boot.Length < BootSize)
-            throw new InvalidDataException("The extracted game's sys/boot.bin is incomplete.");
-        var magic = (uint)(boot[0x18] << 24 | boot[0x19] << 16 | boot[0x1A] << 8 | boot[0x1B]);
-        if (magic != WiiMagic)
-            throw new InvalidDataException("The extracted game is not a Wii game.");
-
-        var gameId = Encoding.ASCII.GetString(boot, 0, 6).TrimEnd('\0', ' ');
-        var nameBytes = boot.AsSpan(0x20, 0x40);
-        var end = nameBytes.IndexOf((byte)0);
-        var name = Encoding.ASCII.GetString(end < 0 ? nameBytes : nameBytes[..end]).Trim();
-        return new ExtractedGameHeader(gameId, boot[7], name);
-    }
-}
@@ -24,7 +24,7 @@ public static class RetroWfcPayload
    private static readonly TimeSpan RetroWfcDownloadTimeout = TimeSpan.FromSeconds(30);
    private static readonly TimeSpan RetroWfcRetryDelay = TimeSpan.FromSeconds(1);

-    public const string CurrentRetroWfcPayloadUri = "https://rwfc.net/api/wfc/payload?g=RMCPD00";
+    public const string CurrentRetroWfcPayloadUri = "http://nas.play.rwfc.net/payload?g=RMCPD00";
    private static readonly string RetroWfcOfflinePayloadFile =
        Path.Combine("binary", "payload.RMCPD00.bin");

@@ -5,6 +5,7 @@
    <Nullable>enable</Nullable>
    <RootNamespace>WiiCompiled.Setup.Common</RootNamespace>
    <AssemblyName>WiiCompiled.Setup.Common</AssemblyName>
+    <Version>0.2.22</Version>
    <Authors>patchzy</Authors>
    <Product>WiiCompiled</Product>
    <Description>Shared nodtool/Retro-WFC-payload logic used by both the Windows and Linux installers</Description>
@@ -13,8 +13,7 @@ internal static class BuildRunner
        string workspace, string profile, string outputDir, string? baseOutputDir,
        string? retroDir, string? retroWfcOfflineDir, bool skipRetroWfcPayload,
        bool forceCleanBuild, string? translatorBin, string? ccBin, string? cxxBin, string? fuseLd,
-        string? cmakeBin, string? ninjaBin, string? nativePrebuiltDir, string? sysroot,
-        IInstallReporter reporter,
+        string? cmakeBin, string? ninjaBin, string? nativePrebuiltDir, IInstallReporter reporter,
        CancellationToken cancellationToken)
    {
        var script = Path.Combine(workspace, "Launcher", "local-build.sh");
@@ -78,10 +77,6 @@ internal static class BuildRunner
        {
            startInfo.ArgumentList.Add("--native-prebuilt-dir"); startInfo.ArgumentList.Add(nativePrebuiltDir);
        }
-        if (!string.IsNullOrEmpty(sysroot))
-        {
-            startInfo.ArgumentList.Add("--sysroot"); startInfo.ArgumentList.Add(sysroot);
-        }

        using var process = new Process { StartInfo = startInfo };
        var window = new BuildProgressWindow(reporter, InstallStages.Build, start: 6, end: 96);
@@ -64,54 +64,6 @@ internal static class DiscTool
        reporter.Progress(InstallStages.ExtractDisc, "Disc validated and extracted", 6);
    }

-    /// <summary>
-    /// Checks a game Wheel Wizard already extracted against the pinned clean disc and copies only its two code
-    /// files into <paramref name="assetsDirectory"/> for translation. The game itself stays where it is; the
-    /// runtime reads it in place. Returns its <c>DATA</c> folder.
-    /// </summary>
-    public static string ValidateExtracted(string gameDirectory, ProjectManifest manifest, string assetsDirectory,
-        IInstallReporter reporter)
-    {
-        reporter.Progress(InstallStages.ExtractDisc, "Checking the extracted game", 2);
-        var dataDir = ExtractedGameDirectory.ResolveDataDirectory(gameDirectory);
-        var header = ExtractedGameDirectory.ReadHeader(dataDir);
-        if (!string.Equals(header.GameId, manifest.GameId, StringComparison.Ordinal))
-        {
-            throw new InvalidOperationException(
-                $"This game is '{header.GameId}', not the expected '{manifest.GameId}' (Mario Kart Wii, region {manifest.Region}).");
-        }
-
-        var dolPath = Path.Combine(dataDir, "sys", "main.dol");
-        var relPath = Path.Combine(dataDir, "files", "rel", "StaticR.rel");
-        if (!File.Exists(relPath)) throw new FileNotFoundException("The extracted game has no StaticR.rel", relPath);
-        if (!string.Equals(Sha256Of(dolPath), manifest.DolSha256, StringComparison.Ordinal) ||
-            !string.Equals(Sha256Of(relPath), manifest.RelSha256, StringComparison.Ordinal))
-        {
-            throw new InvalidOperationException(
-                "The extracted game's main.dol or StaticR.rel is not the clean game code this project is pinned to.");
-        }
-
-        Directory.CreateDirectory(assetsDirectory);
-        File.Copy(dolPath, Path.Combine(assetsDirectory, "main.dol"), overwrite: true);
-        File.Copy(relPath, Path.Combine(assetsDirectory, "StaticR.rel"), overwrite: true);
-        reporter.Progress(InstallStages.ExtractDisc, "Extracted game validated", 6);
-        return dataDir;
-    }
-
-    /// <summary>Removes the workspace's own extraction once the extracted game is read in place instead.</summary>
-    public static void RemoveOwnExtraction(string assetsDirectory, IInstallReporter reporter)
-    {
-        var own = Path.Combine(assetsDirectory, "DATA");
-        try
-        {
-            if (Directory.Exists(own)) Directory.Delete(own, recursive: true);
-        }
-        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
-        {
-            reporter.Diagnostic("The game copy WiiCompiled no longer uses could not be removed yet: " + ex.Message);
-        }
-    }
-
    private static async Task<string> RunInfoAsync(string nodTool, string isoPath, CancellationToken cancellationToken)
    {
        var startInfo = new System.Diagnostics.ProcessStartInfo(nodTool)
@@ -184,31 +184,18 @@ internal sealed class BuildProgressWindow
        }

        // Anything else - a plain MKWCBUILD note, or raw tool output - stays a diagnostic and only
-        // feeds the compile progress below.
+        // feeds the heartbeat below.
        _reporter.Diagnostic(line);
-        // Compilation announces itself once and then ninja prefixes every edge with [done/total].
-        // Follow that counter rather than counting lines: how many lines a build prints depends on
-        // whether aurora and its dependencies are prebuilt (AppImage) or compiled here (macOS), so a
-        // fixed per-line step reached the top long before the game itself compiled.
-        if (_fraction >= CompileFraction && TryParseNinjaProgress(line, out var done, out var total))
+        // Compilation announces itself once and then emits thousands of compiler lines. Treat that
+        // output as a heartbeat so the slice keeps creeping forward, but only publish a progress
+        // line when the rounded percentage actually changes.
+        if (_fraction >= CompileFraction)
        {
-            _fraction = Math.Max(_fraction, CompileFraction + (0.97 - CompileFraction) * done / total);
+            _fraction = Math.Min(0.97, _fraction + 0.0015);
            Emit();
        }
    }

-    private static bool TryParseNinjaProgress(string line, out int done, out int total)
-    {
-        done = total = 0;
-        if (!line.StartsWith('[')) return false;
-        var close = line.IndexOf(']');
-        var slash = line.IndexOf('/');
-        return close > 0 && slash > 0 && slash < close
-            && int.TryParse(line.AsSpan(1, slash - 1), out done)
-            && int.TryParse(line.AsSpan(slash + 1, close - slash - 1), out total)
-            && total > 0 && done <= total;
-    }
-
    private void Emit()
    {
        var percent = Interpolate(_fraction);
@@ -1,13 +1,9 @@
-using System.Reflection;
-
 namespace WiiCompiled.Setup.Linux;

 internal static class ProductInfo
 {
    public const string Name = "WiiCompiled";
-    public static readonly string Version =
-        typeof(ProductInfo).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!
-            .InformationalVersion;
+    public const string Version = "0.2.27";
 }

 /// <summary>One installed product's record inside install-state.json.</summary>
@@ -32,10 +28,4 @@ internal sealed class InstallState
    public int SchemaVersion { get; set; } = 1;
    public string Workspace { get; set; } = "";
    public List<ProductInstallRecord> Products { get; set; } = new();
-
-    /// <summary>
-    /// The <c>DATA</c> folder of a game Wheel Wizard already extracted (<c>--game-dir</c>), read in place through
-    /// <c>dvd_root</c>. Empty when the game was extracted into the workspace's own <c>Assets/DATA</c>.
-    /// </summary>
-    public string GameDataDir { get; set; } = "";
 }
@@ -11,13 +11,6 @@ internal static class Program
        // --workspace <cache> ahead of whatever the caller passed, so these can't assume position 0.
        if (args.Length == 0 || args.Contains("-h") || args.Contains("--help")) { PrintUsage(); return 0; }
        if (args.Contains("--version")) { Console.WriteLine(ProductInfo.Version); return 0; }
-        // Lets Wheel Wizard tell what this AppImage supports before it asks; an older one rejects the flag.
-        if (args.Contains("--capabilities"))
-        {
-            Console.WriteLine(System.Text.Json.JsonSerializer.Serialize(
-                new { type = "capabilities", capabilities = new[] { "game-dir" } }));
-            return 0;
-        }

        using var cts = new CancellationTokenSource();
        // Replaces CancellationSignal.cs's named-EventWaitHandle IPC (Windows-only): SIGINT/SIGTERM
@@ -57,9 +50,6 @@ internal static class Program
                case "check-products":
                    CheckProducts();
                    break;
-                case "link-game-dir":
-                    LinkGameDirectory(flags, reporter);
-                    break;
                default:
                    Console.Error.WriteLine($"Unknown command: {command}");
                    PrintUsage();
@@ -109,23 +99,10 @@ internal static class Program
        var assetsDir = Path.Combine(workspace, "Assets");

        reporter.Progress(InstallStages.Validate, "Checking prerequisites", 1);
-        var gameDirectory = flags.GetValueOrDefault("game-dir");
-        flags.TryGetValue("game", out var isoPath);
-        if (!string.IsNullOrEmpty(isoPath) && !string.IsNullOrEmpty(gameDirectory))
-            throw new ArgumentException("Pass either --game or --game-dir, not both.");
-
-        var previousState = JsonState.TryRead<InstallState>(StatePath);
-        // Where the runtime reads the game: an extracted game it was given or already linked, else its own copy.
-        var gameDataDir = previousState?.GameDataDir ?? "";
-        if (!string.IsNullOrEmpty(gameDirectory))
-        {
-            gameDataDir = DiscTool.ValidateExtracted(gameDirectory, manifest, assetsDir, reporter);
-        }
-        else if (!string.IsNullOrEmpty(isoPath))
+        if (flags.TryGetValue("game", out var isoPath) && !string.IsNullOrEmpty(isoPath))
        {
            await DiscTool.ValidateAndExtractAsync(isoPath, manifest, assetsDir, workspace,
                flags.GetValueOrDefault("disc-tool-bin"), reporter, token);
-            gameDataDir = "";
        }
        else
        {
@@ -139,9 +116,8 @@ internal static class Program
            }
        }

-        var state = previousState ?? new InstallState { Workspace = workspace };
+        var state = JsonState.TryRead<InstallState>(StatePath) ?? new InstallState { Workspace = workspace };
        state.Workspace = workspace;
-        state.GameDataDir = gameDataDir;

        var profile = installsRetro ? "both" : "base";
        var profiles = installsRetro ? new[] { "base", "retro-rewind" } : new[] { "base" };
@@ -151,52 +127,22 @@ internal static class Program
        string? retroWfcOfflineDir = null;
        if (downloadPayload)
        {
+            // Reused if a previous install already downloaded and it's still valid - matches
+            // Windows's own reuse-if-valid behavior instead of re-downloading on every install.
            var cacheDir = Path.Combine(workspace, "generated", "retro-wfc-payload");
-            reporter.Progress(InstallStages.Validate,
-                "Downloading the current Retro-WFC payload", 1);
+            reporter.Progress(InstallStages.Validate, "Preparing the Retro-WFC payload", 1);
            try
            {
-                // A valid signature authenticates a payload, but does not prove it is the latest
-                // signed revision. Always ask the fixed endpoint for the current snapshot; the
-                // downloader verifies it before atomically replacing the cache.
+                RetroWfcPayload.ValidateStagedRetroWfcPayloadDirectory(cacheDir);
+            }
+            catch (InvalidDataException)
+            {
                await RetroWfcPayload.DownloadRetroWfcPayloadAsync(
                    RetroWfcPayload.CurrentRetroWfcPayloadUri, cacheDir, token);
            }
-            catch (Exception downloadFailure) when (!token.IsCancellationRequested &&
-                                                     downloadFailure is HttpRequestException or TimeoutException
-                                                         or IOException)
-            {
-                // Offline installs may continue with a previously authenticated snapshot. Do not
-                // use this path for a newly downloaded payload that failed signature validation:
-                // that must remain a hard failure instead of hiding possible endpoint tampering.
-                try
-                {
-                    RetroWfcPayload.ValidateStagedRetroWfcPayloadDirectory(cacheDir);
-                }
-                catch (Exception cacheFailure) when (cacheFailure is IOException or
-                                                     UnauthorizedAccessException or InvalidDataException)
-                {
-                    throw new InvalidOperationException(
-                        "The current Retro-WFC payload could not be downloaded and no valid cached " +
-                        $"payload is available ({cacheFailure.Message.TrimEnd('.')}).", downloadFailure);
-                }
-
-                reporter.Diagnostic(
-                    "The current Retro-WFC payload could not be downloaded; using the previously " +
-                    $"verified cached payload instead ({downloadFailure.Message.TrimEnd('.')}).");
-            }
            retroWfcOfflineDir = cacheDir;
        }

-        var sysroot = flags.GetValueOrDefault("sysroot");
-        // --sysroot explicitly provided (even as bare flag at end of argv, which ParseArgs
-        // stores as null) must carry a path; omitting --sysroot entirely is fine (local-build.sh
-        // adds -UCMAKE_SYSROOT to clear any stale cached value from a prior configure).
-        if (flags.ContainsKey("sysroot") && string.IsNullOrWhiteSpace(sysroot))
-        {
-            throw new ArgumentException("--sysroot requires a non-empty directory path.");
-        }
-
        await BuildRunner.RunAsync(
            workspace, profile, installDir, baseInstallDir,
            retroDir,
@@ -210,7 +156,6 @@ internal static class Program
            flags.GetValueOrDefault("cmake"),
            flags.GetValueOrDefault("ninja"),
            flags.GetValueOrDefault("native-prebuilt-dir"),
-            sysroot,
            reporter, token);

        reporter.Progress(InstallStages.Shortcuts, "Creating shortcuts", 98);
@@ -242,13 +187,11 @@ internal static class Program
        // per-user Config.toml (RuntimeConfiguration.ResolveConfigPath's Windows-only portable-root
        // lookup has nothing to find here either way).
        var configPath = RuntimeConfiguration.ApplicationDataConfigPath;
-        var dataDir = string.IsNullOrEmpty(gameDataDir) ? Path.Combine(assetsDir, "DATA") : gameDataDir;
+        var dataDir = Path.Combine(assetsDir, "DATA");
        if (Directory.Exists(dataDir))
        {
            RuntimeConfiguration.SetDvdRoot(configPath, dataDir);
        }
-        if (!string.IsNullOrEmpty(gameDataDir))
-            DiscTool.RemoveOwnExtraction(assetsDir, reporter);
        if (installsRetro)
        {
            RuntimeConfiguration.SetRetroRewindRoot(configPath, retroDir!);
@@ -257,39 +200,6 @@ internal static class Program
        reporter.Progress(InstallStages.Shortcuts, "Install complete", 99);
    }

-    /// <summary>
-    /// Points the installation at a game Wheel Wizard already extracted, without rebuilding: the game code is
-    /// checked to be exactly what the installed products were built from, then <c>dvd_root</c> and the state name
-    /// it and the workspace's own copy is removed.
-    /// </summary>
-    private static void LinkGameDirectory(Dictionary<string, string?> flags, IInstallReporter reporter)
-    {
-        var gameDirectory = flags.GetValueOrDefault("game-dir");
-        if (string.IsNullOrEmpty(gameDirectory))
-            throw new ArgumentException("link-game-dir needs --game-dir <folder>.");
-        var state = JsonState.TryRead<InstallState>(StatePath);
-        if (state is null || state.Products.Count == 0)
-            throw new InvalidOperationException("WiiCompiled is not installed yet.");
-
-        var workspace = flags.GetValueOrDefault("workspace") ??
-                        (string.IsNullOrEmpty(state.Workspace) ? WorkspaceLocator.FindFrom(AppContext.BaseDirectory) : state.Workspace);
-        var manifest = ProjectManifest.Load(Path.Combine(workspace, "projects", "mkwii", "recomp.yml"));
-        var assetsDir = Path.Combine(workspace, "Assets");
-        var dataDir = DiscTool.ValidateExtracted(gameDirectory, manifest, assetsDir, reporter);
-
-        var dolSha = Sha256Of(Path.Combine(dataDir, "sys", "main.dol"));
-        var relSha = Sha256Of(Path.Combine(dataDir, "files", "rel", "StaticR.rel"));
-        if (state.Products.Any(record => record.DolSha256 != dolSha || record.RelSha256 != relSha))
-            throw new InvalidOperationException(
-                "The installed products were built from different game code; install again with --game-dir instead.");
-
-        reporter.Progress(InstallStages.Shortcuts, "Pointing WiiCompiled at the extracted game", 70);
-        RuntimeConfiguration.SetDvdRoot(RuntimeConfiguration.ApplicationDataConfigPath, dataDir);
-        state.GameDataDir = dataDir;
-        JsonState.Write(StatePath, state);
-        DiscTool.RemoveOwnExtraction(assetsDir, reporter);
-    }
-
    private static void Uninstall()
    {
        // Matches Windows: UninstallService.cs removes the whole install directory unconditionally -
@@ -410,18 +320,16 @@ internal static class Program
        Console.WriteLine("""
        Usage: wiicompiled-setup <command> [options]

-          install [--game ISO_PATH | --game-dir EXTRACTED_GAME] [--install-dir DIR] [--retro-dir DIR
+          install [--game ISO_PATH] [--install-dir DIR] [--retro-dir DIR
                  {--download-retro-wfc-payload | --skip-retro-wfc-payload}]
                  [--force-clean-build] [--translator-bin PATH] [--disc-tool-bin PATH]
                  [--cc PATH] [--cxx PATH] [--fuse-ld NAME_OR_PATH] [--cmake PATH] [--ninja PATH]
-                  [--native-prebuilt-dir DIR] [--sysroot PATH] [--progress-json] [--workspace DIR]
+                  [--native-prebuilt-dir DIR] [--progress-json] [--workspace DIR]
          uninstall
          launch-base
          launch-retro
          check-products
-          link-game-dir --game-dir EXTRACTED_GAME [--progress-json]
          --version
-          --capabilities
        """);
    }
 }
@@ -6,6 +6,7 @@
    <Nullable>enable</Nullable>
    <AssemblyName>WiiCompiled.Setup.Linux</AssemblyName>
    <RootNamespace>WiiCompiled.Setup.Linux</RootNamespace>
+    <Version>0.2.22</Version>
    <Authors>patchzy</Authors>
    <Product>WiiCompiled</Product>
    <Description>Command-line installer and launcher for WiiCompiled on Linux</Description>
@@ -14,9 +14,7 @@ internal enum AppMode
    CheckProducts,
    RepairProducts,
    Version,
-    EmitPayloadIdentities,
-    Capabilities,
-    LinkGameDirectory
+    EmitPayloadIdentities
 }

 /// <summary>
@@ -28,12 +26,7 @@ internal sealed record ModeRules
    public string Flag { get; init; } = "this command";
    public bool AcceptsProgressJson { get; init; }
    public bool AcceptsGame { get; init; }
-
-    /// <summary>The game is required, as either <c>--game &lt;image&gt;</c> or <c>--game-dir &lt;folder&gt;</c>.</summary>
    public bool RequiresGame { get; init; }
-
-    public bool AcceptsGameDirectory { get; init; }
-    public bool RequiresGameDirectory { get; init; }
    public bool AcceptsRetroDirectory { get; init; }
    public bool RequiresRetroDirectory { get; init; }
    public bool AcceptsPayloadMode { get; init; }
@@ -46,7 +39,6 @@ internal sealed class CommandLine
 {
    public AppMode Mode { get; private set; } = AppMode.Help;
    public string? GamePath { get; private set; }
-    public string? GameDirectoryPath { get; private set; }
    public string? RetroDirectoryPath { get; private set; }
    public RetroWfcPayloadMode RetroWfcPayloadMode { get; private set; }
    public string? InstallDirectory { get; private set; }
@@ -78,9 +70,6 @@ internal sealed class CommandLine
                case "--repair-products": result.Mode = AppMode.RepairProducts; break;
                case "--portable": result.Portable = true; break;
                case "--emit-payload-identities": result.Mode = AppMode.EmitPayloadIdentities; break;
-                case "--capabilities": result.Mode = AppMode.Capabilities; break;
-                case "--link-game-dir": result.Mode = AppMode.LinkGameDirectory; break;
-                case "--game-dir": result.GameDirectoryPath = RequireValue(args, ref i); break;
                case "--payload-root": result.PayloadRootPath = RequireValue(args, ref i); break;
                case "--quiet": result.Quiet = true; break;
                case "--progress-json": result.ProgressJson = true; break;
@@ -111,22 +100,16 @@ internal sealed class CommandLine
        [AppMode.SilentInstall] = new ModeRules
        {
            Flag = "--silent",
-            AcceptsProgressJson = true, AcceptsGame = true, AcceptsGameDirectory = true, RequiresGame = true,
+            AcceptsProgressJson = true, AcceptsGame = true, RequiresGame = true,
            AcceptsRetroDirectory = true, AcceptsPayloadMode = true,
            AcceptsPortable = true
        },
        [AppMode.VerifyInputs] = new ModeRules
        {
            Flag = "--verify-inputs",
-            AcceptsProgressJson = true, AcceptsGame = true, AcceptsGameDirectory = true, RequiresGame = true,
+            AcceptsProgressJson = true, AcceptsGame = true, RequiresGame = true,
            AcceptsRetroDirectory = true
        },
-        [AppMode.LinkGameDirectory] = new ModeRules
-        {
-            Flag = "--link-game-dir",
-            AcceptsProgressJson = true, AcceptsGameDirectory = true, RequiresGameDirectory = true,
-            RequiresInstallDirectory = true
-        },
        [AppMode.CheckProducts] = new ModeRules
        {
            Flag = "--check-products", AcceptsProgressJson = true, AcceptsRetroDirectory = true
@@ -164,9 +147,6 @@ internal sealed class CommandLine
        }

        Reject(GamePath is not null && !rules.AcceptsGame, "--game");
-        Reject(GameDirectoryPath is not null && !rules.AcceptsGameDirectory, "--game-dir");
-        if (GamePath is not null && GameDirectoryPath is not null)
-            throw new ArgumentException("Pass either --game or --game-dir, not both.");
        Reject(RetroDirectoryPath is not null && !rules.AcceptsRetroDirectory, "--retro-dir");
        Reject(ProgressJson && !rules.AcceptsProgressJson, "--progress-json");
        Reject(PayloadRootPath is not null && !rules.RequiresPayloadRoot, "--payload-root");
@@ -174,10 +154,8 @@ internal sealed class CommandLine
        Reject(RetroWfcPayloadMode != RetroWfcPayloadMode.NotApplicable && !rules.AcceptsPayloadMode,
            "A Retro-WFC payload option");

-        if (rules.RequiresGame && string.IsNullOrWhiteSpace(GamePath) && string.IsNullOrWhiteSpace(GameDirectoryPath))
-            throw new ArgumentException("--game or --game-dir is required.");
-        if (rules.RequiresGameDirectory && string.IsNullOrWhiteSpace(GameDirectoryPath))
-            throw new ArgumentException($"--game-dir is required with {rules.Flag}.");
+        if (rules.RequiresGame && string.IsNullOrWhiteSpace(GamePath))
+            throw new ArgumentException("--game is required.");
        if (rules.RequiresRetroDirectory && string.IsNullOrWhiteSpace(RetroDirectoryPath))
            throw new ArgumentException(
                $"--retro-dir is required with {rules.Flag}. Supply Wheel Wizard's canonical Retro Rewind folder.");
@@ -11,10 +11,8 @@ internal static class ConsoleCommands
        Console.Out.WriteLine("Wheel Wizard is the graphical interface for installing and launching WiiCompiled.");
        Console.Out.WriteLine();
        Console.Out.WriteLine("Commands:");
-        Console.Out.WriteLine("  --silent (--game <image> | --game-dir <folder>) --install-dir <dir> [--retro-dir <folder>] [--portable]");
-        Console.Out.WriteLine("  --verify-inputs (--game <image> | --game-dir <folder>) [--retro-dir <folder>]");
-        Console.Out.WriteLine("  --link-game-dir --install-dir <dir> --game-dir <folder> [--progress-json]");
-        Console.Out.WriteLine("  --capabilities");
+        Console.Out.WriteLine("  --silent --game <image> --install-dir <dir> [--retro-dir <folder>] [--portable]");
+        Console.Out.WriteLine("  --verify-inputs --game <image> [--retro-dir <folder>]");
        Console.Out.WriteLine("  --check-products [--install-dir <dir>] [--retro-dir <folder>] [--progress-json]");
        Console.Out.WriteLine("  --repair-products --install-dir <dir> --retro-dir <folder> " +
                             "(--download-retro-wfc-payload | --skip-retro-wfc-payload) [--progress-json]");
@@ -30,80 +28,6 @@ internal static class ConsoleCommands
        return 0;
    }

-    /// <summary>
-    /// What this setup supports, so Wheel Wizard can tell before it asks. A setup from before this command rejects
-    /// it as unknown, which the caller reads as supporting nothing new.
-    /// </summary>
-    public static int Capabilities()
-    {
-        Console.Out.WriteLine(JsonSerializer.Serialize(new { type = "capabilities", capabilities = new[] { "game-dir" } }));
-        return 0;
-    }
-
-    /// <summary>
-    /// Points an existing installation at a game Wheel Wizard already extracted: <c>dvd_root</c> and the install
-    /// state name it, and the installation's own extracted copy is removed. Nothing is rebuilt, since the game
-    /// code it was built from is checked to be the same.
-    /// </summary>
-    public static int LinkGameDirectory(CommandLine command)
-    {
-        var reporter = command.ProgressJson ? new NdjsonInstallReporter() : null;
-        var installation = new Installation(Path.GetFullPath(command.InstallDirectory!));
-        try
-        {
-            if (!installation.IsPresent)
-                throw new InvalidOperationException($"WiiCompiled is not installed at {installation.Root}.");
-
-            using var operationLock = InstallOperationLock.Acquire(installation.Root, reporter);
-            PortableInstallHealing.HealMovedInstall(installation, reporter);
-            var state = installation.ReadInstallState() is { SchemaVersion: 1 } current
-                ? current
-                : throw new InvalidDataException("The installation has no current install state. Apply setup again.");
-
-            reporter?.Progress(InstallStages.Validate, "Checking the extracted game...", 20);
-            var dataDirectory = ExtractedGameDirectory.ResolveDataDirectory(command.GameDirectoryPath!);
-            var header = InputValidation.ReadDiscHeaderFromDirectory(dataDirectory);
-            var installedManifest = JsonState.TryRead<PayloadManifest>(
-                Path.Combine(installation.Root, InstalledLayout.PayloadManifestFileName));
-            if (installedManifest is not null)
-                InputValidation.EnsureCompatibleDisc(header, installedManifest);
-            // The products were built from exactly this game code; anything else needs a rebuild, not a link.
-            foreach (var (file, expected) in new[]
-                     {
-                         (Path.Combine(dataDirectory, "sys", "main.dol"), state.DolSha256),
-                         (Path.Combine(dataDirectory, "files", "rel", "StaticR.rel"), state.RelSha256),
-                     })
-            {
-                if (!File.Exists(file) ||
-                    !InputValidation.Sha256File(file).Equals(expected, StringComparison.OrdinalIgnoreCase))
-                    throw new InvalidDataException(
-                        $"{Path.GetFileName(file)} in the extracted game is not the clean game code WiiCompiled was built from.");
-            }
-
-            RunningProductGuard.EnsureProductsNotRunning(installation.Root);
-            reporter?.Progress(InstallStages.Publish, "Pointing WiiCompiled at the extracted game...", 70);
-            RuntimeConfiguration.SetDvdRoot(installation.ConfigPath, dataDirectory);
-            state.GameDataDir = dataDirectory;
-            JsonState.Write(installation.InstallStatePath, state);
-            InstallerEngine.RemoveOwnGameAssets(installation, reporter ?? (IInstallReporter)new ConsoleInstallReporter(_ => { }));
-
-            if (reporter is null)
-                Console.Out.WriteLine($"WiiCompiled now reads the game from {dataDirectory}.");
-            reporter?.Success(installation.Root);
-            return 0;
-        }
-        catch (Exception ex) when (reporter is not null)
-        {
-            reporter.Failure(ex.Message);
-            Console.Error.WriteLine(ex);
-            return 1;
-        }
-        finally
-        {
-            reporter?.EnsureFinished("Linking the extracted game stopped before it reached a result.");
-        }
-    }
-

    public static int EmitPayloadIdentities(CommandLine command)
    {
@@ -144,10 +68,7 @@ internal static class ConsoleCommands
            payload.ExtractEntry(InstalledLayout.ToolkitEntryPrefix + "nodtool.exe", tool);
            payload.ExtractDirectory(InstalledLayout.ToolkitEntryPrefix + "Redist", temp);
            reporter?.Progress(InstallStages.Validate, "Checking the Wii disc image...", 10);
-            var header = command.GameDirectoryPath is null
-                ? InputValidation.ReadDiscHeaderAsync(tool, command.GamePath!).GetAwaiter().GetResult()
-                : InputValidation.ReadDiscHeaderFromDirectory(
-                    ExtractedGameDirectory.ResolveDataDirectory(command.GameDirectoryPath));
+            var header = InputValidation.ReadDiscHeaderAsync(tool, command.GamePath!).GetAwaiter().GetResult();
            InputValidation.EnsureCompatibleDisc(header, manifest);

            if (command.RetroDirectoryPath is not null)
@@ -194,8 +115,7 @@ internal static class ConsoleCommands
            var engine = new InstallerEngine(reporter);
            await engine.InstallAsync(new InstallOptions
            {
-                GamePath = command.GamePath,
-                GameDirectoryPath = command.GameDirectoryPath,
+                GamePath = command.GamePath!,
                RetroDirectoryPath = command.RetroDirectoryPath,
                RetroWfcPayloadMode = command.RetroWfcPayloadMode,
                InstallDirectory = installDirectory,
@@ -42,19 +42,6 @@ internal static class InputValidation
        };
    }

-    /// <summary>The disc header of a game Wheel Wizard already extracted, read from its <c>sys/boot.bin</c>.</summary>
-    public static DiscHeader ReadDiscHeaderFromDirectory(string dataDirectory)
-    {
-        var header = ExtractedGameDirectory.ReadHeader(dataDirectory);
-        return new DiscHeader
-        {
-            GameId = header.GameId,
-            InternalName = header.InternalName,
-            Region = RegionFromGameId(header.GameId),
-            Revision = header.Revision,
-        };
-    }
-
    private static string RegionFromGameId(string gameId) => gameId.Length >= 4
        ? gameId[3] switch
        {
@@ -99,17 +99,7 @@ internal sealed class Installation
    public string BaseExecutable => Path.Combine(BaseDirectory, "WiiCompiled.exe");
    public string RetroDirectory => Path.Combine(Root, "RetroRewind");
    public string RetroExecutable => Path.Combine(RetroDirectory, "RetroRewind.exe");
-    /// <summary>
-    /// Where the game data is read from: Wheel Wizard's extracted game when the installation was pointed at it,
-    /// otherwise the extraction this installation keeps itself.
-    /// </summary>
-    public string GameDataDirectory =>
-        ReadInstallState() is { GameDataDir.Length: > 0 } state ? state.GameDataDir : OwnGameDataDirectory;
-
-    /// <summary>The installation's own extraction, which only an installation given a disc image has.</summary>
-    public string OwnGameDataDirectory => Path.Combine(Root, "GameAssets", "DATA");
-
-    public string OwnGameAssetsDirectory => Path.Combine(Root, "GameAssets");
+    public string GameDataDirectory => Path.Combine(Root, "GameAssets", "DATA");
    public string InstallStatePath => Path.Combine(Root, InstalledLayout.InstallStateFileName);
    public string ToolkitStatePath => Path.Combine(Root, ToolkitState.FileName);

@@ -13,12 +13,7 @@ internal sealed class InstallerEngine
        var installDirectory = Path.GetFullPath(options.InstallDirectory);
        ValidateInstallDirectory(installDirectory);

-        // A game Wheel Wizard already extracted is read in place; only a disc image is extracted here.
-        var externalGameData = options.GameDirectoryPath is null
-            ? null
-            : ExtractedGameDirectory.ResolveDataDirectory(options.GameDirectoryPath);
-        if (externalGameData is null)
-            InputValidation.ValidateExtension(options.GamePath ?? throw new ArgumentException("A game is required."));
+        InputValidation.ValidateExtension(options.GamePath);
        var parent = Directory.GetParent(installDirectory)?.FullName
                     ?? throw new InvalidOperationException("The installation directory has no parent.");
        Directory.CreateDirectory(parent);
@@ -54,8 +49,7 @@ internal sealed class InstallerEngine
        var installedToolkitPackageFingerprint = existing.IsPresent
            ? existing.ResolveToolkitPackageFingerprint()
            : "";
-        var reusableGameAssets = externalGameData ?? FindReusableGameAssets(existing, manifest);
-        var gameDataDir = GameDataDirFor(externalGameData, reusableGameAssets, previousState);
+        var reusableGameAssets = FindReusableGameAssets(existing, manifest);

        var sameToolkit = existing.IsPresent && reusableGameAssets is not null &&
                          installedToolkitFingerprint.Equals(candidateToolkitFingerprint,
@@ -90,12 +84,9 @@ internal sealed class InstallerEngine

        var nodTool = extractToolkit ? Path.Combine(toolkit, "nodtool.exe") : installedNodTool;
        _reporter.Progress(InstallStages.Validate, "Checking the Wii disc image...", 2);
-        var header = externalGameData is null
-            ? await InputValidation.ReadDiscHeaderAsync(nodTool, options.GamePath!, cancellationToken)
-            : InputValidation.ReadDiscHeaderFromDirectory(externalGameData);
+        var header = await InputValidation.ReadDiscHeaderAsync(nodTool, options.GamePath,
+            cancellationToken);
        InputValidation.EnsureCompatibleDisc(header, manifest);
-        if (externalGameData is not null)
-            ValidateExtractedGame(externalGameData, manifest);
        var canonicalRetroRoot = options.RetroDirectoryPath is null
            ? null
            : RetroRewindSource.ResolveRetroRewind6(options.RetroDirectoryPath);
@@ -139,7 +130,6 @@ internal sealed class InstallerEngine

            var updatedState = BuildInstallState(existing.ReadInstallState(), installDirectory, manifest,
                retroCompileInputs, canonicalRetroRoot, options.RetroWfcPayloadMode);
-            updatedState.GameDataDir = gameDataDir;
            PrepareMetadata(staging, manifest, updatedState);
            remainingCancellation.ThrowIfCancellationRequested();

@@ -168,30 +158,16 @@ internal sealed class InstallerEngine

        if (reusableGameAssets is null)
        {
-            await ExtractGameAssetsAsync(nodTool, options.GamePath!,
+            await ExtractGameAssetsAsync(nodTool, options.GamePath,
                Path.Combine(staging, "GameAssets"), manifest, cancellationToken);
        }

        await PublishToolkitAndReconcileProductsAsync(existing, staging, workspace, manifest,
            previousState, options, canonicalRetroRoot, retroCompileInputs,
-            publishGameAssets: reusableGameAssets is null, gameDataDir, createShortcuts: firstInstall,
+            publishGameAssets: reusableGameAssets is null, createShortcuts: firstInstall,
            cancellationToken: cancellationToken);
    }

-    /// <summary>
-    /// What <see cref="InstallState.GameDataDir"/> becomes: the extracted game this operation was given, or the
-    /// one a previous operation linked when that is what is being reused; empty for the installation's own copy.
-    /// </summary>
-    private static string GameDataDirFor(string? externalGameData, string? reusableGameAssets, InstallState? previousState)
-    {
-        if (externalGameData is not null)
-            return externalGameData;
-        if (reusableGameAssets is not null && previousState is { GameDataDir.Length: > 0 } previous &&
-            FileSystemUtilities.PathsEqual(reusableGameAssets, previous.GameDataDir))
-            return previous.GameDataDir;
-        return "";
-    }
-

    internal static bool MustRefreshToolkit(bool sameToolkit, bool samePackageContent,
        bool nodToolPresent) =>
@@ -214,7 +190,7 @@ internal sealed class InstallerEngine
        string stagedWorkspace, PayloadManifest manifest, InstallState? previousState,
        InstallOptions options, string? canonicalRetroRoot,
        RetroRewindCompileInputs? retroCompileInputs,
-        bool publishGameAssets, string gameDataDir, bool createShortcuts, CancellationToken cancellationToken)
+        bool publishGameAssets, bool createShortcuts, CancellationToken cancellationToken)
    {
        var installDirectory = existing.Root;

@@ -232,7 +208,6 @@ internal sealed class InstallerEngine

        var state = BuildInstallState(previousState, installDirectory, manifest,
            compileInputs: null, canonicalRetroRoot, options.RetroWfcPayloadMode);
-        state.GameDataDir = gameDataDir;
        PrepareMetadata(staging, manifest, state);

        cancellationToken.ThrowIfCancellationRequested();
@@ -330,9 +305,7 @@ internal sealed class InstallerEngine
        using var transaction = InstallTransaction.Begin(installDirectory, _reporter, entries.ToArray());
        transaction.Publish();
        transaction.RecordRuntimeConfigurationMutation(configSnapshot);
-        RuntimeConfiguration.SetDvdRoot(configPath, string.IsNullOrEmpty(state.GameDataDir)
-            ? Path.Combine(installDirectory, "GameAssets", "DATA")
-            : state.GameDataDir);
+        RuntimeConfiguration.SetDvdRoot(configPath, Path.Combine(installDirectory, "GameAssets", "DATA"));
        // The runtime scans this directory live for its asset overlay, so it is recorded on every
        // operation that receives one and is never rewritten by a base-only operation.
        if (canonicalRetroRoot is not null)
@@ -363,26 +336,9 @@ internal sealed class InstallerEngine
                                 ex.Message);
        }

-        // Reading Wheel Wizard's extracted game, the installation no longer needs a copy of its own.
-        if (!string.IsNullOrEmpty(state.GameDataDir))
-            RemoveOwnGameAssets(new Installation(installDirectory), _reporter);
-
        _reporter.Progress(InstallStages.Publish, "Installation complete.", completionPercent);
    }

-    /// <summary>Deletes the installation's own extraction; it is only ever this installation's own folder.</summary>
-    internal static void RemoveOwnGameAssets(Installation installation, IInstallReporter reporter)
-    {
-        try
-        {
-            FileSystemUtilities.DeleteDirectoryIfExists(installation.OwnGameAssetsDirectory);
-        }
-        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
-        {
-            reporter.Diagnostic("The game copy WiiCompiled no longer uses could not be removed yet: " + ex.Message);
-        }
-    }
-
    private static void PrepareMetadata(string staging, PayloadManifest manifest, InstallState state)
    {
        JsonState.Write(Path.Combine(staging, ToolkitState.FileName), new ToolkitState
@@ -12,14 +12,7 @@ internal enum RetroWfcPayloadMode

 internal sealed class InstallOptions
 {
-    /// <summary>A disc image to extract. Exactly one of this and <see cref="GameDirectoryPath"/> is set.</summary>
-    public string? GamePath { get; init; }
-
-    /// <summary>
-    /// A game Wheel Wizard already extracted (its root, holding <c>DATA/</c>). It is read in place through
-    /// <c>dvd_root</c>; nothing is extracted and no copy of it is kept in the installation.
-    /// </summary>
-    public string? GameDirectoryPath { get; init; }
+    public required string GamePath { get; init; }

    /// <summary>
    /// The canonical Retro Rewind installation Wheel Wizard owns. Its resolved path is recorded as
@@ -109,13 +102,6 @@ internal sealed class InstallState
    /// <c>[paths] retro_rewind_root</c>; this mirror lets uninstall drop only the setting it owns.
    /// </summary>
    public string RetroRewindRoot { get; set; } = "";
-
-    /// <summary>
-    /// The extracted game's <c>DATA</c> folder this installation reads in place (<c>--game-dir</c>). Empty for an
-    /// installation that reads its own extraction in <c>GameAssets\DATA</c>. Wheel Wizard reads this to know
-    /// whether WiiCompiled already uses its extracted game.
-    /// </summary>
-    public string GameDataDir { get; set; } = "";
 }

 /// <summary>
@@ -110,7 +110,8 @@ internal sealed class ProductRepairService
                    InputValidation.CurrentRetroWfcPayloadUri, payloadScratch, cancellationToken);
            }
            catch (Exception ex) when (!cancellationToken.IsCancellationRequested &&
-                                       ex is HttpRequestException or TimeoutException or IOException)
+                                       ex is HttpRequestException or IOException or InvalidDataException
+                                           or InvalidOperationException or OperationCanceledException)
            {
                payloadSnapshot = RecoverInstalledRetroWfcPayload(toolkitFingerprint,
                    Path.Combine(scratchRoot, "retro-wfc-payload-recovered"), ex, cancellationToken);
@@ -1,6 +1,5 @@
 namespace WiiCompiled.Setup.Windows;

-using System.Reflection;
 using System.Runtime.InteropServices;

 internal static class Program
@@ -39,12 +38,6 @@ internal static class Program
            if (command.Mode == AppMode.Version)
                return ConsoleCommands.Version();

-            if (command.Mode == AppMode.Capabilities)
-                return ConsoleCommands.Capabilities();
-
-            if (command.Mode == AppMode.LinkGameDirectory)
-                return ConsoleCommands.LinkGameDirectory(command);
-
            if (command.Mode == AppMode.Help)
                return ConsoleCommands.Help();

@@ -128,9 +121,7 @@ internal static class PlatformChecks
 internal static class ProductInfo
 {
    public const string Name = "WiiCompiled";
-    public static readonly string Version =
-        typeof(ProductInfo).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!
-            .InformationalVersion;
+    public const string Version = "0.2.27";

    /// <summary>
    /// The setup executable is copied into the installation under this name. It is the launcher and
@@ -53,10 +53,6 @@ internal static class SelfTests
        Test("Runtime configuration key matching", TestRuntimeConfigurationKeyMatching, failures);
        Test("Install location validation", TestInstallLocationValidation, failures);
        Test("Command line contract", TestCommandLineContract, failures);
-        Test("Extracted game command line contract", TestGameDirectoryCommandLine, failures);
-        Test("Extracted game directory", TestExtractedGameDirectory, failures);
-        Test("Game data follows the install state", TestGameDataDirectoryFollowsState, failures);
-        Test("Capabilities report", TestCapabilitiesReport, failures);
        Test("Portable root discovery", TestPortableRootDiscovery, failures);
        Test("Portable install validation failure leaves no marker",
            TestPortableValidationFailureLeavesNoMarker, failures);
@@ -269,139 +265,6 @@ internal static class SelfTests
        }
    }

-    private static void TestGameDirectoryCommandLine()
-    {
-        void Rejects(string description, params string[] args)
-        {
-            try
-            {
-                CommandLine.Parse(args);
-                throw new Exception(description + " was accepted.");
-            }
-            catch (ArgumentException) { }
-        }
-
-        var silent = CommandLine.Parse(["--silent", "--game-dir", "D:\\WW\\GAME", "--install-dir", "C:\\MKW", "--progress-json"]);
-        if (silent.Mode != AppMode.SilentInstall || silent.GameDirectoryPath != "D:\\WW\\GAME" || silent.GamePath is not null)
-            throw new Exception("An install from an extracted game did not parse.");
-
-        var link = CommandLine.Parse(["--link-game-dir", "--install-dir", "C:\\MKW", "--game-dir", "D:\\WW\\GAME", "--progress-json"]);
-        if (link.Mode != AppMode.LinkGameDirectory || link.GameDirectoryPath != "D:\\WW\\GAME" || !link.ProgressJson)
-            throw new Exception("The link command did not parse.");
-
-        if (CommandLine.Parse(["--capabilities"]).Mode != AppMode.Capabilities)
-            throw new Exception("--capabilities was not recognised.");
-
-        Rejects("Both a disc image and an extracted game", "--silent", "--game", "g.iso", "--game-dir", "GAME", "--install-dir", "x");
-        Rejects("An install with no game at all", "--silent", "--install-dir", "x");
-        Rejects("A link without the extracted game", "--link-game-dir", "--install-dir", "x");
-        Rejects("A link without an installation", "--link-game-dir", "--game-dir", "GAME");
-        Rejects("A link from a disc image", "--link-game-dir", "--install-dir", "x", "--game-dir", "GAME", "--game", "g.iso");
-        Rejects("--game-dir where nothing reads it", "--check-products", "--install-dir", "x", "--game-dir", "GAME");
-    }
-
-    private static byte[] BootBin(string gameId)
-    {
-        var boot = new byte[0x440];
-        System.Text.Encoding.ASCII.GetBytes(gameId).CopyTo(boot, 0);
-        boot[7] = 2;
-        BinaryPrimitives.WriteUInt32BigEndian(boot.AsSpan(0x18), 0x5D1C9EA3);
-        System.Text.Encoding.ASCII.GetBytes("MARIO KART WII").CopyTo(boot, 0x20);
-        return boot;
-    }
-
-    private static void TestExtractedGameDirectory()
-    {
-        var root = Path.Combine(Path.GetTempPath(), "mkwc-gamedir-" + Guid.NewGuid().ToString("N"));
-        try
-        {
-            var sys = Path.Combine(root, "GAME", "DATA", "sys");
-            Directory.CreateDirectory(sys);
-            File.WriteAllBytes(Path.Combine(sys, "main.dol"), [1, 2, 3]);
-            File.WriteAllBytes(Path.Combine(sys, "boot.bin"), BootBin("RMCP01"));
-
-            var fromRoot = ExtractedGameDirectory.ResolveDataDirectory(Path.Combine(root, "GAME"));
-            var fromData = ExtractedGameDirectory.ResolveDataDirectory(Path.Combine(root, "GAME", "DATA"));
-            if (!FileSystemUtilities.PathsEqual(fromRoot, Path.Combine(root, "GAME", "DATA")) ||
-                !FileSystemUtilities.PathsEqual(fromData, fromRoot))
-                throw new Exception("The DATA folder was not found from the game root or from itself.");
-
-            var header = InputValidation.ReadDiscHeaderFromDirectory(fromRoot);
-            if (header.GameId != "RMCP01" || header.Revision != 2 || header.InternalName != "MARIO KART WII" ||
-                header.Region != "PAL")
-                throw new Exception("The extracted game's header was misread.");
-
-            try
-            {
-                ExtractedGameDirectory.ResolveDataDirectory(root);
-                throw new Exception("A folder without a game was accepted.");
-            }
-            catch (InvalidDataException) { }
-
-            File.WriteAllBytes(Path.Combine(sys, "boot.bin"), new byte[0x440]);
-            try
-            {
-                ExtractedGameDirectory.ReadHeader(fromRoot);
-                throw new Exception("A boot.bin without the Wii magic was accepted.");
-            }
-            catch (InvalidDataException) { }
-        }
-        finally
-        {
-            if (Directory.Exists(root)) Directory.Delete(root, recursive: true);
-        }
-    }
-
-    private static void TestGameDataDirectoryFollowsState()
-    {
-        var root = Path.Combine(Path.GetTempPath(), "mkwc-gamedata-" + Guid.NewGuid().ToString("N"));
-        try
-        {
-            Directory.CreateDirectory(root);
-            var installation = new Installation(root);
-            if (!FileSystemUtilities.PathsEqual(installation.GameDataDirectory, installation.OwnGameDataDirectory))
-                throw new Exception("An installation without state did not read its own game copy.");
-
-            var external = Path.Combine(root, "elsewhere", "GAME", "DATA");
-            JsonState.Write(installation.InstallStatePath, new InstallState { InstallDir = root, GameDataDir = external });
-            if (!FileSystemUtilities.PathsEqual(installation.GameDataDirectory, external))
-                throw new Exception("A linked installation did not read the extracted game.");
-
-            // Removing the installation's own copy never reaches the extracted game it reads.
-            Directory.CreateDirectory(Path.Combine(installation.OwnGameAssetsDirectory, "DATA"));
-            Directory.CreateDirectory(external);
-            File.WriteAllText(Path.Combine(external, "keep.bin"), "keep");
-            InstallerEngine.RemoveOwnGameAssets(installation, new ConsoleInstallReporter(_ => { }));
-            if (Directory.Exists(installation.OwnGameAssetsDirectory) || !File.Exists(Path.Combine(external, "keep.bin")))
-                throw new Exception("Removing the own game copy removed the wrong folder.");
-        }
-        finally
-        {
-            if (Directory.Exists(root)) Directory.Delete(root, recursive: true);
-        }
-    }
-
-    private static void TestCapabilitiesReport()
-    {
-        var output = new StringWriter();
-        var original = Console.Out;
-        Console.SetOut(output);
-        try
-        {
-            if (ConsoleCommands.Capabilities() != 0)
-                throw new Exception("--capabilities did not succeed.");
-        }
-        finally
-        {
-            Console.SetOut(original);
-        }
-
-        using var document = System.Text.Json.JsonDocument.Parse(output.ToString());
-        if (document.RootElement.GetProperty("type").GetString() != "capabilities" ||
-            !document.RootElement.GetProperty("capabilities").EnumerateArray().Any(item => item.GetString() == "game-dir"))
-            throw new Exception("--capabilities did not report game-dir.");
-    }
-
    private static void TestCommandLineContract()
    {
        void Rejects(string description, params string[] args)
@@ -55,10 +55,6 @@ internal static class UninstallService
            TryCleanup("remove the installed game path from the runtime configuration", quiet,
                () => RuntimeConfiguration.RemoveDvdRootIfOwned(configPath,
                    Path.Combine(installDirectory, "GameAssets", "DATA")));
-            // A game Wheel Wizard extracted is only unregistered here; the folder itself is Wheel Wizard's, and stays.
-            if (!string.IsNullOrEmpty(state?.GameDataDir))
-                TryCleanup("remove the extracted game path from the runtime configuration", quiet,
-                    () => RuntimeConfiguration.RemoveDvdRootIfOwned(configPath, state.GameDataDir));
        }

        // Remove only this install's Retro Rewind setting; leave user-owned paths untouched.
@@ -7,6 +7,7 @@
    <AssemblyName>WiiCompiled.Setup</AssemblyName>
    <RootNamespace>WiiCompiled.Setup.Windows</RootNamespace>
    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Version>0.2.27</Version>
    <Authors>patchzy</Authors>
    <Product>WiiCompiled</Product>
    <Description>Command-line installer and launcher for WiiCompiled</Description>
@@ -128,9 +128,9 @@ cp -a "$workspace/Launcher/artifacts/portable-tools/toolchain-$appimagetool_arch

 # Precompiled aurora + third-party package (see Prepare-NativePrebuilt.sh) so a user's own
 # local-build.sh never has to compile aurora itself (~43% of local build CPU time). Re-harvesting
-# recompiles the aurora/Crypto++/mbed TLS closure with the toolchain above, so this is skipped unless
+# recompiles the whole aurora/Crypto++ closure with the toolchain above, so this is skipped unless
 # --print-fingerprint-only (a fast, build-free check) says the existing package no longer matches
-# the current compiler, flags, source trees or mbed TLS pin.
+# the current compiler/flags/aurora/third_party sources.
 native_prebuilt_dir="$workspace/Launcher/artifacts/native-prebuilt-$appimagetool_arch"
 echo "Checking whether the precompiled aurora + third-party package ($appimagetool_arch) is current..."
 current_fingerprint=$(bash "$script_dir/Prepare-NativePrebuilt.sh" --arch "$appimagetool_arch" --print-fingerprint-only)
@@ -148,7 +148,6 @@ fields = {
    "flag_fingerprint": "FlagFingerprint",
    "aurora_fingerprint": "AuroraSourceFingerprint",
    "third_party_fingerprint": "ThirdPartySourceFingerprint",
-    "mbedtls_fingerprint": "MbedTlsFingerprint",
 }
 print(1 if all(provenance.get(v) == current.get(k) for k, v in fields.items()) else 0)
 PY
@@ -22,7 +22,7 @@ Usage: local-build-macos.command --output-dir DIR [options]
  --retro-rewind-package-dir DIR  RetroRewind6 directory (required for Retro Rewind)
  --retro-wfc-offline-dir DIR     Directory containing binary/payload.RMCPD00.bin
  --skip-retro-wfc-payload        Build Retro Rewind without the shared Retro-WFC payload
-  --force-clean-build             Delete local generated and current-architecture native build caches
+  --force-clean-build             Delete local generated and native-build-macos caches
  --parallel N                    Pin translation and build parallelism
  --cmake PATH --ninja PATH       Override build tools
  --dotnet PATH                   Override dotnet
@@ -56,9 +56,7 @@ while (($#)); do
 done

 [[ $(uname -s) == Darwin ]] || fail 'this build script is for macOS only'
-macos_arch=$(uname -m)
-case "$macos_arch" in arm64|x86_64) ;; *) fail "unsupported macOS architecture: $macos_arch" ;; esac
-macos_deployment_target=12.0
+[[ $(uname -m) == arm64 ]] || fail 'the current macOS product target is Apple Silicon only'
 workspace=$(cd "$workspace" && pwd)
 [[ -n "$output_dir" ]] || fail '--output-dir is required'
 case "$profile" in base|retro-rewind|both) ;; *) fail '--profile must be base, retro-rewind, or both' ;; esac
@@ -75,8 +73,7 @@ for tool in "$cmake_bin" "$ninja_bin" clang clang++ shasum; do command -v "$tool

 project="$workspace/projects/mkwii/recomp.yml"; assets="$workspace/Assets"; generated="$workspace/generated"
 functions="$generated/functions"; metadata="$generated/base_translation_output.json"; manifest_dir="$workspace/build/base"
-manifest="$manifest_dir/mkwii_base_manifest.json"; shards="$generated/build_shards"
-native_build="$workspace/native-build-macos-$macos_arch"
+manifest="$manifest_dir/mkwii_base_manifest.json"; shards="$generated/build_shards"; native_build="$workspace/native-build-macos"
 assert_file "$project" 'translation project'
 if [[ -n "$game" ]]; then "$script_dir/macos/extract-disc.command" --game "$game" --assets-dir "$assets" --nodtool "$nodtool"; fi
 assert_file "$assets/main.dol" 'extracted main.dol'; assert_file "$assets/StaticR.rel" 'extracted StaticR.rel'
@@ -134,11 +131,9 @@ if (( builds_retro )); then args+=(--resolved-profile "$mod_out/resolved_dispatc
 step emit-build-shards 'Preparing native build shards'; translator "${args[@]}"

 step configure-native 'Configuring the native toolchain'
-# Use Aurora's pinned SDL3 source on macOS.  A system SDL3 can be older than
-# Aurora's required API even when find_package() succeeds.
-"$cmake_bin" -S "$workspace/runtime" -B "$native_build" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_MAKE_PROGRAM="$ninja_bin" -DCMAKE_OSX_ARCHITECTURES="$macos_arch" -DCMAKE_OSX_DEPLOYMENT_TARGET="$macos_deployment_target" -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs" -DAURORA_SDL3_PROVIDER=vendor
+"$cmake_bin" -S "$workspace/runtime" -B "$native_build" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_MAKE_PROGRAM="$ninja_bin" -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs"
 targets=(); [[ "$profile" != retro-rewind ]] && targets+=(WiiCompiled); [[ "$profile" != base ]] && targets+=(RetroRewind)
 step compile "Compiling ${targets[*]} locally"; "$cmake_bin" --build "$native_build" --target "${targets[@]}" --parallel "$global_jobs"
-if [[ "$profile" != retro-rewind ]]; then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product WiiCompiled --output-dir "${base_output_dir:-$output_dir}" --architecture "$macos_arch" --minimum-system-version "$macos_deployment_target"; fi
-if (( builds_retro )); then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product RetroRewind --output-dir "$output_dir" --architecture "$macos_arch" --minimum-system-version "$macos_deployment_target"; fi
+if [[ "$profile" != retro-rewind ]]; then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product WiiCompiled --output-dir "${base_output_dir:-$output_dir}"; fi
+if (( builds_retro )); then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product RetroRewind --output-dir "$output_dir"; fi
 printf 'MKWCBUILD:OUTPUT=%s\n' "$output_dir"
@@ -65,7 +65,6 @@ translator_dll_override=""
 translator_bin_override=""
 fuse_ld_override=""
 native_prebuilt_dir=""
-sysroot=""

 usage() {
    cat <<'EOF'
@@ -88,8 +87,6 @@ Usage: local-build.sh --output-dir DIR [options]
  --translator-bin PATH           Self-contained Translator.Cli executable (skips building AND needs no dotnet at all)
  --native-prebuilt-dir DIR       Precompiled aurora/third-party package (see Prepare-NativePrebuilt.sh);
                                   skips compiling aurora-main from source entirely
-  --sysroot PATH                   Passed to CMake as -DCMAKE_SYSROOT: where the compiler resolves
-                                   standard headers/startup files
 EOF
 }

@@ -113,7 +110,6 @@ while [[ $# -gt 0 ]]; do
        --translator-dll) translator_dll_override=$2; shift 2 ;;
        --translator-bin) translator_bin_override=$2; shift 2 ;;
        --native-prebuilt-dir) native_prebuilt_dir=$2; shift 2 ;;
-        --sysroot) sysroot=$2; shift 2 ;;
        -h|--help) usage; exit 0 ;;
        *) fail "unknown argument: $1" ;;
    esac
@@ -190,30 +186,6 @@ assert_file "$project" "Translation project"
 assert_file "$assets/main.dol" "Extracted main.dol (see translator/README.md - owning the game is required)"
 assert_file "$assets/StaticR.rel" "Extracted StaticR.rel (see translator/README.md - owning the game is required)"

-# The AppImage bundles Clang, but Linux startup objects and the C/C++ link runtimes
-# still come from the host. Check them before the expensive translation so a missing
-# development package produces a useful error instead of CMake's generic exit 1.
-link_probe_dir=$(mktemp -d)
-link_probe_flags=()
-[[ -z "$sysroot" ]] || link_probe_flags+=(--sysroot="$sysroot")
-[[ -z "$fuse_ld_override" ]] || link_probe_flags+=(-fuse-ld="$fuse_ld_override")
-printf 'int main(void) { return 0; }\n' > "$link_probe_dir/probe.c"
-cat > "$link_probe_dir/probe.cpp" <<'EOF'
-#include <vector>
-int main() { std::vector<int> values{1}; return values.front() - 1; }
-EOF
-if ! "$cc_bin" "${link_probe_flags[@]}" "$link_probe_dir/probe.c" -o "$link_probe_dir/probe-c" > "$link_probe_dir/error" 2>&1; then
-    cat "$link_probe_dir/error" >&2
-    rm -rf "$link_probe_dir"
-    fail "The C compiler cannot link a test program. Linux needs C development files (glibc startup objects and a compiler runtime) in addition to bundled Clang. Install your distribution's development packages, or on SteamOS run WiiCompiled through the Wheel Wizard Flatpak."
-fi
-if ! "$cxx_bin" "${link_probe_flags[@]}" "$link_probe_dir/probe.cpp" -o "$link_probe_dir/probe-cxx" > "$link_probe_dir/error" 2>&1; then
-    cat "$link_probe_dir/error" >&2
-    rm -rf "$link_probe_dir"
-    fail "The C++ compiler cannot link a test program. Install your distribution's C++ development packages, or on SteamOS run WiiCompiled through the Wheel Wizard Flatpak."
-fi
-rm -rf "$link_probe_dir"
-
 # Literal line matching against the manifest's fixed shape, not a YAML dependency - the same
 # approach NativeBuildFlags.ps1's Get-MkwProjectPins uses on Windows, kept here only for the one
 # field this script actually needs from the manifest.
@@ -442,14 +414,6 @@ fi
 if [[ -n "$native_prebuilt_dir" ]]; then
    configure_args+=(-DMKW_NATIVE_PREBUILT_DIR="$native_prebuilt_dir")
 fi
-if [[ -n "$sysroot" ]]; then
-    configure_args+=(-DCMAKE_SYSROOT="$sysroot")
-else
-    # Explicitly clear any cached CMAKE_SYSROOT from a prior configure so an
-    # incremental build that transitions from one sysroot to none does not
-    # silently keep the stale cached path.
-    configure_args+=(-UCMAKE_SYSROOT)
-fi

 log_step configure-native "Configuring the native toolchain"
 "$cmake_bin" "${configure_args[@]}"
@@ -481,9 +445,7 @@ publish_built_product() {
    local exe=$build/$target
    assert_file "$exe" "Locally compiled game executable"
    cp -f "$exe" "$destination/$target"
-    # cacert.pem is the TLS root bundle the mbed TLS path looks up beside the executable
-    # (runtime/src/hle/net/network_ssl.cpp); without it HTTPS fails at runtime.
-    for name in dsp_coef.bin initial_pipeline_cache.db cacert.pem; do
+    for name in dsp_coef.bin initial_pipeline_cache.db; do
        [[ -f "$build/$name" ]] && cp -f "$build/$name" "$destination/"
    done
    [[ -d "$build/wii_bootstrap" ]] && cp -rf "$build/wii_bootstrap" "$destination/"
@@ -9,97 +9,45 @@ fail() { printf 'build-setup-pkg.command: error: %s\n' "$*" >&2; exit 1; }
 copy_clean() { DITTONORSRC=1 ditto --norsrc --noqtn "$@"; }
 usage() {
    cat <<'EOF'
-Usage: build-setup-pkg.command --nodtool-arm64 PATH --nodtool-x86_64 PATH --translator-arm64 PATH --translator-x86_64 PATH --cmake-root DIR --ninja-arm64 PATH --ninja-x86_64 PATH --output PKG [options]
+Usage: build-setup-pkg.command --nodtool PATH --translator PATH --cmake-root DIR --ninja PATH --output PKG [options]

 Creates a game-code-free WiiCompiled Setup.pkg. The supplied tools must be
-maintainer-verified, redistributable macOS artifacts for both arm64 and
-x86_64. The setup package selects native tools for its host while the game is
-compiled locally for that host architecture. CMake must be universal2. The
-resulting pkg is unsigned unless
--installer-identity is supplied; releases should sign and notarize it with a
-Developer ID Installer certificate.
+maintainer-verified, redistributable macOS arm64 artifacts. The resulting pkg
+is unsigned unless --installer-identity is supplied; releases should sign and
+notarize it with a Developer ID Installer certificate.

  --workspace DIR             Repository root (default: script's grandparent)
-  --version VERSION           Bundle/package version (default: project version, or 0.1.0)
+  --version VERSION           Bundle/package version (default: 0.1.0)
  --installer-identity NAME   Developer ID Installer identity for productbuild
 EOF
 }

 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-workspace=$(cd "$script_dir/../.." && pwd); nodtool_arm64=""; nodtool_x86_64=""; translator_arm64=""; translator_x86_64=""; cmake_root=""; ninja_arm64=""; ninja_x86_64=""; output=""; version=0.1.0; identity=""
-version_supplied=false
+workspace=$(cd "$script_dir/../.." && pwd); nodtool=""; translator=""; cmake_root=""; ninja=""; output=""; version=0.1.0; identity=""
 while (($#)); do
    case "$1" in
        --workspace) workspace=${2:-}; shift 2 ;;
-        --nodtool-arm64) nodtool_arm64=${2:-}; shift 2 ;;
-        --nodtool-x86_64) nodtool_x86_64=${2:-}; shift 2 ;;
-        --translator-arm64) translator_arm64=${2:-}; shift 2 ;;
-        --translator-x86_64) translator_x86_64=${2:-}; shift 2 ;;
+        --nodtool) nodtool=${2:-}; shift 2 ;;
+        --translator) translator=${2:-}; shift 2 ;;
        --cmake-root) cmake_root=${2:-}; shift 2 ;;
-        --ninja-arm64) ninja_arm64=${2:-}; shift 2 ;;
-        --ninja-x86_64) ninja_x86_64=${2:-}; shift 2 ;;
+        --ninja) ninja=${2:-}; shift 2 ;;
        --output) output=${2:-}; shift 2 ;;
-        --version) version=${2:-}; version_supplied=true; shift 2 ;;
+        --version) version=${2:-}; shift 2 ;;
        --installer-identity) identity=${2:-}; shift 2 ;;
        -h|--help) usage; exit 0 ;;
        *) fail "unknown option: $1" ;;
    esac
 done
 version=${version#v}
-if [[ "$version_supplied" == false ]]; then
-    local_csproj="$workspace/Launcher/Directory.Build.props"
-    if [[ -f "$local_csproj" ]]; then
-        detected=$(grep -m1 '<Version>' "$local_csproj" | sed -E 's/.*<Version>([^<]+)<\/Version>.*/\1/' || true)
-        if [[ -n "$detected" ]]; then
-            version="$detected"
-        fi
-    fi
-fi
 [[ "$version" =~ ^[0-9]+(\.[0-9]+){0,2}$ ]] || fail '--version must contain one to three period-separated integers'
 IFS=. read -r version_major version_minor version_patch <<< "$version"
 short_version="$version_major.${version_minor:-0}.${version_patch:-0}"
-for tool in pkgbuild productbuild ditto codesign lipo; do command -v "$tool" >/dev/null || fail "required macOS tool unavailable: $tool"; done
-for tool_path in "$nodtool_arm64" "$nodtool_x86_64" "$translator_arm64" "$translator_x86_64" "$ninja_arm64" "$ninja_x86_64"; do [[ -x "$tool_path" ]] || fail 'each architecture-specific tool must name an executable'; done
+for tool in pkgbuild productbuild ditto codesign; do command -v "$tool" >/dev/null || fail "required macOS tool unavailable: $tool"; done
+[[ -x "$nodtool" ]] || fail '--nodtool must name an executable'
+[[ -x "$translator" ]] || fail '--translator must name an executable'
 [[ -x "$cmake_root/bin/cmake" ]] || fail '--cmake-root must contain bin/cmake'
-require_arch() {
-    local artifact=$1 arch=$2 label=$3
-    lipo "$artifact" -verify_arch "$arch" >/dev/null 2>&1 || fail "$label must contain a $arch slice: $artifact"
-}
-require_arch "$nodtool_arm64" arm64 '--nodtool-arm64'; require_arch "$nodtool_x86_64" x86_64 '--nodtool-x86_64'
-require_arch "$translator_arm64" arm64 '--translator-arm64'; require_arch "$translator_x86_64" x86_64 '--translator-x86_64'
-require_arch "$ninja_arm64" arm64 '--ninja-arm64'; require_arch "$ninja_x86_64" x86_64 '--ninja-x86_64'
-lipo "$cmake_root/bin/cmake" -verify_arch arm64 x86_64 >/dev/null 2>&1 || fail '--cmake-root/bin/cmake must be universal2'
-
-# Slice checks above prevent accidental cross-architecture packaging. Exercise
-# each supplied executable as well: an incorrectly bundled runtime can have a
-# valid Mach-O header but still fail before the setup app can use it. Apple
-# Silicon maintainers validate Intel tools through Rosetta when it is present.
-host_arch=$(uname -m)
-run_for_arch() {
-    local arch=$1 label=$2
-    shift 2
-    if [[ "$arch" == "$host_arch" ]]; then
-        "$@" >/dev/null || fail "$label did not run successfully"
-    elif [[ "$host_arch" == arm64 && "$arch" == x86_64 ]] && /usr/bin/arch -x86_64 /usr/bin/true >/dev/null 2>&1; then
-        /usr/bin/arch -x86_64 "$@" >/dev/null || fail "$label did not run successfully under Rosetta"
-    else
-        # Intel hosts cannot execute arm64 binaries. The slice remains checked
-        # above; CI or an Apple Silicon maintainer must execute that tool set.
-        printf 'build-setup-pkg.command: warning: unable to execute %s on %s; architecture slice was verified, but run it in %s CI before release\n' \
-            "$label" "$host_arch" "$arch" >&2
-    fi
-}
-for arch in arm64 x86_64; do
-    if [[ "$arch" == arm64 ]]; then
-        nodtool=$nodtool_arm64; translator=$translator_arm64; ninja=$ninja_arm64
-    else
-        nodtool=$nodtool_x86_64; translator=$translator_x86_64; ninja=$ninja_x86_64
-    fi
-    run_for_arch "$arch" "--nodtool-$arch" "$nodtool" --version
-    run_for_arch "$arch" "--translator-$arch" "$translator" --help
-    run_for_arch "$arch" "--ninja-$arch" "$ninja" --version
-done
-run_for_arch "$host_arch" '--cmake-root/bin/cmake' "$cmake_root/bin/cmake" --version
+[[ -x "$ninja" ]] || fail '--ninja must name an executable'
+"$nodtool" --version >/dev/null || fail '--nodtool did not run successfully'
 workspace=$(cd "$workspace" && pwd); output=$(cd "$(dirname "$output")" && pwd)/$(basename "$output")
 stage=$(mktemp -d "${TMPDIR:-/tmp}/wiicompiled-pkg.XXXXXX")
 trap 'rm -rf "$stage"' EXIT
@@ -116,7 +64,7 @@ cat > "$app/Contents/Info.plist" <<EOF
 <key>CFBundlePackageType</key><string>APPL</string>
 <key>CFBundleShortVersionString</key><string>$short_version</string>
 <key>CFBundleVersion</key><string>$version</string>
-<key>LSMinimumSystemVersion</key><string>12.0</string>
+<key>LSMinimumSystemVersion</key><string>14.0</string>
 </dict></plist>
 EOF
 cat > "$app/Contents/MacOS/WiiCompiledSetup" <<'EOF'
@@ -155,17 +103,11 @@ copy_clean "$workspace/Launcher/local-build-macos.command" "$resources/workspace
 copy_clean "$workspace/Launcher/macos/extract-disc.command" "$resources/workspace/Launcher/macos/extract-disc.command"
 copy_clean "$workspace/Launcher/macos/publish-app.command" "$resources/workspace/Launcher/macos/publish-app.command"
 chmod +x "$resources/workspace/Launcher/local-build-macos.command" "$resources/workspace/Launcher/macos/"*.command
-# setup.command uses this marker to update source inputs in an existing user
-# workspace without replacing extracted game assets or Retro Rewind files.
-printf '%s\n' "$version" > "$resources/workspace/.bundle-version"
-mkdir -p "$resources/tools/cmake" "$resources/tools/arm64" "$resources/tools/x86_64"
-copy_clean "$nodtool_arm64" "$resources/tools/arm64/nodtool"; chmod +x "$resources/tools/arm64/nodtool"
-copy_clean "$nodtool_x86_64" "$resources/tools/x86_64/nodtool"; chmod +x "$resources/tools/x86_64/nodtool"
-copy_clean "$translator_arm64" "$resources/tools/arm64/Translator.Cli"; chmod +x "$resources/tools/arm64/Translator.Cli"
-copy_clean "$translator_x86_64" "$resources/tools/x86_64/Translator.Cli"; chmod +x "$resources/tools/x86_64/Translator.Cli"
+mkdir -p "$resources/tools/cmake"
+copy_clean "$nodtool" "$resources/tools/nodtool"; chmod +x "$resources/tools/nodtool"
+copy_clean "$translator" "$resources/tools/Translator.Cli"; chmod +x "$resources/tools/Translator.Cli"
 copy_clean "$cmake_root" "$resources/tools/cmake"
-copy_clean "$ninja_arm64" "$resources/tools/arm64/ninja"; chmod +x "$resources/tools/arm64/ninja"
-copy_clean "$ninja_x86_64" "$resources/tools/x86_64/ninja"; chmod +x "$resources/tools/x86_64/ninja"
+copy_clean "$ninja" "$resources/tools/ninja"; chmod +x "$resources/tools/ninja"
 copy_clean "$workspace/LICENSE" "$resources/LICENSE"
 copy_clean "$workspace/THIRD-PARTY-NOTICES.md" "$resources/THIRD-PARTY-NOTICES.md"
 codesign --force --deep --sign - "$app"
@@ -1,11 +0,0 @@
-# Cross-compile a thin x86_64 macOS build from an Apple Silicon Mac.
-# Pass this file on the first configure with:
-#   -DCMAKE_TOOLCHAIN_FILE=/absolute/path/to/macos-x86_64-toolchain.cmake
-#
-# CMAKE_SYSTEM_PROCESSOR is deliberately declared here rather than inferred
-# from CMAKE_OSX_ARCHITECTURES, so target-aware CMake dependencies select their
-# x86_64 artifacts.
-set(CMAKE_SYSTEM_NAME Darwin)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
-    "Target macOS architectures" FORCE)
@@ -5,37 +5,29 @@ set -euo pipefail
 fail() { printf 'publish-app.command: error: %s\n' "$*" >&2; exit 1; }
 usage() {
    cat <<'EOF'
-Usage: publish-app.command --build-dir DIR --product {WiiCompiled|RetroRewind} --output-dir DIR [options]
+Usage: publish-app.command --build-dir DIR --product {WiiCompiled|RetroRewind} --output-dir DIR

 Copies a locally built product and its runtime assets into OUTPUT-DIR/<product>.app.
 It bundles non-system dylibs, rewrites their install names, and ad-hoc signs the
 result. This is suitable for local use; a release must replace ad-hoc signing
 with the project's Developer ID signing and notarization process.
-
-  --architecture {arm64|x86_64}       Required architecture of the compiled product (default: host)
-  --minimum-system-version VERSION    App bundle minimum macOS version (default: 12.0)
 EOF
 }

-build_dir=""; product=""; output_dir=""; architecture=$(uname -m); minimum_system_version=12.0
+build_dir=""; product=""; output_dir=""
 while (($#)); do
    case "$1" in
        --build-dir) build_dir=${2:-}; shift 2 ;;
        --product) product=${2:-}; shift 2 ;;
        --output-dir) output_dir=${2:-}; shift 2 ;;
-        --architecture) architecture=${2:-}; shift 2 ;;
-        --minimum-system-version) minimum_system_version=${2:-}; shift 2 ;;
        -h|--help) usage; exit 0 ;;
        *) fail "unknown option: $1" ;;
    esac
 done
 [[ "$product" == WiiCompiled || "$product" == RetroRewind ]] || fail '--product must be WiiCompiled or RetroRewind'
-[[ "$architecture" == arm64 || "$architecture" == x86_64 ]] || fail '--architecture must be arm64 or x86_64'
-[[ "$minimum_system_version" =~ ^[0-9]+(\.[0-9]+){1,2}$ ]] || fail '--minimum-system-version must contain two or three period-separated integers'
-for tool in codesign ditto install_name_tool lipo otool; do command -v "$tool" >/dev/null || fail "required macOS tool is unavailable: $tool"; done
+for tool in codesign ditto install_name_tool otool; do command -v "$tool" >/dev/null || fail "required macOS tool is unavailable: $tool"; done
 [[ -x "$build_dir/$product" ]] || fail "missing compiled product: $build_dir/$product"
-lipo "$build_dir/$product" -verify_arch "$architecture" || fail "compiled product is not $architecture: $build_dir/$product"
-for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem wii_bootstrap; do [[ -e "$build_dir/$asset" ]] || fail "missing runtime asset: $build_dir/$asset"; done
+for asset in dsp_coef.bin initial_pipeline_cache.db wii_bootstrap; do [[ -e "$build_dir/$asset" ]] || fail "missing runtime asset: $build_dir/$asset"; done

 app="$output_dir/$product.app"
 macos="$app/Contents/MacOS"
@@ -55,106 +47,35 @@ cat > "$app/Contents/Info.plist" <<EOF
  <key>CFBundlePackageType</key><string>APPL</string>
  <key>CFBundleShortVersionString</key><string>0.1.0</string>
  <key>CFBundleVersion</key><string>1</string>
-  <key>LSMinimumSystemVersion</key><string>$minimum_system_version</string>
+  <key>LSMinimumSystemVersion</key><string>14.0</string>
  <key>NSHighResolutionCapable</key><true/>
 </dict></plist>
 EOF
 ditto "$build_dir/$product" "$macos/$product"
-for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem wii_bootstrap; do
+for asset in dsp_coef.bin initial_pipeline_cache.db wii_bootstrap; do
    ditto "$build_dir/$asset" "$resources/$asset"
    ln -s "../Resources/$asset" "$macos/$asset"
 done

-# Expand each image's rpaths before inheriting them, so @loader_path stays
-# relative to the image that declared it rather than a descendant library.
-expanded_rpaths() {
-    local target=$1 rpath
-    while IFS= read -r rpath; do
-        case "$rpath" in
-            @loader_path/*) rpath="$(dirname "$target")/${rpath#@loader_path/}" ;;
-            @loader_path) rpath="$(dirname "$target")" ;;
-            @executable_path/*) rpath="$build_dir/${rpath#@executable_path/}" ;;
-            @executable_path) rpath="$build_dir" ;;
-        esac
-        printf '%s\n' "$rpath"
-    done < <(otool -l "$target" | awk '
-/LC_RPATH/ { rpath = 1; next }
-rpath && /^[[:space:]]*path / {
-    sub(/^[[:space:]]*path[[:space:]]+/, "");
-    sub(/[[:space:]]+\(offset[[:space:]]+[0-9]+\)$/, "");
-    print;
-    rpath = 0;
-}')
-}
-
-# Resolve a non-system dependency using the current image's rpaths followed
-# by the inherited loader stack, matching dyld's dependency-chain search.
-dependency_path() {
-    local current=$1 dependency=$2 search_rpaths=$3 rpath candidate
-    case "$dependency" in
-        /System/Library/*|/usr/lib/*)
-            return 1
-            ;;
-        /*)
-            [[ -f "$dependency" ]] && { printf '%s\n' "$dependency"; return 0; }
-            ;;
-        @loader_path/*)
-            candidate="$(dirname "$current")/${dependency#@loader_path/}"
-            [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
-            ;;
-        @executable_path/*)
-            candidate="$build_dir/${dependency#@executable_path/}"
-            [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
-            ;;
-        @rpath/*|*.dylib)
-            local subpath
-            if [[ "$dependency" == @rpath/* ]]; then
-                subpath="${dependency#@rpath/}"
-            else
-                subpath="$dependency"
-            fi
-            while IFS= read -r rpath; do
-                [[ -n "$rpath" ]] || continue
-                candidate="$rpath/$subpath"
-                [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
-            done <<< "$search_rpaths"
-            ;;
-    esac
-    return 1
-}
-
-# Build a closure of non-system dylibs. System libraries remain system
-# references, while every resolved dependency is copied beside the executable.
-queue=("$build_dir/$product")
-queue_rpaths=("")
+# Build a closure of Homebrew dylibs. System libraries remain system references.
+queue=("$macos/$product")
 while ((${#queue[@]})); do
    current=${queue[0]}
-    inherited_rpaths=${queue_rpaths[0]}
    queue=("${queue[@]:1}")
-    queue_rpaths=("${queue_rpaths[@]:1}")
-    current_rpaths=$(expanded_rpaths "$current")
-    if [[ -n "$inherited_rpaths" ]]; then
-        current_rpaths="${current_rpaths}${current_rpaths:+$'\n'}$inherited_rpaths"
-    fi
-    self_id=$(otool -D "$current" 2>/dev/null | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]*$/\1/p' || true)
    while IFS= read -r dependency; do
-        [[ -z "$dependency" ]] && continue
-        [[ -n "$self_id" && "$dependency" == "$self_id" ]] && continue
-        case "$dependency" in
-            /System/Library/*|/usr/lib/*) continue ;;
-        esac
-        dep_path=$(dependency_path "$current" "$dependency" "$current_rpaths") || fail "unresolved non-system dependency: '$dependency' needed by '$current'"
-        name=$(basename "$dep_path")
+        [[ "$dependency" == /opt/homebrew/* || "$dependency" == /usr/local/* ]] || continue
+        [[ -f "$dependency" ]] || continue
+        name=$(basename "$dependency")
        if [[ ! -f "$frameworks/$name" ]]; then
-            ditto "$dep_path" "$frameworks/$name"
+            ditto "$dependency" "$frameworks/$name"
            install_name_tool -id "@rpath/$name" "$frameworks/$name"
-            queue+=("$dep_path")
-            queue_rpaths+=("$current_rpaths")
+            queue+=("$frameworks/$name")
        fi
-    done < <(otool -L "$current" | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]+\(compatibility version .*/\1/p')
+    done < <(otool -L "$current" | tail -n +2 | awk '{print $1}')
 done
 while IFS= read -r binary; do
    while IFS= read -r old; do
+        [[ "$old" == /opt/homebrew/* || "$old" == /usr/local/* ]] || continue
        name=$(basename "$old")
        [[ -f "$frameworks/$name" ]] || continue
        if [[ "$binary" == "$macos/$product" ]]; then
@@ -162,7 +83,7 @@ while IFS= read -r binary; do
        else
            install_name_tool -change "$old" "@loader_path/$name" "$binary"
        fi
-    done < <(otool -L "$binary" | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]+\(compatibility version .*/\1/p')
+    done < <(otool -L "$binary" | tail -n +2 | awk '{print $1}')
 done < <(find "$frameworks" -type f -print; printf '%s\n' "$macos/$product")

 find "$frameworks" -type f -exec codesign --force --sign - {} +
@@ -5,7 +5,10 @@ set -euo pipefail

 resources=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 workspace_source="$resources/workspace"
+nodtool="$resources/tools/nodtool"
+translator="$resources/tools/Translator.Cli"
 cmake_bin="$resources/tools/cmake/bin/cmake"
+ninja_bin="$resources/tools/ninja"
 support_root="$HOME/Library/Application Support/WiiCompiled"
 workspace="$support_root/BuildWorkspace"
 products="$support_root/Products"
@@ -33,13 +36,6 @@ while (($#)); do
 done
 [[ "$install_location" == user || "$install_location" == applications ]] || fail '--install-location must be user or applications'

-host_arch=$(uname -m)
-case "$host_arch" in arm64|x86_64) ;; *) fail "unsupported macOS architecture: $host_arch" ;; esac
-host_tools="$resources/tools/$host_arch"
-nodtool="$host_tools/nodtool"
-translator="$host_tools/Translator.Cli"
-ninja_bin="$host_tools/ninja"
-
 if [[ -z "$game" ]]; then
    game=$(/usr/bin/osascript <<'APPLESCRIPT'
 set selectedFile to choose file with prompt "Choose your clean Mario Kart Wii PAL (RMCP01) disc image"
@@ -64,37 +60,12 @@ if ! /usr/bin/xcode-select -p >/dev/null 2>&1; then
    /usr/bin/xcode-select --install || true
    exit 1
 fi
-for tool in "$nodtool" "$translator" "$cmake_bin" "$ninja_bin"; do
-    /usr/bin/lipo "$tool" -verify_arch "$host_arch" >/dev/null 2>&1 || \
-        fail "the packaged $(basename "$tool") does not support $host_arch"
-done

 mkdir -p "$support_root" "$products"
-source_bundle_version="$workspace_source/.bundle-version"
-workspace_bundle_version="$workspace/.bundle-version"
-needs_workspace_refresh=0
-if [[ ! -f "$workspace/projects/mkwii/recomp.yml" ]]; then
-    needs_workspace_refresh=1
-elif [[ -f "$source_bundle_version" ]] && [[ ! -f "$workspace_bundle_version" || "$(<"$source_bundle_version")" != "$(<"$workspace_bundle_version")" ]]; then
-    needs_workspace_refresh=1
-fi
-
-if (( needs_workspace_refresh )); then
+if [[ ! -d "$workspace/.git" && ! -f "$workspace/projects/mkwii/recomp.yml" ]]; then
    printf 'Preparing the local build workspace...\n'
-    if [[ ! -d "$workspace" ]]; then
-        /usr/bin/ditto "$workspace_source" "$workspace"
-    else
-        # Refresh only packaged source inputs. Assets and the staged Retro
-        # Rewind package belong to the user and stay in place.
-        for source in aurora-main projects runtime translator Launcher; do
-            rm -rf "$workspace/$source"
-            /usr/bin/ditto "$workspace_source/$source" "$workspace/$source"
-        done
-        /usr/bin/ditto "$source_bundle_version" "$workspace_bundle_version"
-        # A dependency provider can be cached in this directory, so make the
-        # refreshed sources configure from a clean native build tree.
-        rm -rf "$workspace/native-build-macos-arm64" "$workspace/native-build-macos-x86_64"
-    fi
+    rm -rf "$workspace"
+    /usr/bin/ditto "$workspace_source" "$workspace"
 fi

 profile=base
@@ -106,40 +77,26 @@ if [[ -n "$retro_dir" ]]; then
    # verify its pinned signature before publishing it into the local cache.
    retro_wfc_dir="$support_root/RetroWfcPayload"
    retro_wfc_payload="$retro_wfc_dir/binary/payload.RMCPD00.bin"
-    cached_payload_valid=0
-    if [[ -f "$retro_wfc_payload" ]]; then
-        if "$translator" validate-retro-wfc-payload --directory "$retro_wfc_dir"; then
-            cached_payload_valid=1
-        else
-            printf 'Discarding an invalid cached Retro-WFC payload...\n' >&2
-            rm -f "$retro_wfc_payload"
-        fi
+    if [[ -f "$retro_wfc_payload" ]] && ! "$translator" validate-retro-wfc-payload --directory "$retro_wfc_dir"; then
+        printf 'Discarding an invalid cached Retro-WFC payload...\n' >&2
+        rm -f "$retro_wfc_payload"
    fi
-
-    # A signed cache may still be an older vulnerable revision, so always attempt to replace it
-    # with the current signed snapshot. A transport failure may fall back to the verified cache;
-    # a downloaded snapshot with an invalid signature remains a hard failure.
-    printf 'Downloading the current Retro-WFC payload needed for online play...\n'
-    mkdir -p "$retro_wfc_dir"
-    payload_stage=$(mktemp -d "$retro_wfc_dir/.payload-download.XXXXXX")
-    temporary_payload="$payload_stage/binary/payload.RMCPD00.bin"
-    mkdir -p "$(dirname "$temporary_payload")"
-    trap 'rm -rf "$payload_stage"' EXIT
-    if /usr/bin/curl --fail --silent --show-error --connect-timeout 10 --max-time 30 \
-        --retry 1 --output "$temporary_payload" \
-        'https://rwfc.net/api/wfc/payload?g=RMCPD00'; then
+    if [[ ! -f "$retro_wfc_payload" ]]; then
+        printf 'Downloading the Retro-WFC payload needed for online play...\n'
+        mkdir -p "$retro_wfc_dir"
+        payload_stage=$(mktemp -d "$retro_wfc_dir/.payload-download.XXXXXX")
+        temporary_payload="$payload_stage/binary/payload.RMCPD00.bin"
+        mkdir -p "$(dirname "$temporary_payload")"
+        trap 'rm -rf "$payload_stage"' EXIT
+        /usr/bin/curl --fail --silent --show-error --connect-timeout 10 --max-time 30 \
+            --retry 1 --output "$temporary_payload" \
+            'http://nas.play.rwfc.net/payload?g=RMCPD00' || fail 'could not download the Retro-WFC payload needed for online play'
        "$translator" validate-retro-wfc-payload --directory "$payload_stage" || \
            fail 'downloaded Retro-WFC payload failed signature validation'
        mkdir -p "$retro_wfc_dir/binary"
        mv "$temporary_payload" "$retro_wfc_payload"
        rmdir "$payload_stage/binary" "$payload_stage"
        trap - EXIT
-    elif (( cached_payload_valid )); then
-        printf 'Could not download the current Retro-WFC payload; using the previously verified cached payload.\n' >&2
-        rm -rf "$payload_stage"
-        trap - EXIT
-    else
-        fail 'could not download the current Retro-WFC payload and no valid cached payload is available'
    fi
    build_args+=(--profile both --base-output-dir "$products" --retro-rewind-package-dir "$retro_dir" --retro-wfc-offline-dir "$retro_wfc_dir")
 fi
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-# Exercise a real dyld dependency chain before and after app packaging.
-set -euo pipefail
-
-[[ $(uname -s) == Darwin ]] || { printf 'This test requires macOS.\n' >&2; exit 1; }
-script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-temp_root=$(cd "${TMPDIR:-/tmp}" && pwd)
-test_root=$(mktemp -d "$temp_root/wiicompiled-publish-test.XXXXXX")
-[[ "$test_root" == "$temp_root"/wiicompiled-publish-test.* ]] || exit 1
-trap 'rm -rf "$test_root"' EXIT
-
-build_dir="$test_root/build with spaces"
-output_dir="$test_root/output with spaces"
-mkdir -p "$build_dir/A/b" "$build_dir/A/c" "$build_dir/wii_bootstrap" "$output_dir"
-cat > "$test_root/c.c" <<'EOF'
-int value_c(void) { return 7; }
-EOF
-cat > "$test_root/b.c" <<'EOF'
-extern int value_c(void);
-int value_b(void) { return 2 * value_c(); }
-EOF
-cat > "$test_root/a.c" <<'EOF'
-extern int value_b(void);
-int value_a(void) { return 1 + value_b(); }
-EOF
-cat > "$test_root/main.c" <<'EOF'
-#include <stdio.h>
-extern int value_a(void);
-int main(void) { printf("%d\n", value_a()); return 0; }
-EOF
-
-clang -dynamiclib "$test_root/c.c" -o "$build_dir/A/c/libC.dylib" \
-    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libC.dylib
-clang -dynamiclib "$test_root/b.c" -o "$build_dir/A/b/libB.dylib" \
-    -L "$build_dir/A/c" -lC \
-    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libB.dylib
-clang -dynamiclib "$test_root/a.c" -o "$build_dir/A/libA.dylib" \
-    -L "$build_dir/A/b" -lB \
-    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libA.dylib \
-    -Wl,-rpath,@loader_path/b -Wl,-rpath,@loader_path/c
-clang "$test_root/main.c" -o "$build_dir/WiiCompiled" \
-    -L "$build_dir/A" -lA \
-    -Wl,-headerpad_max_install_names -Wl,-rpath,@executable_path/A
-
-# B has no rpaths: its C dependency must inherit A's loader-relative path.
-[[ $("$build_dir/WiiCompiled") == 15 ]]
-for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem; do
-    : > "$build_dir/$asset"
-done
-bash "$script_dir/publish-app.command" --build-dir "$build_dir" \
-    --product WiiCompiled --output-dir "$output_dir" --architecture "$(uname -m)"
-for name in libA.dylib libB.dylib libC.dylib; do
-    [[ -f "$output_dir/WiiCompiled.app/Contents/Frameworks/$name" ]]
-done
-
-# Remove access to the original paths and relocate the app before executing.
-mv "$build_dir" "$test_root/hidden build"
-mkdir "$test_root/relocated app"
-mv "$output_dir/WiiCompiled.app" "$test_root/relocated app/WiiCompiled.app"
-[[ $("$test_root/relocated app/WiiCompiled.app/Contents/MacOS/WiiCompiled") == 15 ]]
-printf 'publish-app dependency-chain test passed\n'
@@ -25,7 +25,7 @@ set -euo pipefail
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 workspace=$(cd "$script_dir/.." && pwd)

-llvm_version=22.1.8
+llvm_version=23.1.0
 cmake_version=4.3.3
 ninja_version=1.13.2
 destination="$script_dir/artifacts/portable-tools"
@@ -52,13 +52,13 @@ done

 case "$arch" in
    x86_64) llvm_release_arch=X64; target_triple=x86_64-unknown-linux-gnu
-            llvm_release_sha256=fccecb1906e7ddf5ec040aec5b646b650e2daaafa4423b41341c4717db5bdec0
+            llvm_release_sha256=18da30f77f475688a18f7704d23f9f155ae007ed9922dbed6850a9419d9fec8c
            cmake_release_arch=x86_64
            cmake_sha256=927b2368a946c37269c3a66225ab00544e756459cdd0b5d0da438694fb9ff802
            ninja_asset=ninja-linux.zip
            ninja_sha256=5749cbc4e668273514150a80e387a957f933c6ed3f5f11e03fb30955e2bbead6 ;;
    aarch64) llvm_release_arch=ARM64; target_triple=aarch64-unknown-linux-gnu
-            llvm_release_sha256=d431eff9f064c86ee7c4c94af570a8f74fcccd1f74c6f0da3af32ce34a1e1b05
+            llvm_release_sha256=cfb31bfc713ef453248bf5bd026312f838ad6c52c25623e987cb6a340f3050d4
            cmake_release_arch=aarch64
            cmake_sha256=9ea38356dbd3e32e51029a3e09a0f2f8e117ef4fbcaad7a21ffb36409bbd5cb4
            ninja_asset=ninja-linux-aarch64.zip
@@ -101,14 +101,11 @@ rm -rf "$work"
 mkdir -p "$work/bin" "$work/lib/$target_triple" "$work/include/$target_triple/c++/v1"

 # --- clang/lld/llvm-ar, pruned from the official LLVM release ---
-# built from PR https://github.com/llvm/llvm-project/pull/222821 on official LLVM Github Actions Runner
-# only switch to an official stable LLVM release again once:
-# - this PR has merged https://github.com/llvm/llvm-project/pull/221365 and been backported to LLVM stable branch
-# - this bug has been fixed with a workaround in the Wiicompiled translator https://github.com/patchzyy/Wiicompiled/issues/208 or in LLVM and been backported to LLVM stable branch
-llvm_archive_name="LLVM-PR222821-5ae1c7c43a11b4cdc5ce4dd483c28357bab7dae2-Linux-$llvm_release_arch.tar.xz"
+
+llvm_archive_name="LLVM-$llvm_version-Linux-$llvm_release_arch.tar.xz"
 llvm_archive="$downloads/$llvm_archive_name"
 download_verified "$llvm_archive" \
-    "https://github.com/theofficialgman/llvm-project/releases/download/llvmorg-22.1.8-patched/$llvm_archive_name" \
+    "https://github.com/llvm/llvm-project/releases/download/llvmorg-$llvm_version/$llvm_archive_name" \
    "$llvm_release_sha256"

 extract_root="$script_dir/artifacts/.extract-clang-$arch"
@@ -116,16 +113,16 @@ rm -rf "$extract_root"
 mkdir -p "$extract_root"
 echo "prepare-portable-tools.sh: extracting $llvm_archive_name (this is the full ~1.9 GiB release; only a fraction is kept)..."
 tar -xf "$llvm_archive" -C "$extract_root"
-src="$extract_root/${llvm_archive_name%.tar.xz}"
+src="$extract_root/LLVM-$llvm_version-Linux-$llvm_release_arch"
 [[ -d "$src" ]] || { echo "prepare-portable-tools.sh: unexpected archive layout, expected $src" >&2; exit 1; }

 echo "prepare-portable-tools.sh: pruning to the minimal compile+link toolchain..."

 # clang: the real driver executable plus the clang/clang++ symlinks CMake/local-build.sh invoke.
 # Stripped: debug symbols are dead weight for a bundled compiler nobody will debug.
-cp -a "$src/bin/clang-22" "$work/bin/"
-strip "$work/bin/clang-22"
-ln -s clang-22 "$work/bin/clang"
+cp -a "$src/bin/clang-23" "$work/bin/"
+strip "$work/bin/clang-23"
+ln -s clang-23 "$work/bin/clang"
 ln -s clang "$work/bin/clang++"

 # lld: linked via -fuse-ld=lld, which clang resolves by looking for ld.lld next to itself first -
@@ -168,8 +165,7 @@ rm -rf "$cmake_extract_root"
 mkdir -p "$cmake_extract_root"
 echo "prepare-portable-tools.sh: extracting $cmake_archive_name..."
 tar -xzf "$cmake_archive" -C "$cmake_extract_root"
-
-cmake_src="$cmake_extract_root/${cmake_archive_name%.tar.gz}"
+cmake_src="$cmake_extract_root/cmake-$cmake_version-linux-$cmake_release_arch"
 [[ -d "$cmake_src" ]] || { echo "prepare-portable-tools.sh: unexpected archive layout, expected $cmake_src" >&2; exit 1; }

 mkdir -p "$work/share/cmake-$cmake_share_version"
@@ -205,10 +201,10 @@ Ninja $ninja_version
  Apache License 2.0
 EOF

-echo "prepare-portable-tools.sh: testing the toolchain..."
-test_dir=$(mktemp -d)
-trap 'rm -rf "$test_dir"' EXIT
-cat > "$test_dir/t.cpp" <<'EOF'
+echo "prepare-portable-tools.sh: smoke-testing the toolchain..."
+smoke_dir=$(mktemp -d)
+trap 'rm -rf "$smoke_dir"' EXIT
+cat > "$smoke_dir/t.cpp" <<'EOF'
 #include <vector>
 #include <cstdio>
 int main() {
@@ -218,25 +214,24 @@ int main() {
    return sum == 6 ? 0 : 1;
 }
 EOF
-"$work/bin/clang++" -std=c++20 -fuse-ld=lld "$test_dir/t.cpp" -o "$test_dir/t"
-"$test_dir/t"
+"$work/bin/clang++" -std=c++20 -fuse-ld=lld "$smoke_dir/t.cpp" -o "$smoke_dir/t"
+"$smoke_dir/t"

 # Also exercised together through CMake+Ninja, exactly how local-build.sh drives them - a plain
 # clang++ invocation above would not catch a broken CMAKE_ROOT (Modules/Templates) or a Ninja that
 # can't find the compiler.
-cat > "$test_dir/CMakeLists.txt" <<'EOF'
-cmake_minimum_required(VERSION 3.25)
-project(test CXX)
-add_executable(test t.cpp)
+cat > "$smoke_dir/CMakeLists.txt" <<'EOF'
+cmake_minimum_required(VERSION 3.16)
+project(smoke CXX)
+add_executable(smoke t.cpp)
 EOF
-"$work/bin/cmake" -S "$test_dir" -B "$test_dir/build" -G Ninja \
+"$work/bin/cmake" -S "$smoke_dir" -B "$smoke_dir/build" -G Ninja \
    -DCMAKE_MAKE_PROGRAM="$work/bin/ninja" -DCMAKE_CXX_COMPILER="$work/bin/clang++" >/dev/null
-"$work/bin/cmake" --build "$test_dir/build" >/dev/null
-"$test_dir/build/test"
+"$work/bin/cmake" --build "$smoke_dir/build" >/dev/null
+"$smoke_dir/build/smoke"

-rm -rf "$test_dir"
+rm -rf "$smoke_dir"
 trap - EXIT

-rm -rf "$toolchain_dir"
 mv "$work" "$toolchain_dir"
 echo "prepare-portable-tools.sh: toolchain ready at $toolchain_dir ($(du -sh "$toolchain_dir" | cut -f1))"
@@ -1,20 +1,6 @@
-<img width="4190" height="1232" alt="wiicomplogofinalfinalfinalev2MADEBY_INKWRECK_plzcredit" src="https://github.com/user-attachments/assets/df7a3f2e-5336-479a-b4c0-968dd578726d" />

 # WiiCompiled

-<p align="center">
-  <a href="https://github.com/patchzyy/Wiicompiled/releases"><img alt="Windows 10 / 11, x64" src="https://img.shields.io/badge/Windows-10%20%2F%2011%20%C2%B7%20x64-0078D4"></a>
-  <a href="https://github.com/patchzyy/Wiicompiled/releases"><img alt="Linux, x64 / ARM64" src="https://img.shields.io/badge/Linux-x64%20%2F%20ARM64-FCC624?logo=linux&amp;logoColor=white"></a>
-  <a href="https://github.com/patchzyy/Wiicompiled/releases"><img alt="macOS 14+, Apple Silicon" src="https://img.shields.io/badge/macOS-14%2B%20%C2%B7%20Apple%20Silicon-0A84FF?logo=apple&amp;logoColor=white"></a>
-</p>
-<p align="center">
-  <a href="#building-from-source"><img alt="PowerPC static recompilation" src="https://img.shields.io/badge/PowerPC-static%20recompilation-FF9F0A"></a>
-  <a href="#retro-rewind"><img alt="Retro Rewind supported" src="https://img.shields.io/badge/Retro%20Rewind-supported-FF375F"></a>
-  <a href="https://github.com/TeamWheelWizard/WheelWizard/releases"><img alt="Install with Wheel Wizard" src="https://img.shields.io/badge/install%20with-Wheel%20Wizard-8B5CF6"></a>
-  <a href="https://github.com/patchzyy/Wiicompiled/releases"><img alt="Total downloads" src="https://img.shields.io/github/downloads/patchzyy/Wiicompiled/total?color=00B8D9&amp;logo=github"></a>
-  <a href="LICENSE"><img alt="License: GPLv3" src="https://img.shields.io/badge/license-GPLv3-2EA44F?logo=gnu&amp;logoColor=white"></a>
-</p>
-
 A native PC port of Mario Kart Wii, made with static recompilation.

 There's no emulator in the loop, no interpreter, no JIT, no PowerPC
@@ -53,37 +39,42 @@ Play at several times the console's resolution.
 **Music ducking.** 
 Start playing something else, Spotify, a YouTube video, and
 the game automatically mutes its own music until the other audio stops. Optional, if you'd
-rather it didn't. Windows uses system media controls and Linux uses MPRIS players.
-On macOS 14.2 or later, this detects other apps with active audio output and excludes
-the game's own audio. Apps that keep an output stream running silently can keep
-game music muted even when nothing is audible.
+rather it didn't. All audio that shows in your display media controls on your windows pc fall under this.

 **An in-game settings bar.** 
 Press **F10** while the game window has focus:
 - Internal resolution
 - FPS counter
- MetalFX spatial upscaling on supported macOS GPUs
 - Controller assignment for all four ports
- Full per-controller button mapping, including the bumpers
- Dolphin-syntax input expressions and GCPadNew.ini import
- Controller vibration on/off
+- Full per-controller button mapping
 - Volume, instant mute, and the music ducking toggle

 Everything you change is saved to `Config.toml` on the spot and restored next launch.

-**Dolphin-compatible input expressions.** 
-Each GameCube control can carry an expression in Dolphin's input syntax, with the same operators
-and the same functions.
-A Dolphin `GCPadNew.ini` can be imported directly from the F10 bar.
-
-**Vibration toggle.** 
-Force feedback can be turned off for every port at once.
+**Real controller support.** 
+Controllers are fed to the game as a GameCube controller.
+Mappings are positional (`south`, `east`, `west`, `north`) rather than Xbox-labelled, so the
+same config makes sense on Xbox, PlayStation, Nintendo and generic SDL pads alike, and extra
+inputs like paddles, touchpads and share buttons show up when the hardware reports them.
 The official Wii U / Switch GameCube adapter (WUP-028) works too; as with Dolphin, on Windows the
 adapter must be switched to the WinUSB driver once (Zadig).

 **Real Wii Remotes over Bluetooth.**
 Pair a Wii Remote with Windows (Settings > Bluetooth > Add device, press 1+2 or SYNC, leave the
-PIN empty)
+PIN empty) and the game reads it as an actual Wii Remote through KPAD: Wii Remote icons and
+prompts, Wii Wheel tilt steering, wheelies and tricks all come from the game's own motion code.
+Nunchuk and Classic Controller are real Wii extensions too: the game gets the Nunchuk's stick,
+C/Z and accelerometer, and the Classic Controller through `KPADGetUnifiedWpadStatus` with its own
+layout and icons, so its buttons do what the game says they do and no mapping is involved. Plug an
+extension in or pull it out mid-game and the game switches control scheme like on the console
+(the runtime patches SDL's Wii driver, which otherwise loses the remote for good on an extension
+change). Only the Wii U Pro Controller, which has no Wii-era equivalent, is fed to the game as a
+GameCube pad with Nintendo's layout. If a remote drops out or was switched on after launch, the
+runtime keeps rescanning Bluetooth until it comes back (F10 > Controller settings > Wii Remotes). SDL's read of
+the remote's factory accelerometer calibration often times out over Bluetooth (`console.log`
+then says "Using fallback accelerometer calibration") and it falls back to a nominal zero point,
+so the same menu has a one-button calibration (remote flat, buttons up) that removes the small
+tilt offset some remotes show.

 Known limitations of the Wii Remote path:
 - No IR pointer yet: menus are navigated with the D-pad and A (the game treats the remote as
@@ -101,8 +92,8 @@ Known limitations of the Wii Remote path:
 - GPU: GTX 1650 / RX 6400 / Arc A310 or higher
 - CPU: Intel Core i5-8400 / AMD Ryzen 5 2600 (4c/6c, ~3.5GHz+) or higher
 - About 20 GB of free disk space during installation (Final game size ~5 GB)
- macOS 12 (Monterey) or later on Apple Silicon (`arm64`) or Intel (`x86_64-v3`); pre-Haswell Intel CPUs are unsupported
- On macOS, a Metal-capable GPU and Apple Xcode Command Line Tools (Setup opens Apple's installer when they are missing)
+- macOS 14 (Sonoma) or later on Apple Silicon
+- On macOS, Apple Xcode Command Line Tools (Setup opens Apple's installer when they are missing)
 - A clean, unmodified **PAL `RMCP01`** disc image of Mario Kart Wii, dumped by you. ISO, GCM,
  GCZ, CISO, WBFS, WIA and RVZ are accepted.

@@ -123,21 +114,92 @@ image under Settings, turn on **WiiCompiled (beta)**, and hit install from the H
 Wheel Wizard downloads the setup tool from this repo and walks you through install, updates and
 launching. The backend itself is deliberately command-line only, Wheel Wizard is a wrapper around it.

-### macOS

-Download `WiiCompiled-Setup.pkg` from this repository's Releases page and open it. The universal
-package selects the appropriate bundled tools for the host architecture, supporting both Apple Silicon (`arm64`)
-and Intel (`x86_64`) Macs. It installs **WiiCompiled Setup** in Applications; open that app, choose
-your clean PAL `RMCP01` disc image, and select either the base game or Retro Rewind. For Retro Rewind, choose the `RetroRewind6` folder
-or its parent folder.
+### iOS

-Setup verifies and extracts the image locally, then translates and compiles the native app on your
-Mac. On a first run it may ask macOS to install Xcode Command Line Tools; complete Apple's installer,
-then open Setup again. When the build completes, Setup asks for administrator approval once to install
-`WiiCompiled.app` (and, if selected, `RetroRewind.app`) in `/Applications`.
+Requires macOS with Xcode. Build the `WiiCompiled` target for iOS arm64; the build writes
+`WiiCompiled-unsigned.ipa` next to the app bundle.
+
+```sh
+cmake -S runtime -B build-ios -G Ninja -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_SYSTEM_PROCESSOR=arm64 \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_SYSROOT=iphoneos \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
+    -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH \
+    -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+    -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+    -DCMAKE_DISABLE_FIND_PACKAGE_absl=TRUE \
+    -DAURORA_DAWN_PROVIDER=package
+cmake --build build-ios --target WiiCompiled
+```
+
+#### iOS from Linux
+
+The same .ipa builds on a Linux host with upstream clang and lld; no Theos, xtool or Xcode. Tested
+on Debian 13 with `clang-19 lld-19 llvm-19 cmake ninja-build git`. The only Apple piece is the
+iPhoneOS SDK, and [xybp888/iOS-SDKs](https://github.com/xybp888/iOS-SDKs) carries current ones:
+
+```sh
+git clone --depth 1 --filter=blob:none --sparse https://github.com/xybp888/iOS-SDKs.git /opt/iOS-SDKs
+git -C /opt/iOS-SDKs sparse-checkout set --no-cone iPhoneOS26.5.sdk
+```
+
+Pass that directory as `IOS_SDK` (or copy `iPhoneOS.sdk` out of a Mac's Xcode to `/opt/iPhoneOS.sdk`,
+the default). The translated shard manifest under `generated/` records absolute paths from the
+machine that ran the translator, so either translate on the Linux host or symlink that path to your
+checkout.
+
+```sh
+cmake -S runtime -B build-ios -G Ninja -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_TOOLCHAIN_FILE=cmake/ios-linux-toolchain.cmake -DIOS_SDK=/opt/iOS-SDKs/iPhoneOS26.5.sdk \
+    -DCMAKE_DISABLE_FIND_PACKAGE_absl=TRUE -DAURORA_DAWN_PROVIDER=package
+cmake --build build-ios --target WiiCompiled
+```
+
+#### iOS from Windows
+
+The same toolchain file works on Windows with [llvm-mingw](https://github.com/mstorsjo/llvm-mingw),
+which is what the Windows build already uses. Three things differ from a Linux host:
+
+- llvm-mingw does not ship `ld64.lld.exe` or `llvm-install-name-tool.exe`; LLVM tools dispatch on
+  their file name, so copy `ld.lld.exe` to `ld64.lld.exe` and `llvm-objcopy.exe` to
+  `llvm-install-name-tool.exe` in its `bin` directory.
+- Git for Windows checks the SDK repo's symlinks out as small text files unless `core.symlinks`
+  is on (Developer Mode). Either enable that before cloning, or replace each placeholder with a
+  copy of its target; `libSystem.tbd` is one of them and the link fails without it.
+- Pass the toolchain file as an absolute path, and `MKW_IOS_LLVM_BIN` as the llvm-mingw `bin`
+  directory with forward slashes.
+
+```powershell
+cmake -S runtime -B build-ios -G Ninja -DCMAKE_BUILD_TYPE=Release `
+    -DCMAKE_TOOLCHAIN_FILE=C:/src/Wiicompiled/runtime/cmake/ios-linux-toolchain.cmake `
+    -DIOS_SDK=C:/iOS-SDKs/iPhoneOS26.5.sdk -DMKW_IOS_LLVM_BIN=C:/llvm-mingw/bin `
+    -DCMAKE_DISABLE_FIND_PACKAGE_absl=TRUE -DAURORA_DAWN_PROVIDER=package
+cmake --build build-ios --target WiiCompiled
+```
+
+Install it with AltStore or SideStore, which sign with your own Apple ID. The app needs the
+`com.apple.developer.kernel.increased-memory-limit` entitlement or it exits at startup;
+[GetMoreRam](https://github.com/hugeBlack/GetMoreRam) grants it with a free Apple ID.
+GetMoreRam grants `com.apple.developer.kernel.extended-virtual-addressing` at the same time, which
+matters on devices with less than 4 GB of RAM: the runtime reserves a 4 GiB guest address space at
+startup and that is right on the limit iOS allows without it. It makes no difference on the 8 GB
+devices this was developed on.
+
+`runtime/cmake/ios/WiiCompiled.entitlements` is a template for signing by hand, with placeholders to
+replace; the sideloaders build their own and ignore it. It carries both entitlements, so the
+provisioning profile you sign with needs both capabilities enabled.
+
+Copy `Config.toml` and an extracted `DATA` directory into the app's Documents folder, using Files on
+the device or the Finder with it connected. Keep `dvd_root` relative:
+
+```toml
+[paths]
+dvd_root = "DATA"
+```
+
+Touch controls appear when no gamepad is attached; tap the FPS readout for settings.

-Setup opens Terminal while it works, so the extraction and build progress—and any error that needs
-reporting—remain visible.

 > [!CAUTION]
 > Only take builds from this repository's
@@ -177,9 +239,7 @@ The default test suite needs no binaries and no host C++ compiler, so you can ha
 translator without any game data around.

 For everything beyond that, feeding in your own `main.dol`/`StaticR.rel`, running the
-translation, generating the manifest and build graph, and compiling, see [`translator/README.md`](translator/README.md).
-
-For a step-by-step guide on compiling both WiiCompiled and Retro Rewind from source on macOS (Apple Silicon), see the [macOS Build Guide](docs/building-macos.md).
+translation, generating the manifest and build graph, and compiling. see [`translator/README.md`](translator/README.md).

 ## FAQ

@@ -228,7 +288,7 @@ AI coding tools were used during development of this project.
 All translated output is verified against real hardware behavior and most importantly, physics accuracy is proven synced across Wii, Dolphin, and WiiCompiled (see FAQ). 

 ## Credits
- **inkwreck** - making the logo
+
 - **[aurora](https://github.com/encounter/aurora)** - the GX rendering/windowing backend this
  project's whole graphics layer sits on. MIT licensed.
 - **[Dawn](https://dawn.googlesource.com/dawn)** - Google's WebGPU implementation, powering
@@ -114,16 +114,14 @@ Source: <https://github.com/higan-emu/libco>. Full license text:

 ## Fetched at build time and redistributed in release builds

-These are pinned in `aurora-main/extern/CMakeLists.txt`, `aurora-main/CMakeLists.txt`,
-`aurora-main/cmake/AuroraDawnProvider.cmake`, and (for Mbed TLS) `runtime/CMakeLists.txt`. They are
-not stored in this repository; the build downloads them - each fetch is pinned to an exact version
-with a checked SHA-256 - and links or redistributes the resulting binaries. Their license texts are
+These are pinned in `aurora-main/extern/CMakeLists.txt`, `aurora-main/CMakeLists.txt` and
+`aurora-main/cmake/AuroraDawnProvider.cmake`. They are not stored in this repository; the build
+downloads them, and release installers carry the resulting binaries. Their license texts are
 included in the installer's `licenses/` folder. The Windows installer bundles the pinned source
 trees themselves (fetched by `Launcher/Prepare-Dependencies.ps1`) so end-user builds run offline.

 | Component | Version | License | Upstream |
 | --- | --- | --- | --- |
-| Mbed TLS | 3.6.7 | Apache-2.0 / GPL-2.0-or-later | <https://github.com/Mbed-TLS/mbedtls> |
 | Dawn (WebGPU) | `v20260603.191052` prebuilt | BSD-3-Clause | <https://dawn.googlesource.com/dawn> |
 | Tint (part of Dawn) | with Dawn | BSD-3-Clause | <https://dawn.googlesource.com/dawn> |
 | DirectXShaderCompiler (`dxcompiler.dll`) | with Dawn | NCSA / University of Illinois Open Source | <https://github.com/microsoft/DirectXShaderCompiler> |
@@ -132,7 +130,7 @@ trees themselves (fetched by `Launcher/Prepare-Dependencies.ps1`) so end-user bu
 | Abseil | LTS 20240722.0 | Apache-2.0 | <https://github.com/abseil/abseil-cpp> |
 | Dear ImGui | 1.91.9b-docking | MIT | <https://github.com/ocornut/imgui> |
 | {fmt} | 11.1.4 | MIT | <https://github.com/fmtlib/fmt> |
-| xxHash | 0.8.4 | BSD-2-Clause | <https://github.com/Cyan4973/xxHash> |
+| xxHash | 0.8.3 | BSD-2-Clause | <https://github.com/Cyan4973/xxHash> |
 | zlib | 1.3.2 | zlib | <https://github.com/madler/zlib> |
 | libpng | 1.6.58 | PNG Reference Library License v2 | <https://github.com/pnggroup/libpng> |
 | FreeType | 2.14.3 | **FreeType License (FTL)** - see below | <https://freetype.org/> |
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.25)
 project(aurora LANGUAGES C CXX)
 if (APPLE)
    enable_language(OBJC)
-    enable_language(OBJCXX)
 endif()
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
@@ -84,10 +83,3 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_CROSSCOMPIL
  enable_testing()
  add_subdirectory(tests)
 endif ()
-
-option(AURORA_BUILD_METALFX_PRESENTATION_TEST "Build the macOS MetalFX presentation test" OFF)
-if (AURORA_BUILD_METALFX_PRESENTATION_TEST AND APPLE AND AURORA_ENABLE_GX AND DAWN_ENABLE_METAL AND AURORA_METALFX_FRAMEWORK)
-    add_executable(metalfx_presentation_test tests/metalfx_interop/presentation_test.cpp)
-    target_include_directories(metalfx_presentation_test PRIVATE lib)
-    target_link_libraries(metalfx_presentation_test PRIVATE aurora::core aurora::gx aurora::vi dawn::webgpu_dawn)
-endif ()
@@ -48,7 +48,7 @@ if (_aurora_dawn_provider STREQUAL "auto")
    set(_has_package TRUE)
  elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$")
    set(_has_package TRUE)
-  elseif (APPLE AND (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$" OR CMAKE_OSX_ARCHITECTURES MATCHES "^(arm64|x86_64)$"))
+  elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
    set(_has_package TRUE)
  endif ()

@@ -101,7 +101,7 @@ if (_aurora_dawn_provider STREQUAL "vendor")
    include(FetchContent)
    FetchContent_Declare(dawn
      URL "https://github.com/google/dawn/archive/refs/tags/${AURORA_DAWN_VERSION}.tar.gz"
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(dawn)
@@ -143,10 +143,6 @@ elseif (_aurora_dawn_provider STREQUAL "package")
  if (NOT AURORA_DAWN_PACKAGE_URL)
    string(TOLOWER "${CMAKE_SYSTEM_NAME}" _dawn_system)
    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _dawn_arch)
-    if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-      list(GET CMAKE_OSX_ARCHITECTURES 0 _dawn_osx_arch)
-      string(TOLOWER "${_dawn_osx_arch}" _dawn_arch)
-    endif ()
    if (_dawn_system STREQUAL "windows")
      if (_dawn_arch STREQUAL "x86_64")
        set(_dawn_arch "amd64")
@@ -155,36 +151,15 @@ elseif (_aurora_dawn_provider STREQUAL "package")
      endif ()
    endif ()
    set(AURORA_DAWN_PACKAGE_URL
-      "https://github.com/theofficialgman/dawn-build/releases/download/${AURORA_DAWN_VERSION}/dawn-${_dawn_system}-${_dawn_arch}.tar.gz")
+      "https://github.com/encounter/dawn-build/releases/download/${AURORA_DAWN_VERSION}/dawn-${_dawn_system}-${_dawn_arch}.tar.gz")

    # A release asset is mutable: the same tag has already served two different windows-amd64 archives,
    # and a cached extraction is never re-verified. Pin the digest for the combinations we ship.
-    if (NOT AURORA_DAWN_PACKAGE_URL_HASH AND AURORA_DAWN_VERSION STREQUAL "v20260603.191052")
-      if (_dawn_system STREQUAL "windows" AND _dawn_arch STREQUAL "amd64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=13be9cff8b9b179c42dcd16aeabb6effcc8f0dfdcc14463eda2a5caeda225142")
-      elseif (_dawn_system STREQUAL "windows" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=bf2d921110f14a1d6553f673c5597988e66c02af5587e4a1fee167937d247734")
-      elseif (_dawn_system STREQUAL "linux" AND _dawn_arch STREQUAL "x86_64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=7adcf241bb2a24ec0c576609f2d67203e0e65db9c5a286ca2bbb6281fa644b35")
-      elseif (_dawn_system STREQUAL "linux" AND _dawn_arch STREQUAL "aarch64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=2415e253d46f91b2d72fc73bf6055fb31b98b67c773dc546e1991b1cf019732f")
-      elseif (_dawn_system STREQUAL "darwin" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=0a8ea8eb0159fc0ba1083c52155d9376fb173cffe690b400464a6ad8881bb461")
-      elseif (_dawn_system STREQUAL "darwin" AND _dawn_arch STREQUAL "x86_64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=5fe2c7a2a8b4cb82acee4af16779a83ae333c7657b9dc1a5008f5fd1f5ad5f80")
-      elseif (_dawn_system STREQUAL "ios" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=f97701d26fd1f25bbcc260b4c31736ede134c730c12556029e2470fde967f424")
-      elseif (_dawn_system STREQUAL "android" AND _dawn_arch STREQUAL "aarch64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=0e63e8cbf53551f703f582d1306f4257c0380353f66b53369d96952ce6d9f934")
-      endif ()
+    if (NOT AURORA_DAWN_PACKAGE_URL_HASH
+        AND AURORA_DAWN_VERSION STREQUAL "v20260603.191052"
+        AND _dawn_system STREQUAL "windows" AND _dawn_arch STREQUAL "amd64")
+      set(AURORA_DAWN_PACKAGE_URL_HASH
+        "SHA256=7785373d569b3b0237918ec9c523239f7d0667857c5ea8242e3cdfde95e6aeab")
    endif ()
  endif ()
  message(STATUS "aurora: Fetching prebuilt Dawn package from ${AURORA_DAWN_PACKAGE_URL}")
@@ -198,7 +173,7 @@ elseif (_aurora_dawn_provider STREQUAL "package")
  FetchContent_Declare(dawn_prebuilt
    URL "${AURORA_DAWN_PACKAGE_URL}"
    ${_dawn_prebuilt_hash_argument}
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
  )
  FetchContent_MakeAvailable(dawn_prebuilt)

@@ -7,7 +7,7 @@
 include(FetchContent)
 FetchContent_Declare(libusb
  URL "https://github.com/libusb/libusb/releases/download/v${AURORA_LIBUSB_VERSION}/libusb-${AURORA_LIBUSB_VERSION}.tar.bz2"
-  DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+  DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 # Upstream ships no CMakeLists.txt, so this only populates the source tree.
 FetchContent_MakeAvailable(libusb)
@@ -120,7 +120,7 @@ elseif (_aurora_nod_provider STREQUAL "package")
  include(FetchContent)
  FetchContent_Declare(nod_prebuilt
    URL "${AURORA_NOD_PACKAGE_URL}"
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(nod_prebuilt)
@@ -41,10 +41,7 @@ if (_aurora_sdl3_provider STREQUAL "auto")
    set(_aurora_sdl3_provider "package")
  else ()
    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    # Aurora uses APIs from the SDL version pinned by AURORA_SDL3_VERSION.
-    # Do not silently select an older system package and fail later while
-    # compiling its headers.
-    find_package(SDL3 ${AURORA_SDL3_VERSION} QUIET)
+    find_package(SDL3 QUIET)
    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
    if (SDL3_FOUND)
      set(_aurora_sdl3_provider "system")
@@ -61,7 +58,7 @@ if (_aurora_sdl3_provider STREQUAL "system")
  message(STATUS "aurora: Using system SDL3 (provider=system)")
  if (NOT SDL3_FOUND)
    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    find_package(SDL3 ${AURORA_SDL3_VERSION} REQUIRED)
+    find_package(SDL3 REQUIRED)
    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
  endif ()
  _aurora_sdl3_select_target()
@@ -95,7 +92,7 @@ elseif (_aurora_sdl3_provider STREQUAL "package")
  include(FetchContent)
  FetchContent_Declare(sdl3_prebuilt
    URL "${AURORA_SDL3_PACKAGE_URL}"
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
  )
  FetchContent_MakeAvailable(sdl3_prebuilt)

@@ -148,7 +145,7 @@ elseif (_aurora_sdl3_provider STREQUAL "vendor")
    endif ()
    FetchContent_Declare(SDL
      URL "https://github.com/libsdl-org/SDL/releases/download/release-${AURORA_SDL3_VERSION}/SDL3-${AURORA_SDL3_VERSION}.tar.gz"
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      PATCH_COMMAND "${CMAKE_COMMAND}" -DSDL_SOURCE_DIR=<SOURCE_DIR> -P "${_aurora_sdl3_patches}"
      EXCLUDE_FROM_ALL
    )
@@ -34,17 +34,6 @@ if (AURORA_ENABLE_GX)
    target_compile_definitions(aurora_core PUBLIC AURORA_ENABLE_GX WEBGPU_DAWN)
    target_sources(aurora_core PRIVATE lib/webgpu/gpu.cpp lib/webgpu/gpu_cache.cpp lib/dawn/BackendBinding.cpp)
    target_link_libraries(aurora_core PRIVATE dawn::webgpu_dawn)
-    if (APPLE AND DAWN_ENABLE_METAL)
-        find_library(AURORA_METALFX_FRAMEWORK MetalFX)
-    endif ()
-    if (APPLE AND DAWN_ENABLE_METAL AND AURORA_METALFX_FRAMEWORK)
-        target_sources(aurora_core PRIVATE lib/webgpu/metalfx.mm)
-        set_source_files_properties(lib/webgpu/metalfx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-        target_link_options(aurora_core PUBLIC "LINKER:-weak_framework,MetalFX")
-        target_link_libraries(aurora_core PRIVATE "-framework IOSurface")
-    else ()
-        target_sources(aurora_core PRIVATE lib/webgpu/metalfx_stub.cpp)
-    endif ()
    if (DAWN_ENABLE_VULKAN)
        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_VULKAN)
    endif ()
@@ -52,9 +41,7 @@ if (AURORA_ENABLE_GX)
        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_METAL)
        target_sources(aurora_core PRIVATE lib/dawn/MetalBinding.mm)
        set_source_files_properties(lib/dawn/MetalBinding.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-        target_link_options(aurora_core PUBLIC
-            "LINKER:-weak_framework,Metal"
-            "LINKER:-U,_OBJC_CLASS_$_MTLLogStateDescriptor")
+        target_link_options(aurora_core PUBLIC "LINKER:-weak_framework,Metal")
    endif ()
    if (DAWN_ENABLE_D3D11)
        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_D3D11)
@@ -16,60 +16,10 @@ function(aurora_find_package_global)
  set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ${_PREV_FIND_PACKAGE_TARGETS_GLOBAL})
 endfunction()

-# A macOS build for another architecture must not discover Homebrew packages
-# built for its physical host. CMAKE_CROSSCOMPILING is not sufficient here:
-# Apple Clang can target another architecture through CMAKE_OSX_ARCHITECTURES
-# without CMake considering the configure a cross-build.
-set(_AURORA_EXCLUDE_HOST_HOMEBREW FALSE)
-if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-  list(LENGTH CMAKE_OSX_ARCHITECTURES _AURORA_OSX_ARCH_COUNT)
-  if (_AURORA_OSX_ARCH_COUNT EQUAL 1)
-    list(GET CMAKE_OSX_ARCHITECTURES 0 _AURORA_TARGET_ARCH)
-    string(TOLOWER "${_AURORA_TARGET_ARCH}" _AURORA_TARGET_ARCH)
-    # hw.optional.arm64 identifies Apple Silicon even when CMake itself runs
-    # through Rosetta, where CMAKE_HOST_SYSTEM_PROCESSOR reports x86_64.
-    execute_process(
-      COMMAND /usr/sbin/sysctl -n hw.optional.arm64
-      RESULT_VARIABLE _AURORA_ARM64_PROBE_RESULT
-      OUTPUT_VARIABLE _AURORA_ARM64_PROBE
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (_AURORA_ARM64_PROBE_RESULT EQUAL 0 AND _AURORA_ARM64_PROBE STREQUAL "1")
-      set(_AURORA_HOST_ARCH arm64)
-    else ()
-      execute_process(
-        COMMAND /usr/bin/uname -m
-        OUTPUT_VARIABLE _AURORA_HOST_ARCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-      string(TOLOWER "${_AURORA_HOST_ARCH}" _AURORA_HOST_ARCH)
-    endif ()
-    if (_AURORA_TARGET_ARCH STREQUAL "x86_64" AND _AURORA_HOST_ARCH MATCHES "^(arm64|aarch64)$")
-      list(APPEND CMAKE_IGNORE_PREFIX_PATH "/opt/homebrew")
-      set(_AURORA_EXCLUDE_HOST_HOMEBREW TRUE)
-    elseif (_AURORA_TARGET_ARCH MATCHES "^(arm64|aarch64)$" AND _AURORA_HOST_ARCH MATCHES "^(x86_64|amd64)$")
-      list(APPEND CMAKE_IGNORE_PREFIX_PATH "/usr/local")
-      set(_AURORA_EXCLUDE_HOST_HOMEBREW TRUE)
-    endif ()
-  endif ()
-endif ()
-
-if (_AURORA_EXCLUDE_HOST_HOMEBREW)
-  list(REMOVE_DUPLICATES CMAKE_IGNORE_PREFIX_PATH)
-  message(STATUS "aurora: cross-architecture macOS build; ignoring host Homebrew prefixes")
-endif ()
-
 if (AURORA_ENABLE_GX)
  include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/AuroraDawnProvider.cmake)
 endif ()

-# SDL's pkg-config probe can bypass CMake's prefix exclusion. macOS does not
-# need libusb for the supported SDL input paths, so keep that host-only library
-# out of a cross-architecture configure.
-if (_AURORA_EXCLUDE_HOST_HOMEBREW)
-  set(SDL_HIDAPI_LIBUSB OFF CACHE BOOL "" FORCE)
-  set(SDL_HIDAPI_LIBUSB_SHARED OFF CACHE BOOL "" FORCE)
-endif ()
-
 # Abseil is needed for core libraries. It normally comes via Dawn's vendor build.
 # Otherwise prefer a system package and only fetch it as a last resort.
 if (NOT TARGET absl::flat_hash_map OR NOT TARGET absl::btree)
@@ -88,7 +38,7 @@ else ()
  set(ABSL_PROPAGATE_CXX_STD ON)
  FetchContent_Declare(abseil-cpp
    URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(abseil-cpp)
@@ -102,10 +52,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/AuroraSDL3Provider.cmake)
 if (NOT TARGET xxhash)
  message(STATUS "aurora: Fetching xxhash")
  FetchContent_Declare(xxhash
-    URL https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.4.tar.gz
-    URL_HASH SHA256=5738270935e7c3d38a79b3adf7c9692566ce7895a25f67de43ad52ab504acd32
-    SOURCE_SUBDIR build/cmake
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    URL https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz
+    URL_HASH SHA256=aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80
+    SOURCE_SUBDIR cmake_unofficial
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    EXCLUDE_FROM_ALL
  )
  set(XXHASH_BUILD_XXHSUM OFF CACHE INTERNAL "Build the xxhsum binary")
@@ -128,7 +78,7 @@ if (NOT TARGET fmt)
  FetchContent_Declare(fmt
    URL https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz
    URL_HASH SHA256=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(fmt)
@@ -166,7 +116,7 @@ if (AURORA_ENABLE_GX)
      ZLIB
      URL https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz
      URL_HASH SHA256=bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(ZLIB)
@@ -202,7 +152,7 @@ if (AURORA_ENABLE_GX)
      PNG
      URL https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.58.tar.gz
      URL_HASH SHA256=A9D4DF463D36A6E5F9C29BD6F4967312D17E996C1854F3511F833924EB1993CF
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(PNG)
@@ -226,7 +176,7 @@ if (AURORA_ENABLE_GX)
    FetchContent_Declare(Freetype
      URL https://files.twilitrealm.dev/freetype-2.14.3.tar.gz
      URL_HASH SHA256=e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(Freetype)
@@ -240,7 +190,7 @@ if (AURORA_ENABLE_GX)
    FetchContent_Declare(imgui
      URL https://github.com/ocornut/imgui/archive/refs/tags/v1.91.9b-docking.tar.gz
      URL_HASH SHA256=466fdef9b18de15f0bb6e288e3d00ffa3d82200ec458ce5e4f724a161d9528a5
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(imgui)
@@ -285,7 +235,7 @@ if (AURORA_ENABLE_GX)
    FetchContent_Declare(sqlite3
      URL https://sqlite.org/2026/sqlite-amalgamation-3510300.zip
      URL_HASH SHA256=acb1e6f5d832484bf6d32b681e858c38add8b2acdfd42ac5df24b8afb46552b4
-      DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
      EXCLUDE_FROM_ALL
    )
    FetchContent_MakeAvailable(sqlite3)
@@ -328,7 +278,7 @@ if (AURORA_ENABLE_GX)
      FetchContent_Declare(zstd
        URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz
        URL_HASH SHA256=eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3
-        DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
        SOURCE_SUBDIR build/cmake
        EXCLUDE_FROM_ALL
      )
@@ -349,7 +299,7 @@ if (NOT TARGET TracyClient)
          tracy
          URL https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz
          URL_HASH SHA256=24d342b5127d7f659dc3cf94f24347b348cc736f25b17a691fd7f69541937658
-          DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+          DOWNLOAD_EXTRACT_TIMESTAMP TRUE
          EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(tracy)
@@ -127,20 +127,12 @@ typedef struct {
  const char* pipelineCachePath;
 } AuroraConfig;

-typedef enum {
-  AURORA_INITIALIZATION_SUCCESS = 0,
-  AURORA_INITIALIZATION_GRAPHICS_UNAVAILABLE = 1,
-} AuroraInitializationStatus;
-
 typedef struct {
  AuroraBackend backend;
  const char* userPath;
  const char* cachePath;
  SDL_Window* window;
  AuroraWindowSize windowSize;
-  AuroraInitializationStatus initializationStatus;
-  // On failure, owned by SDL on the calling thread. Copy before another SDL call.
-  const char* initializationError;
 } AuroraInfo;

 AuroraInfo aurora_initialize(int argc, char* argv[], const AuroraConfig* config);
@@ -170,21 +162,6 @@ void aurora_set_background_input(bool value);
 void aurora_set_display_mode(AuroraDisplayMode mode);
 AuroraDisplayMode aurora_get_display_mode();

-typedef enum {
-  AURORA_METALFX_DISABLED,
-  AURORA_METALFX_UNSUPPORTED,
-  AURORA_METALFX_NOT_UPSCALING,
-  AURORA_METALFX_ACTIVE,
-  AURORA_METALFX_ERROR,
-} AuroraMetalFXStatus;
-
-// Changes are consumed at the next sealed frame boundary. MetalFX only applies
-// when both source dimensions are smaller than the aspect-fitted output.
-void aurora_set_metalfx_spatial(bool enabled);
-bool aurora_get_metalfx_spatial();
-bool aurora_is_metalfx_spatial_supported();
-AuroraMetalFXStatus aurora_get_metalfx_status();
-
 AuroraBackend aurora_get_backend();
 const AuroraBackend* aurora_get_available_backends(size_t* count);

@@ -88,7 +88,6 @@ typedef enum _AuroraViewportPolicy {
  AURORA_VIEWPORT_FIT = 0,     // Preserve logical aspect in the content framebuffer
  AURORA_VIEWPORT_STRETCH = 1, // Match content framebuffer aspect to the native surface
  AURORA_VIEWPORT_NATIVE = 2,  // Use active framebuffer pixels directly
-  AURORA_VIEWPORT_16_9 = 3,    // Fixed 16:9 content with bars on other surfaces
 } AuroraViewportPolicy;

 /**
@@ -171,22 +171,6 @@ typedef struct PADButtonMapping {
  PADButton padButton;
 } PADButtonMapping;

-// Explicitly disabled, unlike INVALID which permits default L/R trigger input.
-#define PAD_NATIVE_BUTTON_DISABLED 0xfffffffeu
-
-// Axis-to-button bindings share the persisted nativeButton field without
-// changing the binary layout of existing controller mapping files.
-constexpr u32 PADEncodeAxisButton(u32 axis, bool negative, u32 threshold = 50) {
-  return 0x10000u | axis | (negative ? 0x80u : 0u) | (threshold << 8);
-}
-constexpr bool PADIsAxisButton(u32 binding) { return (binding & 0xffff0000u) == 0x10000u; }
-constexpr u32 PADAxisButtonThreshold(u32 binding) { return (binding >> 8) & 0xffu; }
-constexpr u32 PADAxisButtonAxis(u32 binding) { return binding & 0x7fu; }
-constexpr bool PADAxisButtonNegative(u32 binding) { return (binding & 0x80u) != 0; }
-constexpr u32 PADAxisButtonIdentity(u32 binding) {
-  return PADIsAxisButton(binding) ? (binding & ~0xff00u) : binding;
-}
-
 typedef struct PADAxisMapping {
  PADSignedNativeAxis nativeAxis;
  s32 nativeButton;
@@ -245,6 +229,7 @@ s32 PADGetNativeButtonPressed(u32 port);
 PADSignedNativeAxis PADGetNativeAxisPulled(u32 port);
 void PADRestoreDefaultMapping(u32 port);
 void PADBlockInput(bool block);
+bool PADIsInputBlocked(void);

 /**
 * Set the default controller mapping used.
@@ -7,7 +7,6 @@
 #include "gx/shader_info.hpp"
 #include "imgui.hpp"
 #include "webgpu/gpu.hpp"
-#include "webgpu/metalfx.hpp"
 #include <webgpu/webgpu_cpp.h>
 #endif

@@ -61,9 +60,6 @@ std::atomic<AuroraFrameWorkerWaitCallback> g_frameWorkerWaitCallback{nullptr};
 // deadlines derived from it, so the presenter cannot drift. Zero means present when ready.
 std::atomic<uint64_t> g_presentScheduleBaseNanos{0};
 std::atomic<uint64_t> g_presentScheduleIntervalNanos{0};
-std::atomic<bool> g_metalfxRequested{false};
-std::atomic<bool> g_metalfxSupported{false};
-std::atomic<AuroraMetalFXStatus> g_metalfxStatus{AURORA_METALFX_DISABLED};

 namespace {
 Module Log("aurora");
@@ -229,7 +225,7 @@ enum class ImGuiFramePolicy {
 bool begin_frame_impl(bool pumpEvents, ImGuiFramePolicy imguiPolicy = ImGuiFramePolicy::Immediate,
                      bool* imguiNewFrameOwed = nullptr) noexcept;
 bool begin_frame_render_state_impl(ImGuiFramePolicy imguiPolicy, bool* imguiNewFrameOwed) noexcept;
-void end_frame_impl(bool pumpEvents, bool drainFifo);
+void end_frame_impl(bool pumpEvents, bool drainFifo) noexcept;

 // The two publication points of a frame-worker cycle, cleared together under `mutex`. Sealed:
 // producer-shared renderer state is free again. Done: slots encoded, presented, ImGui restarted.
@@ -693,23 +689,15 @@ AuroraInfo initialize(int argc, char* argv[], const AuroraConfig& config) noexce
  const AuroraBackend requestedBackend = config.desiredBackend;
  AuroraBackend selectedBackend = requestedBackend;
  bool windowCreated = false;
-  std::string firstGraphicsError;
-  const auto rememberGraphicsError = [&] {
-    if (firstGraphicsError.empty() && SDL_GetError()[0] != '\0') {
-      firstGraphicsError = SDL_GetError();
-    }
-  };
  if (selectedBackend != BACKEND_AUTO) {
    Log.info("Requested graphics backend: {}", backend_name(selectedBackend));
    if (window::create_window(selectedBackend)) {
      if (webgpu::initialize(selectedBackend)) {
        windowCreated = true;
      } else {
-        rememberGraphicsError();
        window::destroy_window();
      }
    } else {
-      rememberGraphicsError();
      Log.error("Failed to create a window for backend {}: {}", backend_name(selectedBackend),
                SDL_GetError());
    }
@@ -726,28 +714,18 @@ AuroraInfo initialize(int argc, char* argv[], const AuroraConfig& config) noexce
    for (const auto backendType : PreferredBackendOrder) {
      selectedBackend = backendType;
      if (!window::create_window(selectedBackend)) {
-        rememberGraphicsError();
        continue;
      }
      if (webgpu::initialize(selectedBackend)) {
        windowCreated = true;
        break;
      } else {
-        rememberGraphicsError();
        window::destroy_window();
      }
    }
  }

-  if (!windowCreated) {
-    if (firstGraphicsError.empty()) firstGraphicsError = "No supported graphics backend is available";
-    SDL_SetError("%s", firstGraphicsError.c_str());
-    Log.error("Graphics initialization failed: {}", firstGraphicsError);
-    return {
-        .initializationStatus = AURORA_INITIALIZATION_GRAPHICS_UNAVAILABLE,
-        .initializationError = SDL_GetError(),
-    };
-  }
+  ASSERT(windowCreated, "Error creating window: {}", SDL_GetError());
  if (requestedBackend != BACKEND_AUTO && selectedBackend != requestedBackend) {
    Log.error("Graphics backend fallback in effect: video.graphics_api requested {}, "
              "running on {}",
@@ -769,9 +747,6 @@ AuroraInfo initialize(int argc, char* argv[], const AuroraConfig& config) noexce
 #ifdef AURORA_ENABLE_GX
  gfx::initialize();

-  g_metalfxSupported.store(webgpu::metalfx::supported(g_device, webgpu::g_backendType));
-  g_metalfxStatus.store(AURORA_METALFX_DISABLED);
-
  imgui::create_context();
 #endif
  const auto size = window::get_window_size();
@@ -1194,114 +1169,12 @@ void stop_presenter() noexcept {
  g_presenterStarted.store(false, std::memory_order_release);
 }

-struct MetalFXSlot {
-  webgpu::metalfx::Size size{};
-  std::unique_ptr<webgpu::metalfx::SpatialScaler> scaler;
-  wgpu::BindGroup bindGroup;
-};
-std::array<MetalFXSlot, gx::MaxInterpolatedFrames + 1> g_metalfxSlots;
-size_t g_metalfxNextSlot = 0;
-webgpu::metalfx::SpatialScaler* g_metalfxPendingOutput = nullptr;
-bool g_metalfxFailed = false;
-
-void metalfx_failed(const std::string& reason) {
-  Log.warn("MetalFX spatial upscaling disabled: {}; using normal presentation", reason);
-  g_metalfxFailed = true;
-  g_metalfxStatus.store(AURORA_METALFX_ERROR);
-  g_metalfxPendingOutput = nullptr;
-  g_metalfxSlots = {};
-}
-
-wgpu::BindGroup upscale_presentation(wgpu::CommandEncoder& encoder,
-                                     const webgpu::PresentSource& source,
-                                     const webgpu::Viewport& viewport, bool enabled) {
-  if (!enabled) {
-    g_metalfxSlots = {};
-    g_metalfxFailed = false;
-    g_metalfxStatus.store(AURORA_METALFX_DISABLED);
-    return {};
-  }
-  if (!g_metalfxSupported.load()) {
-    g_metalfxStatus.store(AURORA_METALFX_UNSUPPORTED);
-    return {};
-  }
-  if (g_metalfxFailed) return {};
-  const webgpu::metalfx::Size size{
-      source.size.width, source.size.height,
-      static_cast<uint32_t>(viewport.width), static_cast<uint32_t>(viewport.height),
-      webgpu::g_graphicsConfig.surfaceConfiguration.format,
-  };
-  // The existing copy path samples perceptual values from unorm game images.
-  // Do not introduce implicit sRGB decoding or downscaling into MetalFX.
-  if (!size.inputWidth || !size.inputHeight || size.inputWidth >= size.outputWidth ||
-      size.inputHeight >= size.outputHeight ||
-      (source.format != wgpu::TextureFormat::RGBA8Unorm && source.format != wgpu::TextureFormat::BGRA8Unorm)) {
-    g_metalfxStatus.store(AURORA_METALFX_NOT_UPSCALING);
-    return {};
-  }
-  auto& slot = g_metalfxSlots[g_metalfxNextSlot++ % g_metalfxSlots.size()];
-  if (!slot.scaler || !(slot.size == size)) {
-    slot = {};
-    std::string error;
-    slot.scaler = webgpu::metalfx::create(g_instance, g_device, size, error);
-    if (!slot.scaler) {
-      if (error.empty()) g_metalfxStatus.store(AURORA_METALFX_NOT_UPSCALING);
-      else metalfx_failed(error);
-      return {};
-    }
-    slot.size = size;
-    wgpu::SamplerDescriptor samplerDescriptor{};
-    samplerDescriptor.magFilter = wgpu::FilterMode::Linear;
-    samplerDescriptor.minFilter = wgpu::FilterMode::Linear;
-    slot.bindGroup = webgpu::create_copy_bind_group(slot.scaler->output_view(),
-                                                   g_device.CreateSampler(&samplerDescriptor));
-    Log.info("MetalFX spatial slot: {}x{} -> {}x{}", size.inputWidth, size.inputHeight,
-             size.outputWidth, size.outputHeight);
-  }
-  if (!slot.scaler->begin_input()) {
-    metalfx_failed(slot.scaler->error());
-    return {};
-  }
-  const wgpu::RenderPassColorAttachment attachment{
-      .view = slot.scaler->input_view(),
-      .loadOp = wgpu::LoadOp::Clear,
-      .storeOp = wgpu::StoreOp::Store,
-  };
-  const wgpu::RenderPassDescriptor descriptor{
-      .label = "MetalFX input copy",
-      .colorAttachmentCount = 1,
-      .colorAttachments = &attachment,
-  };
-  auto pass = encoder.BeginRenderPass(&descriptor);
-  pass.SetPipeline(webgpu::g_CopyPipeline);
-  pass.SetBindGroup(0, source.bindGroup);
-  pass.SetViewport(0, 0, static_cast<float>(size.inputWidth), static_cast<float>(size.inputHeight), 0, 1);
-  pass.Draw(3);
-  pass.End();
-  // Submit the sealed scene and input copy before crossing to the native queue.
-  // The replacement encoder composites the upscaled image and ImGui normally.
-  auto buffer = encoder.Finish();
-  {
-    std::lock_guard submitLock(g_queueSubmitMutex);
-    g_queue.Submit(1, &buffer);
-  }
-  encoder = g_device.CreateCommandEncoder();
-  if (!slot.scaler->upscale()) {
-    metalfx_failed(slot.scaler->error());
-    return {};
-  }
-  g_metalfxPendingOutput = slot.scaler.get();
-  g_metalfxStatus.store(AURORA_METALFX_ACTIVE);
-  return slot.bindGroup;
-}
-
 // `presentSource` is latched in the seal prologue: by the time this encodes, the producer's next
 // gfx::begin_frame() may already have cleared the display-copy override.
-wgpu::BindGroup encode_presentation_snapshot(wgpu::CommandEncoder& encoder,
-                                              const webgpu::PresentSource& presentSource,
-                                              const PresentationImage& image,
-                                              bool includeImGui, bool metalfxEnabled,
-                                              const wgpu::BindGroup* cachedMetalFXOutput = nullptr) {
+void encode_presentation_snapshot(const wgpu::CommandEncoder& encoder,
+                                  const webgpu::PresentSource& presentSource,
+                                  const PresentationImage& image,
+                                  bool includeImGui) {
  ZoneScoped;
  auto viewport = webgpu::calculate_present_viewport(
      image.texture.size.width, image.texture.size.height, presentSource.size.width,
@@ -1312,13 +1185,6 @@ wgpu::BindGroup encode_presentation_snapshot(wgpu::CommandEncoder& encoder,
        image.texture.size.width, image.texture.size.height, presentAspect);
  }
  wgpu::BindGroup presentBindGroup = presentSource.bindGroup;
-  wgpu::BindGroup newMetalFXOutput;
-  if (cachedMetalFXOutput && *cachedMetalFXOutput) {
-    presentBindGroup = *cachedMetalFXOutput;
-  } else if (auto upscaled = upscale_presentation(encoder, presentSource, viewport, metalfxEnabled)) {
-    presentBindGroup = std::move(upscaled);
-    newMetalFXOutput = presentBindGroup;
-  }
  {
    const std::array attachments{
        wgpu::RenderPassColorAttachment{
@@ -1359,7 +1225,6 @@ wgpu::BindGroup encode_presentation_snapshot(wgpu::CommandEncoder& encoder,
    imgui::render(pass);
    pass.End();
  }
-  return newMetalFXOutput;
 }
 #endif

@@ -1368,13 +1233,6 @@ void shutdown() noexcept {
 #ifdef AURORA_ENABLE_GX
  stop_presenter();
  g_presentationImagePools = {};
-  g_metalfxSlots = {};
-  g_metalfxPendingOutput = nullptr;
-  g_metalfxNextSlot = 0;
-  g_metalfxFailed = false;
-  g_metalfxRequested.store(false);
-  g_metalfxSupported.store(false);
-  g_metalfxStatus.store(AURORA_METALFX_DISABLED);
  imgui::shutdown();
  gfx::shutdown();
  webgpu::shutdown();
@@ -1487,7 +1345,6 @@ struct SealedFrameContext {
  uint32_t logicalFrame = 0;
  bool interpolationActive = false;
  bool replayInterpolatedFrames = false;
-  bool metalfxEnabled = false;
 };

 // Phase 1: everything that touches producer-shared renderer state. Needs g_rendererGpuMutex and
@@ -1515,7 +1372,6 @@ void seal_frame_locked(gfx::SealedFrame& sealedFrame, SealedFrameContext& ctx) {
  ctx.snapshotWidth = (std::max)(windowSize.native_fb_width, 1u);
  ctx.snapshotHeight = (std::max)(windowSize.native_fb_height, 1u);
  ctx.logicalFrame = gfx::current_frame();
-  ctx.metalfxEnabled = g_metalfxRequested.load();
  // Latched before webgpu::clear_present_source_override() in the producer's
  // next gfx::begin_frame().
  ctx.presentSource = webgpu::current_present_source();
@@ -1563,14 +1419,10 @@ std::vector<PresentationJob> encode_sealed_frame(gfx::SealedFrame& sealedFrame,
  const wgpu::CommandBufferDescriptor cmdBufDescriptor{
      .label = "Presentation slot command buffer",
  };
-  const auto submitEncodedSlot = [&](wgpu::CommandEncoder& target, bool releaseMetalFXOutput = true) {
+  const auto submitEncodedSlot = [&](wgpu::CommandEncoder& target) {
    const auto buffer = target.Finish(&cmdBufDescriptor);
    std::lock_guard submitLock(g_queueSubmitMutex);
    g_queue.Submit(1, &buffer);
-    if (releaseMetalFXOutput && g_metalfxPendingOutput) {
-      if (!g_metalfxPendingOutput->end_output()) metalfx_failed(g_metalfxPendingOutput->error());
-      g_metalfxPendingOutput = nullptr;
-    }
  };

  if (ctx.replayInterpolatedFrames) {
@@ -1579,7 +1431,7 @@ std::vector<PresentationJob> encode_sealed_frame(gfx::SealedFrame& sealedFrame,
      gfx::render(sealedFrame, encoder, static_cast<int32_t>(interpolatedFrame), false);
      auto image =
          acquire_presentation_image(interpolatedFrame, ctx.snapshotWidth, ctx.snapshotHeight);
-      encode_presentation_snapshot(encoder, ctx.presentSource, *image, true, ctx.metalfxEnabled);
+      encode_presentation_snapshot(encoder, ctx.presentSource, *image, true);
      presentationJobs.push_back({
          .image = std::move(image),
          .logicalFrame = ctx.logicalFrame,
@@ -1597,18 +1449,12 @@ std::vector<PresentationJob> encode_sealed_frame(gfx::SealedFrame& sealedFrame,
  // The copy targets now hold this frame's resolves, so queue their readbacks on the same encoder;
  // completion is harvested in gfx::after_submit, never waited on here.
  gfx::efb_ram::encode_async_downloads(encoder);
-  wgpu::BindGroup duplicatedMetalFXOutput;
  if (!ctx.replayInterpolatedFrames) {
    for (uint32_t interpolatedFrame = 0; interpolatedFrame < ctx.interpolatedFrameCount;
         ++interpolatedFrame) {
      auto image =
          acquire_presentation_image(interpolatedFrame, ctx.snapshotWidth, ctx.snapshotHeight);
-      const auto newMetalFXOutput = encode_presentation_snapshot(
-          encoder, ctx.presentSource, *image, true, ctx.metalfxEnabled,
-          duplicatedMetalFXOutput ? &duplicatedMetalFXOutput : nullptr);
-      if (!duplicatedMetalFXOutput && newMetalFXOutput) {
-        duplicatedMetalFXOutput = newMetalFXOutput;
-      }
+      encode_presentation_snapshot(encoder, ctx.presentSource, *image, true);
      presentationJobs.push_back({
          .image = std::move(image),
          .logicalFrame = ctx.logicalFrame,
@@ -1616,14 +1462,13 @@ std::vector<PresentationJob> encode_sealed_frame(gfx::SealedFrame& sealedFrame,
          .interpolated = true,
          .duplicated = true,
      });
-      submitEncodedSlot(encoder, false);
+      submitEncodedSlot(encoder);
      encoder = g_device.CreateCommandEncoder(&encoderDescriptor);
    }
  }
  auto finalImage =
      acquire_presentation_image(ctx.interpolatedFrameCount, ctx.snapshotWidth, ctx.snapshotHeight);
-  encode_presentation_snapshot(encoder, ctx.presentSource, *finalImage, true, ctx.metalfxEnabled,
-                               duplicatedMetalFXOutput ? &duplicatedMetalFXOutput : nullptr);
+  encode_presentation_snapshot(encoder, ctx.presentSource, *finalImage, true);
  auto pendingFrameCapture = encode_frame_capture(encoder, ctx.presentSource);
  presentationJobs.push_back({
      .image = std::move(finalImage),
@@ -1816,7 +1661,7 @@ bool run_frame_worker_cycle(gfx::SealedFrame& sealedFrame) noexcept {

 // Synchronous frame submission: seal, encode and present inline on the calling thread. Used when
 // the frame worker is disabled (RenderDoc captures) and on the boot path.
-void end_frame_impl(bool pumpEvents, bool drainFifo) {
+void end_frame_impl(bool pumpEvents, bool drainFifo) noexcept {
  ZoneScoped;
 #ifdef AURORA_ENABLE_GX
  webgpu::fail_if_device_lost();
@@ -1826,9 +1671,11 @@ void end_frame_impl(bool pumpEvents, bool drainFifo) {
  gfx::SealedFrame sealedFrame;
  SealedFrameContext ctx;
  std::vector<PresentationJob> presentationJobs;
-  if (drainFifo) gx::fifo::drain();
  {
    std::lock_guard gpuLock(g_rendererGpuMutex);
+    if (drainFifo) {
+      gx::fifo::drain();
+    }
    seal_frame_locked(sealedFrame, ctx);
    presentationJobs = encode_sealed_frame(sealedFrame, ctx);
  }
@@ -1905,7 +1752,7 @@ bool begin_frame() noexcept {
  return prepared;
 }

-void end_frame() {
+void end_frame() noexcept {
 #ifdef AURORA_ENABLE_GX
  webgpu::fail_if_device_lost();
 #endif
@@ -1921,7 +1768,10 @@ void end_frame() {

  // Seal all current GX work on the CPU while the renderer is known ready.
  // Later FIFO writes belong exclusively to the next frame.
-  gx::fifo::drain();
+  {
+    std::lock_guard gpuLock(g_rendererGpuMutex);
+    gx::fifo::drain();
+  }
  {
    std::lock_guard lock(g_frameWorker.mutex);
    g_frameWorker.framePrepared = false;
@@ -1947,10 +1797,6 @@ bool wait_for_frame_worker_for(std::chrono::microseconds timeout) noexcept {
  return wait_for_frame_worker_private_for(FrameWorkerPhase::Done, timeout);
 }
 std::recursive_mutex& renderer_gpu_mutex() noexcept { return g_rendererGpuMutex; }
-void submit_staging_commands(const wgpu::CommandBuffer& commands) {
-  std::lock_guard submitLock(g_queueSubmitMutex);
-  webgpu::g_queue.Submit(1, &commands);
-}
 } // namespace aurora

 // C API bindings
@@ -2013,6 +1859,10 @@ bool aurora_flush_efb_copies_to_ram() {
  if (!aurora::gfx::efb_ram::has_pending()) {
    return true;
  }
+  if (!aurora::gfx::efb_ram::prepare_downloads()) {
+    return false;
+  }
+
  // This finalizes the frame still being recorded, on the producer thread, so join the whole cycle
  // first: the encode phase owns the previous passes, EFB targets and image pool.
  aurora::wait_for_frame_worker();
@@ -2020,7 +1870,6 @@ bool aurora_flush_efb_copies_to_ram() {
  // suffix cannot safely be replayed against the same mutable EFB resources.
  aurora::gx::mark_frame_interpolation_replay_unsafe();
  aurora::gx::fifo::drain();
-  if (!aurora::gfx::efb_ram::prepare_downloads()) return false;
  const wgpu::CommandEncoderDescriptor encoderDescriptor{
      .label = "GX CPU-visible EFB copy encoder",
  };
@@ -2046,7 +1895,8 @@ bool aurora_flush_efb_copies_to_ram() {
 }
 bool aurora_flush_efb_copy_to_ram(void* dest) {
 #ifdef AURORA_ENABLE_GX
-  if (dest == nullptr || !aurora::gfx::efb_ram::has_pending(dest)) {
+  if (dest == nullptr || !aurora::gfx::efb_ram::has_pending(dest) ||
+      !aurora::gfx::efb_ram::prepare_downloads(dest)) {
    return false;
  }

@@ -2057,7 +1907,6 @@ bool aurora_flush_efb_copy_to_ram(void* dest) {
  // image instead of replaying this split frame.
  aurora::gx::mark_frame_interpolation_replay_unsafe();
  aurora::gx::fifo::drain();
-  if (!aurora::gfx::efb_ram::prepare_downloads(dest)) return false;
  const wgpu::CommandEncoderDescriptor encoderDescriptor{
      .label = "GX demanded EFB copy encoder",
  };
@@ -2099,7 +1948,3 @@ void aurora_set_background_input(bool value) {
 }
 void aurora_set_display_mode(AuroraDisplayMode mode) { aurora::window::set_display_mode(mode); }
 AuroraDisplayMode aurora_get_display_mode() { return aurora::window::get_display_mode(); }
-void aurora_set_metalfx_spatial(bool enabled) { aurora::g_metalfxRequested.store(enabled); }
-bool aurora_get_metalfx_spatial() { return aurora::g_metalfxRequested.load(); }
-bool aurora_is_metalfx_spatial_supported() { return aurora::g_metalfxSupported.load(); }
-AuroraMetalFXStatus aurora_get_metalfx_status() { return aurora::g_metalfxStatus.load(); }
@@ -2,43 +2,12 @@

 #import <Foundation/Foundation.h>
 #include <SDL3/SDL_metal.h>
-#include <SDL3/SDL_properties.h>
-#include <SDL3/SDL_video.h>

 namespace aurora::webgpu::utils {
-namespace {
-constexpr const char* MetalViewProperty = "aurora.window.metal_view";
-
-void SDLCALL DestroyMetalView(void*, void* value) {
-  SDL_Metal_DestroyView(value);
-}
-} // namespace
-
 std::shared_ptr<wgpu::ChainedStruct> SetupWindowAndGetSurfaceDescriptorCocoa(SDL_Window* window) {
-  const auto properties = SDL_GetWindowProperties(window);
-  if (!properties) {
-    return nullptr;
-  }
-  auto view = SDL_GetPointerProperty(properties, MetalViewProperty, nullptr);
-  if (!view) {
-    view = SDL_Metal_CreateView(window);
-    if (!view) {
-      return nullptr;
-    }
-    // Own one view per window, not per WebGPU surface. Surface recovery must
-    // preserve the UIKit root and its controls (and the Cocoa Metal subview).
-    // SDL cleans window properties before destroying its native window.
-    // The cleanup callback also runs if setting the property fails.
-    if (!SDL_SetPointerPropertyWithCleanup(properties, MetalViewProperty, view, DestroyMetalView, nullptr)) {
-      return nullptr;
-    }
-  }
-  auto desc = std::make_shared<wgpu::SurfaceSourceMetalLayer>();
+  SDL_MetalView view = SDL_Metal_CreateView(window);
+  std::shared_ptr<wgpu::SurfaceSourceMetalLayer> desc = std::make_shared<wgpu::SurfaceSourceMetalLayer>();
  desc->layer = SDL_Metal_GetLayer(view);
-  if (!desc->layer) {
-    SDL_ClearProperty(properties, MetalViewProperty);
-    return nullptr;
-  }
-  return desc;
+  return std::move(desc);
 }
 } // namespace aurora::webgpu::utils
@@ -46,7 +46,6 @@ void AuroraSetViewportPolicy(AuroraViewportPolicy policy) {
  }
  g_gxState.viewportPolicy = policy;
  aurora::window::set_frame_buffer_aspect_fit(policy == AURORA_VIEWPORT_FIT);
-  aurora::window::set_force_aspect_16_9(policy == AURORA_VIEWPORT_16_9);
  aurora::window::set_present_surface_fill(policy == AURORA_VIEWPORT_STRETCH);
  if (changed) {
    // Reapply the guest viewport and scissor after a resize.
@@ -66,7 +66,7 @@ void GXCallDisplayList(const void* data, u32 nbytes) {

  // Decode the display list immediately while its borrowed resources are valid.
  aurora::gx::fifo::drain();
-  aurora::gx::fifo::process_all(static_cast<const u8*>(data), nbytes, true);
+  aurora::gx::fifo::process(static_cast<const u8*>(data), nbytes, true);
 }

 void GXCallDisplayListLE(const void* data, u32 nbytes) {
@@ -84,6 +84,6 @@ void GXCallDisplayListLE(const void* data, u32 nbytes) {
  aurora::gx::fifo::drain();

  // Process the display list through the command processor (little-endian)
-  aurora::gx::fifo::process_all(static_cast<const u8*>(data), nbytes, false);
+  aurora::gx::fifo::process(static_cast<const u8*>(data), nbytes, false);
 }
 }
@@ -6,10 +6,10 @@
 #include <SDL3/SDL_mouse.h>
 #include <SDL3/SDL_joystick.h>

-#include <algorithm>
 #include <array>
 #include <atomic>
 #include <sys/stat.h>
+#include <ranges>

 namespace {
 constexpr int32_t k_mappingsFileVersion = 3;
@@ -319,18 +319,6 @@ std::array<bool, PAD_CHANMAX> g_suppressLeftTrigger{};
 std::array<bool, PAD_CHANMAX> g_suppressRightTrigger{};

 bool is_mouse_scancode(const s32 scancode) { return scancode < PAD_KEY_INVALID; }
-bool is_native_binding_pressed(SDL_Gamepad* gamepad, u32 binding) {
-  if (PADIsAxisButton(binding)) {
-    const u32 axis = PADAxisButtonAxis(binding);
-    const u32 threshold = PADAxisButtonThreshold(binding);
-    if (axis >= SDL_GAMEPAD_AXIS_COUNT || threshold < 1 || threshold > 100) return false;
-    int value = SDL_GetGamepadAxis(gamepad, static_cast<SDL_GamepadAxis>(axis));
-    if (PADAxisButtonNegative(binding)) value = -value;
-    return value > 0 && value * 100 >= static_cast<int>(threshold) * 32767;
-  }
-  return binding < SDL_GAMEPAD_BUTTON_COUNT &&
-         SDL_GetGamepadButton(gamepad, static_cast<SDL_GamepadButton>(binding));
-}
 bool is_mouse_button_pressed(const s32 scancode) {
  const int32_t buttonNum = -(scancode + 1);
  if (buttonNum < 1 || buttonNum > 5) {
@@ -354,7 +342,7 @@ BOOL PADInit() {
  }
  g_initialized = true;

-  std::for_each(g_keyboardBindings.begin(), g_keyboardBindings.end(), [](auto& state) {
+  std::ranges::for_each(g_keyboardBindings, [](auto& state) {
    state.m_buttonMapping = g_defaultKeys;
    state.m_axisMapping = g_defaultKeyAxis;
  });
@@ -399,20 +387,19 @@ const char* PADGetNameForControllerIndex(const u32 idx) {
 }

 void PADSetPortForIndex(const u32 idx, const u32 port) {
-  if (port >= PAD_MAX_CONTROLLERS) return;
  const auto* ctrl = __PADGetControllerForIndex(idx);
  if (ctrl == nullptr) {
    return;
  }

-  const int32_t oldPort = aurora::input::player_index(ctrl->m_index);
+  const int32_t oldPort = SDL_GetGamepadPlayerIndex(ctrl->m_controller);
  if (const auto* dest = aurora::input::get_controller_for_player(port); dest != nullptr && dest != ctrl) {
-    aurora::input::set_player_index(dest->m_index, -1);
+    SDL_SetGamepadPlayerIndex(dest->m_controller, -1);
  }
  if (oldPort >= 0 && oldPort != port) {
    aurora::input::persist_controller_for_player(oldPort, nullptr);
  }
-  aurora::input::set_player_index(ctrl->m_index, static_cast<Sint32>(port));
+  SDL_SetGamepadPlayerIndex(ctrl->m_controller, static_cast<Sint32>(port));
  aurora::input::persist_controller_for_player(port, ctrl);
 }

@@ -438,7 +425,7 @@ void PADClearPort(const u32 port) {
  if (ctrl == nullptr) {
    return;
  }
-  aurora::input::set_player_index(ctrl->m_index, -1);
+  SDL_SetGamepadPlayerIndex(ctrl->m_controller, -1);
 }

 // Secondary bindings live only in memory; the runtime re-applies them from its
@@ -647,8 +634,8 @@ static void EnsureMappingLoaded(aurora::input::GameController* controller) {

 static Sint16 _get_axis_value(const aurora::input::GameController* controller, //  NOLINT(*-reserved-identifier)
                              PADAxis axis) {
-  const auto iter = std::find_if(controller->m_axisMapping.begin(), controller->m_axisMapping.end(),
-                                 [axis](const auto& pair) { return pair.padAxis == axis; });
+  const auto iter =
+      std::ranges::find_if(controller->m_axisMapping, [axis](const auto& pair) { return pair.padAxis == axis; });
  if (iter == controller->m_axisMapping.end()) {
    return 0;
  }
@@ -737,10 +724,10 @@ u32 PADRead(PADStatus* status) {
    }

    status[i].err = PAD_ERR_NONE;
-    if (g_keyboardBindings[i].m_mappingsSet && SDL_GetKeyboardFocus() != nullptr) {
-      std::for_each(g_keyboardBindings[i].m_buttonMapping.begin(), g_keyboardBindings[i].m_buttonMapping.end(),
-                    [&kbState, &numKeys, &i, &status](const PADKeyButtonBinding& mapping) {
-            if (mapping.scancode > PAD_KEY_INVALID && mapping.scancode < numKeys && kbState[mapping.scancode]) {
+    if (g_keyboardBindings[i].m_mappingsSet) {
+      std::ranges::for_each(
+          g_keyboardBindings[i].m_buttonMapping, [&kbState, &i, &status](const PADKeyButtonBinding& mapping) {
+            if (mapping.scancode > PAD_KEY_INVALID && kbState[mapping.scancode]) {
              status[i].button |= mapping.padButton;
            } else if (is_mouse_scancode(mapping.scancode) && is_mouse_button_pressed(mapping.scancode)) {
              status[i].button |= mapping.padButton;
@@ -801,7 +788,7 @@ u32 PADRead(PADStatus* status) {
      status[i].triggerRight = static_cast<u8>(std::min(static_cast<int>(status[i].triggerRight) + tr, 255));
    }

-    if (controller && !g_keyboardBindings[i].m_mappingsSet) {
+    if (controller) {
      EnsureMappingLoaded(controller);

      // Wii U Pro Controller raw D-pad fallback. SDL's HIDAPI Wii driver posts
@@ -846,9 +833,9 @@ u32 PADRead(PADStatus* status) {

      bool leftTriggerSet = false;
      bool rightTriggerSet = false;
-      std::for_each(controller->m_buttonMapping.begin(), controller->m_buttonMapping.end(),
-                    [&controller, &i, &status, &leftTriggerSet, &rightTriggerSet](const auto& mapping) {
-        if (is_native_binding_pressed(controller->m_controller, mapping.nativeButton)) {
+      std::ranges::for_each(controller->m_buttonMapping, [&controller, &i, &status, &leftTriggerSet,
+                                                          &rightTriggerSet](const auto& mapping) {
+        if (SDL_GetGamepadButton(controller->m_controller, static_cast<SDL_GamepadButton>(mapping.nativeButton))) {
          status[i].button |= mapping.padButton;
        }

@@ -860,12 +847,12 @@ u32 PADRead(PADStatus* status) {
        }
      });

-      std::for_each(controller->m_altButtonMapping.begin(), controller->m_altButtonMapping.end(),
-                    [&controller, &i, &status, &leftTriggerSet, &rightTriggerSet](const auto& mapping) {
+      std::ranges::for_each(controller->m_altButtonMapping, [&controller, &i, &status, &leftTriggerSet,
+                                                             &rightTriggerSet](const auto& mapping) {
        if (mapping.nativeButton == PAD_NATIVE_BUTTON_INVALID) {
          return;
        }
-        if (is_native_binding_pressed(controller->m_controller, mapping.nativeButton)) {
+        if (SDL_GetGamepadButton(controller->m_controller, static_cast<SDL_GamepadButton>(mapping.nativeButton))) {
          status[i].button |= mapping.padButton;
        }

@@ -959,17 +946,6 @@ u32 PADRead(PADStatus* status) {
      Sint16 tl = std::max(static_cast<Sint16>(0), _get_axis_value(controller, PAD_AXIS_TRIGGER_L));
      Sint16 tr = std::max(static_cast<Sint16>(0), _get_axis_value(controller, PAD_AXIS_TRIGGER_R));

-      // Games can read either the digital L/R bits or their analog pressure.
-      // An explicit button binding must drive both, otherwise the original
-      // L2/R2 axis still activates L/R even when it was rebound to L1/R1.
-      // Real GC pads retain independent analog travel and end-stop clicks.
-      if (!(controller->m_isGameCube ||
-            (SDL_GetGamepadType(controller->m_controller) == SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO &&
-             controller->m_pid == 0x2073))) {
-        if (leftTriggerSet) tl = (status[i].button & PAD_TRIGGER_L) != 0 ? 32767 : 0;
-        if (rightTriggerSet) tr = (status[i].button & PAD_TRIGGER_R) != 0 ? 32767 : 0;
-      }
-
      if (controller->m_deadZones.emulateTriggers) {
        if (!leftTriggerSet && tl > controller->m_deadZones.leftTriggerActivationZone) {
          status[i].button |= PAD_TRIGGER_L;
@@ -1014,13 +990,12 @@ void PADControlMotor(const u32 chan, const u32 cmd) {
  }

  if (controller->m_isGameCube) {
-    if (cmd == PAD_MOTOR_STOP || cmd == PAD_MOTOR_STOP_HARD) {
-      // Use an unambiguous motor-off request. The (0, 1) coast encoding
-      // requires SDL's GameCube brake mode; other backends or an overridden
-      // hint interpret it as rumble and can leave the controller vibrating.
-      aurora::input::controller_rumble(instance, 0, 0, 0);
+    if (cmd == PAD_MOTOR_STOP) {
+      aurora::input::controller_rumble(instance, 0, 1, 0);
    } else if (cmd == PAD_MOTOR_RUMBLE) {
      aurora::input::controller_rumble(instance, 1, 1, 0);
+    } else if (cmd == PAD_MOTOR_STOP_HARD) {
+      aurora::input::controller_rumble(instance, 0, 0, 0);
    }
  } else {
    if (cmd == PAD_MOTOR_STOP) {
@@ -1190,8 +1165,8 @@ void PADSetButtonMapping(const u32 port, const PADButtonMapping mapping) {
    return;
  }

-  const auto iter = std::find_if(controller->m_buttonMapping.begin(), controller->m_buttonMapping.end(),
-                                 [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
+  const auto iter = std::ranges::find_if(controller->m_buttonMapping,
+                                         [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
  if (iter == controller->m_buttonMapping.end()) {
    return;
  }
@@ -1224,8 +1199,8 @@ void PADSetAltButtonMapping(const u32 port, const PADButtonMapping mapping) {
    return;
  }

-  const auto iter = std::find_if(controller->m_altButtonMapping.begin(), controller->m_altButtonMapping.end(),
-                                 [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
+  const auto iter = std::ranges::find_if(controller->m_altButtonMapping,
+                                         [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
  if (iter == controller->m_altButtonMapping.end()) {
    return;
  }
@@ -1251,8 +1226,8 @@ void PADSetAxisMapping(const u32 port, const PADAxisMapping mapping) {
    return;
  }

-  const auto iter = std::find_if(controller->m_axisMapping.begin(), controller->m_axisMapping.end(),
-                                 [mapping](const auto& pair) { return mapping.padAxis == pair.padAxis; });
+  const auto iter = std::ranges::find_if(controller->m_axisMapping,
+                                         [mapping](const auto& pair) { return mapping.padAxis == pair.padAxis; });
  if (iter == controller->m_axisMapping.end()) {
    return;
  }
@@ -1303,11 +1278,6 @@ BOOL PADSetKeyButtonBindings(const u32 port, PADKeyButtonBinding bindings[PAD_BU
 }

 PADKeyButtonBinding* PADGetKeyButtonBindings(const u32 port, u32* buttonCount) {
-  PADInit();
-  if (!g_keyboardBindingsLoaded) {
-    g_keyboardBindingsLoaded = true;
-    load_keyboard_bindings();
-  }
  if (port >= PAD_MAX_CONTROLLERS || !g_keyboardBindings[port].m_mappingsSet) {
    return nullptr;
  }
@@ -1426,10 +1396,9 @@ static void load_keyboard_bindings() {

    if (mappingsSet) {
      const bool anyBound =
-          std::any_of(buttonMapping.begin(), buttonMapping.end(),
-                      [](const PADKeyButtonBinding& b) { return b.scancode != PAD_KEY_INVALID; }) ||
-          std::any_of(axisMapping.begin(), axisMapping.end(),
-                      [](const PADKeyAxisBinding& b) { return b.scancode != PAD_KEY_INVALID; });
+          std::ranges::any_of(buttonMapping,
+                              [](const PADKeyButtonBinding& b) { return b.scancode != PAD_KEY_INVALID; }) ||
+          std::ranges::any_of(axisMapping, [](const PADKeyAxisBinding& b) { return b.scancode != PAD_KEY_INVALID; });
      if (!anyBound) {
        mappingsSet = false;
      }
@@ -1469,10 +1438,7 @@ void __PADWriteDeadZones(SDL_IOStream* file, // NOLINT(*-reserved-identifier)
 void PADSerializeMappings() {
  const std::filesystem::path basePath = fs_path_from_string(aurora::g_config.userPath);

-  // Avoid std::views::values here: older Apple libc++ releases implement the
-  // C++20 ranges algorithms we use but not this adaptor.
-  for (auto& entry : aurora::input::g_GameControllers) {
-    auto& controller = entry.second;
+  for (auto& controller : aurora::input::g_GameControllers | std::views::values) {
    EnsureMappingLoaded(&controller);
    const auto filePath =
        basePath / fmt::format("{}_{:04X}_{:04X}.controller", aurora::input::controller_name(controller.m_index),
@@ -1574,8 +1540,8 @@ static constexpr std::array<std::pair<PADButton, std::string_view>, PAD_AXIS_COU

 const char* PADGetButtonName(const PADButton button) {

-  if (const auto iter = std::find_if(skButtonNames.begin(), skButtonNames.end(),
-                                     [&button](const auto& pair) { return button == pair.first; });
+  if (const auto iter =
+          std::ranges::find_if(skButtonNames, [&button](const auto& pair) { return button == pair.first; });
      iter != skButtonNames.end()) {
    return iter->second.data();
  }
@@ -1588,8 +1554,7 @@ const char* PADGetNativeButtonName(u32 button) {
 }

 const char* PADGetAxisName(const PADAxis axis) {
-  if (const auto it = std::find_if(skAxisNames.begin(), skAxisNames.end(),
-                                   [&axis](const auto& pair) { return axis == pair.first; });
+  if (const auto it = std::ranges::find_if(skAxisNames, [&axis](const auto& pair) { return axis == pair.first; });
      it != skAxisNames.end()) {
    return it->second.data();
  }
@@ -1598,8 +1563,7 @@ const char* PADGetAxisName(const PADAxis axis) {
 }

 const char* PADGetAxisDirectionLabel(const PADAxis axis) {
-  if (const auto it = std::find_if(skAxisDirLabels.begin(), skAxisDirLabels.end(),
-                                   [&axis](const auto& pair) { return axis == pair.first; });
+  if (const auto it = std::ranges::find_if(skAxisDirLabels, [&axis](const auto& pair) { return axis == pair.first; });
      it != skAxisDirLabels.end()) {
    return it->second.data();
  }
@@ -1663,6 +1627,8 @@ void PADBlockInput(const bool block) {
  }
 }

+bool PADIsInputBlocked() { return g_blockPAD.load(std::memory_order_acquire); }
+

 SDL_Gamepad* PADGetSDLGamepadForIndex(const u32 index) {
  const auto* ctrl = __PADGetControllerForIndex(index);
@@ -7,13 +7,11 @@
 #include <algorithm>
 #include <atomic>
 #include <optional>
-#include <mutex>

 namespace aurora::vi {
 std::optional<GXRenderModeObj> g_renderMode;
 namespace {
 std::atomic<float> g_presentAspectCorrection{1.f};
-std::mutex g_renderModeMutex;

 float calculate_present_aspect_correction(const GXRenderModeObj& rm) noexcept {
  if (rm.viWidth == 0 || rm.viHeight == 0) {
@@ -31,8 +29,9 @@ float calculate_present_aspect_correction(const GXRenderModeObj& rm) noexcept {
  const float verticalFill = static_cast<float>(rm.viHeight) / nominalActiveHeight;
  return horizontalFill / verticalFill;
 }
+} // namespace

-Vec2<uint32_t> render_mode_size_locked() noexcept {
+Vec2<uint32_t> render_mode_size() noexcept {
  if (!g_renderMode) {
    return {640, 528};
  }
@@ -41,31 +40,18 @@ Vec2<uint32_t> render_mode_size_locked() noexcept {
  return {std::max<uint32_t>(g_renderMode->fbWidth, 640), std::max<uint32_t>(g_renderMode->efbHeight, 528)};
 }

-} // namespace
-
-Vec2<uint32_t> render_mode_size() noexcept {
-  std::lock_guard lock(g_renderModeMutex);
-  return render_mode_size_locked();
-}
-
 void configure(const GXRenderModeObj* rm) noexcept {
-  bool sizeChanged = false;
-  {
-    std::lock_guard lock(g_renderModeMutex);
-    const auto oldSize = render_mode_size_locked();
-    if (rm == nullptr) {
-      g_renderMode.reset();
-    } else {
-      g_renderMode = *rm;
-      g_presentAspectCorrection.store(calculate_present_aspect_correction(*rm), std::memory_order_release);
-    }
-    if (rm == nullptr) {
-      g_presentAspectCorrection.store(1.f, std::memory_order_release);
-    }
-    sizeChanged = render_mode_size_locked() != oldSize;
+  const auto oldSize = render_mode_size();
+  if (rm == nullptr) {
+    g_renderMode.reset();
+  } else {
+    g_renderMode = *rm;
+    g_presentAspectCorrection.store(calculate_present_aspect_correction(*rm), std::memory_order_release);
  }
-  // Never hold the mode lock across a resize request or a renderer callback.
-  if (sizeChanged) {
+  if (rm == nullptr) {
+    g_presentAspectCorrection.store(1.f, std::memory_order_release);
+  }
+  if (render_mode_size() != oldSize) {
    window::request_frame_buffer_resize();
  }
 }
@@ -75,7 +61,6 @@ Vec2<uint32_t> configured_fb_size() noexcept {
 }

 Vec2<uint32_t> visible_fb_size() noexcept {
-  std::lock_guard lock(g_renderModeMutex);
  if (!g_renderMode) {
    return {640, 528};
  }
@@ -1,5 +1,4 @@
 #include "common.hpp"
-#include "staging_map.hpp"
 #include "../gx/shader_info.hpp"

 #include "clear.hpp"
@@ -23,6 +22,7 @@
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <ranges>

 #include <absl/container/flat_hash_map.h>
 #include <magic_enum.hpp>
@@ -36,13 +36,10 @@ using webgpu::g_device;
 using webgpu::g_instance;
 using webgpu::g_queue;

-struct DebugFrameData {
 #ifdef AURORA_GFX_DEBUG_GROUPS
-  std::vector<std::string> groups;
-  std::vector<std::string> markers;
+std::vector<std::string> g_debugGroupStack;
+std::vector<std::string> g_debugMarkers;
 #endif
-};
-DebugFrameData g_debugFrame;

 constexpr uint64_t StagingBufferSize = UniformBufferSize + VertexBufferSize + IndexBufferSize + StorageBufferSize +
                                       (UseTextureBuffer ? TextureUploadSize : 0);
@@ -131,7 +128,12 @@ wgpu::Buffer g_storageBuffer;
 constexpr size_t FrameSlotCount = 3;
 static std::array<wgpu::Buffer, FrameSlotCount> g_stagingBuffers;
 static size_t currentStagingBuffer = 0;
-static StagingMapState s_mappingState;
+enum class BufferMapState {
+  Unmapped,
+  Mapping,
+  Mapped,
+};
+static std::atomic s_mappingState{BufferMapState::Unmapped};
 static wgpu::Limits g_cachedLimits;
 // Advanced once per logical frame in the seal prologue, under the renderer GPU mutex and with the
 // producer blocked, so every later reader sees a value that no longer moves.
@@ -166,12 +168,7 @@ struct RenderPass {
  Range resolveUniformRange;
  std::array<u32, 3> resolveCopyFilterCoefficients{0, 64, 0};
  Vec4<float> clearColorValue{0.f, 0.f, 0.f, 0.f};
-  // 1.f is the forward-Z "farthest" clear value; under UseReversedZ farthest is 0.f instead (see
-  // gx::clear_depth_value(), which the main render pass explicitly overrides this default with -
-  // any OTHER pass that keeps this default, e.g. an offscreen render-to-texture pass composited
-  // later, needs the same reversed-Z-aware value or its depth buffer starts "already nearest",
-  // failing every subsequent depth test and making whatever's drawn into it vanish).
-  float clearDepthValue = gx::UseReversedZ ? 0.f : 1.f;
+  float clearDepthValue = 1.f;
  CommandList commands;
  bool clearColor = true;
  bool clearDepth = true;
@@ -232,8 +229,6 @@ static void recycle_render_passes(std::vector<RenderPass>& passes) noexcept {
 }

 struct SealedFrameData {
-  depth_peek::FrameMapping depthMapping;
-  DebugFrameData debug;
  std::vector<RenderPass> passes;
 };

@@ -255,51 +250,6 @@ static std::atomic_bool g_inOffscreen{false};
 static std::optional<RenderPass> g_suspendedEfbPass;
 static Viewport g_suspendedEfbViewport;
 static ClipRect g_suspendedEfbScissor;
-// Prefix referenced by a suspended EFB pass. Preserve its offsets across an
-// offscreen split, without rendering it before the bake it may sample finishes.
-static StagingSizes g_suspendedEfbBytes{};
-static constexpr StagingSizes PhysicalStagingCapacity{
-    VertexBufferSize, UniformBufferSize, IndexBufferSize, StorageBufferSize};
-static StagingSizes g_stagingCapacity = PhysicalStagingCapacity;
-static uint64_t g_stagingEpoch = 0;
-static uint64_t g_stagingSplitCount = 0;
-static StagingSizes g_stagingHighWater{};
-
-StagingSizes staging_usage() noexcept {
-  return {g_verts.size(), g_uniforms.size(), g_indices.size(), g_storage.size()};
-}
-StagingSizes staging_high_water() noexcept { return g_stagingHighWater; }
-uint64_t staging_epoch() noexcept { return g_stagingEpoch; }
-uint64_t staging_split_count() noexcept { return g_stagingSplitCount; }
-uint64_t staging_uniform_bytes(uint64_t bytes) {
-  return staging_padded(bytes, g_cachedLimits.minUniformBufferOffsetAlignment);
-}
-uint64_t staging_storage_bytes(uint64_t bytes) {
-  return staging_padded(bytes, g_cachedLimits.minStorageBufferOffsetAlignment);
-}
-void set_staging_capacity_limits_for_testing(const StagingSizes& limits) {
-  for (unsigned i = 0; i < limits.size(); ++i) {
-    if (limits[i] > PhysicalStagingCapacity[i])
-      throw StagingCapacityError("Test staging capacity exceeds physical buffer");
-  }
-  g_stagingCapacity = limits;
-  g_stagingHighWater = {};
-}
-bool staging_has_space(const StagingSizes& demand) {
-  // Async readback preparation runs in the worker's noexcept seal prologue.
-  // Reserve all 32 slots plus the uniform binding's 3840-byte trailing window.
-  const StagingSizes tail{0, gx::MaxUniformSize + efb_ram::MaxAsyncReadbackSlots * staging_uniform_bytes(48), 0, 0};
-  const StagingSizes retained = g_suspendedEfbPass ? g_suspendedEfbBytes : StagingSizes{};
-  if (!staging_fits(retained, demand, tail, g_stagingCapacity))
-    throw StagingCapacityError("GPU operation exceeds staging capacity including retained EFB data");
-  return staging_fits(staging_usage(), demand, tail, g_stagingCapacity);
-}
-void ensure_staging_space(const StagingSizes& demand) {
-  if (staging_has_space(demand)) return;
-  split_staging_batch();
-  if (!staging_has_space(demand))
-    throw StagingCapacityError("GPU operation still exceeds staging capacity after submission");
-}

 static void discard_suspended_efb_pass() noexcept {
  if (g_suspendedEfbPass) {
@@ -324,8 +274,7 @@ static size_t g_recordingSnapshotSlot = 0;
 static TextureHandle new_resolve_source_snapshot(wgpu::Extent3D size, wgpu::TextureFormat format) noexcept {
  const wgpu::TextureDescriptor textureDescriptor{
      .label = "GX Copy Source Snapshot",
-      .usage = wgpu::TextureUsage::TextureBinding | wgpu::TextureUsage::CopySrc |
-               wgpu::TextureUsage::CopyDst,
+      .usage = wgpu::TextureUsage::TextureBinding | wgpu::TextureUsage::CopyDst,
      .dimension = wgpu::TextureDimension::e2D,
      .size = size,
      .format = format,
@@ -471,7 +420,7 @@ static inline void push_command(CommandType type, const Command::Data& data) {
  g_renderPasses[g_currentRenderPass].commands.push_back({
      .type = type,
 #ifdef AURORA_GFX_DEBUG_GROUPS
-      .debugGroupStack = g_debugFrame.groups,
+      .debugGroupStack = g_debugGroupStack,
 #endif
      .data = data,
  });
@@ -531,7 +480,6 @@ void set_scissor(const ClipRect& cmd) noexcept {
 template <>
 void push_draw_command(clear::DrawData data) {
  if (data.uniformRange.size == 0) {
-    ensure_staging_space({0, staging_uniform_bytes(16), 0, 0});
    const std::array clearUniform{
        std::clamp(data.depth, 0.f, 1.f),
        0.f,
@@ -558,7 +506,6 @@ void resolve_pass(TextureHandle texture, ClipRect rect, bool clearColor, bool cl
    Log.warn("Dropping resolve pass without an active render pass");
    return;
  }
-  ensure_staging_space({0, 2 * staging_uniform_bytes(48), 0, 0});
  auto& prevPass = g_renderPasses[g_currentRenderPass];
  const auto targetWidth = static_cast<int32_t>(prevPass.targetSize.width);
  const auto targetHeight = static_cast<int32_t>(prevPass.targetSize.height);
@@ -591,7 +538,7 @@ void resolve_pass(TextureHandle texture, ClipRect rect, bool clearColor, bool cl
    sourceRect = {srcLeft, srcTop, std::max(srcRight - srcLeft, 1.0f), std::max(srcBottom - srcTop, 1.0f)};
  }
  prevPass.resolveTarget = std::move(texture);
-  prevPass.requireReadyPipelines |= persistentCopy;
+  prevPass.requireReadyPipelines = persistentCopy;
  prevPass.resolveRect = rect;
  prevPass.resolveSourceRect = sourceRect;
  prevPass.resolveFormat = resolveFormat;
@@ -787,7 +734,6 @@ void begin_offscreen(uint32_t width, uint32_t height) {
  if (!g_inOffscreen) {
    auto& currentPass = g_renderPasses[g_currentRenderPass];
    if (!currentPass.resolveTarget) {
-      g_suspendedEfbBytes = staging_usage();
      g_suspendedEfbPass = std::move(currentPass);
      g_renderPasses.pop_back();
      --g_currentRenderPass;
@@ -811,9 +757,7 @@ void begin_offscreen(uint32_t width, uint32_t height) {
      .targetSize = {width, height, 1},
      .msaaSamples = 1,
      .clearColorValue = {0.f, 0.f, 0.f, 0.f},
-      // See the RenderPass::clearDepthValue default's comment: this offscreen pass gets its own
-      // depth buffer, and the farthest clear value is 0.f, not 1.f, under UseReversedZ.
-      .clearDepthValue = gx::UseReversedZ ? 0.f : 1.f,
+      .clearDepthValue = 1.f,
      .clearColor = true,
      .clearDepth = true,
  };
@@ -900,7 +844,7 @@ void initialize() {
                 label.c_str());
  }
  currentStagingBuffer = 0;
-  s_mappingState.reset();
+  s_mappingState.store(BufferMapState::Unmapped, std::memory_order_release);
  map_staging_buffer();

  {
@@ -1006,8 +950,6 @@ void shutdown() {
  g_uniformBuffer = {};
  g_indexBuffer = {};
  g_storageBuffer = {};
-  // Invalidate outstanding callbacks before releasing their buffers.
-  s_mappingState.reset();
  g_stagingBuffers.fill({});
  for (auto& pool : g_resolveSourceSnapshotPools) {
    pool.entry.reset();
@@ -1026,36 +968,37 @@ void shutdown() {
  g_inOffscreen = false;
  g_frameIndex = UINT32_MAX;
  currentStagingBuffer = 0;
+  s_mappingState.store(BufferMapState::Unmapped, std::memory_order_release);
 }

 void map_staging_buffer() {
-  const auto generation = s_mappingState.request();
-  if (generation == 0) {
+  auto expected = BufferMapState::Unmapped;
+  if (!s_mappingState.compare_exchange_strong(expected, BufferMapState::Mapping, std::memory_order_acq_rel,
+                                              std::memory_order_acquire)) {
    return;
  }

  g_stagingBuffers[currentStagingBuffer].MapAsync(
      wgpu::MapMode::Write, 0, StagingBufferSize, wgpu::CallbackMode::AllowSpontaneous,
-      [generation](wgpu::MapAsyncStatus status, wgpu::StringView message) {
-        const auto result = status == wgpu::MapAsyncStatus::Success
-            ? BufferMapState::Mapped : BufferMapState::Unmapped;
-        if (!s_mappingState.complete(generation, result)) return;
+      [](wgpu::MapAsyncStatus status, wgpu::StringView message) {
        if (status == wgpu::MapAsyncStatus::CallbackCancelled || status == wgpu::MapAsyncStatus::Aborted) {
          Log.warn("Buffer mapping {}: {}", magic_enum::enum_name(status), message);
+          s_mappingState.store(BufferMapState::Unmapped, std::memory_order_release);
          return;
        }
        ASSERT(status == wgpu::MapAsyncStatus::Success, "Buffer mapping failed: {} {}", magic_enum::enum_name(status),
               message);
+        s_mappingState.store(BufferMapState::Mapped, std::memory_order_release);
      });
 }

-static bool begin_frame_impl(bool clearEfb, bool capacityResume = false) {
+static bool begin_frame_impl(bool clearEfb) {
  ZoneScoped;
  {
    ZoneScopedN("Wait for buffer map");
    map_staging_buffer();
    while (true) {
-      const auto mappingState = s_mappingState.state();
+      const auto mappingState = s_mappingState.load(std::memory_order_acquire);
      if (mappingState == BufferMapState::Mapped) {
        break;
      }
@@ -1071,11 +1014,8 @@ static bool begin_frame_impl(bool clearEfb, bool capacityResume = false) {
        return false;
      }
      g_instance.ProcessEvents();
-      webgpu::fail_if_device_lost();
-      s_mappingState.wait_for_progress();
    }
  }
-  ++g_stagingEpoch;
  g_recordingSnapshotSlot = currentStagingBuffer;
  size_t bufferOffset = 0;
  const auto& stagingBuf = g_stagingBuffers[currentStagingBuffer];
@@ -1100,7 +1040,7 @@ static bool begin_frame_impl(bool clearEfb, bool capacityResume = false) {
    gx::begin_frame_interpolation();
  }
  discard_suspended_efb_pass();
-  if (!capacityResume) webgpu::clear_present_source_override();
+  webgpu::clear_present_source_override();

  push_render_pass(RenderPass{});
  set_efb_targets(g_renderPasses[0]);
@@ -1139,12 +1079,12 @@ void abort_frame() noexcept {
    g_textureUploads.clear();
    g_textureUpload.release();
  }
-  if (s_mappingState.state() == BufferMapState::Mapped) {
+  if (s_mappingState.load(std::memory_order_acquire) == BufferMapState::Mapped) {
    // Pending interpolation tasks hold raw pointers into the mapped staging
    // range; they must be dropped before the buffer is unmapped and rotated.
    gx::drop_pending_frame_interpolation_uniforms();
    g_stagingBuffers[currentStagingBuffer].Unmap();
-    s_mappingState.reset();
+    s_mappingState.store(BufferMapState::Unmapped, std::memory_order_release);
    currentStagingBuffer = (currentStagingBuffer + 1) % g_stagingBuffers.size();
    map_staging_buffer();
  }
@@ -1161,7 +1101,7 @@ void abort_frame() noexcept {

 static void end_batch_impl(const wgpu::CommandEncoder& cmd, bool advanceFrame) {
  ZoneScoped;
-  ASSERT(!advanceFrame || !g_inOffscreen, "end_frame called while offscreen rendering is active");
+  ASSERT(!g_inOffscreen, "end_frame called while offscreen rendering is active");
  if (advanceFrame) {
    gx::finalize_frame_interpolation();
  } else {
@@ -1170,8 +1110,6 @@ static void end_batch_impl(const wgpu::CommandEncoder& cmd, bool advanceFrame) {
    gx::drop_pending_frame_interpolation_uniforms();
  }
  g_uniforms.append_zeroes(gx::MaxUniformSize); // Pad the end of the buffer
-  const auto used = staging_usage();
-  for (unsigned i = 0; i < used.size(); ++i) g_stagingHighWater[i] = std::max(g_stagingHighWater[i], used[i]);
  uint64_t bufferOffset = 0;
  const auto writeBuffer = [&](ByteBuffer& buf, wgpu::Buffer& out, uint64_t size, std::string_view label) {
    const auto writeSize = buf.size(); // Only need to copy this many bytes
@@ -1183,7 +1121,7 @@ static void end_batch_impl(const wgpu::CommandEncoder& cmd, bool advanceFrame) {
    return writeSize;
  };
  g_stagingBuffers[currentStagingBuffer].Unmap();
-  s_mappingState.reset();
+  s_mappingState.store(BufferMapState::Unmapped, std::memory_order_release);
  g_stats.drawCallCount = g_drawCallCount;
  g_stats.mergedDrawCallCount = g_mergedDrawCallCount;
  g_stats.lastVertSize = writeBuffer(g_verts, g_vertexBuffer, VertexBufferSize, "Vertex");
@@ -1226,63 +1164,6 @@ void end_frame(const wgpu::CommandEncoder& cmd) { end_batch_impl(cmd, true); }

 void end_batch(const wgpu::CommandEncoder& cmd) { end_batch_impl(cmd, false); }

-void split_staging_batch() {
-  // Never called under the decoder's renderer lock: the worker needs that lock
-  // to reach DONE. FIFO admission yields its unconsumed command first.
-  aurora::wait_for_frame_worker();
-  std::lock_guard gpuLock(aurora::renderer_gpu_mutex());
-  if (!has_current_render_pass())
-    throw StagingCapacityError("Cannot split staging outside an active render pass");
-  gx::mark_frame_interpolation_replay_unsafe();
-  const bool offscreen = g_inOffscreen;
-  const auto viewport = g_cachedViewport;
-  const auto scissor = g_cachedScissor;
-  const auto renderViewport = gx::g_gxState.renderViewport;
-  const auto renderScissor = gx::g_gxState.renderScissor;
-  const auto& active = g_renderPasses[g_currentRenderPass];
-  RenderPass continuation{
-      .colorView = active.colorView, .resolveView = active.resolveView,
-      .depthView = active.depthView, .copySourceTexture = active.copySourceTexture,
-      .copySourceView = active.copySourceView, .copySourceDepthView = active.copySourceDepthView,
-      .targetSize = active.targetSize, .msaaSamples = active.msaaSamples,
-      .clearColor = false, .clearDepth = false,
-      .requireReadyPipelines = active.requireReadyPipelines || offscreen,
-  };
-  auto suspended = std::move(g_suspendedEfbPass);
-  g_suspendedEfbPass.reset();
-  std::array<std::vector<uint8_t>, 4> retained;
-  std::array<ByteBuffer*, 4> buffers{&g_verts, &g_uniforms, &g_indices, &g_storage};
-  if (suspended) {
-    for (unsigned i = 0; i < buffers.size(); ++i) {
-      if (g_suspendedEfbBytes[i])
-        retained[i].assign(buffers[i]->data(), buffers[i]->data() + g_suspendedEfbBytes[i]);
-    }
-  }
-  auto encoder = g_device.CreateCommandEncoder();
-  end_batch(encoder);
-  render(encoder);
-  aurora::submit_staging_commands(encoder.Finish());
-  after_submit();
-  if (!begin_frame_impl(false, true))
-    throw StagingCapacityError("Staging remap failed after capacity submission");
-  recycle_render_passes(g_renderPasses);
-  push_render_pass(std::move(continuation));
-  g_currentRenderPass = 0;
-  g_suspendedEfbPass = std::move(suspended);
-  for (unsigned i = 0; i < buffers.size(); ++i) {
-    if (!retained[i].empty()) buffers[i]->append(retained[i].data(), retained[i].size());
-  }
-  g_inOffscreen = offscreen;
-  g_cachedViewport = viewport;
-  g_cachedScissor = scissor;
-  gx::g_gxState.renderViewport = renderViewport;
-  gx::g_gxState.renderScissor = renderScissor;
-  gx::g_gxState.stateDirty = true;
-  push_command(CommandType::SetViewport, Command::Data{.setViewport = viewport});
-  push_command(CommandType::SetScissor, Command::Data{.setScissor = scissor});
-  ++g_stagingSplitCount;
-}
-
 uint32_t current_frame() noexcept { return g_frameIndex; }

 // The only place that erases from g_cachedBindGroups, whose handles the frame being encoded still
@@ -1315,10 +1196,10 @@ static const char* render_pass_label(u32 index) noexcept {
 }

 static void render_pass_impl(const wgpu::RenderPassEncoder& pass, const std::vector<RenderPass>& passes, u32 idx,
-                             int32_t interpolatedFrame, DebugFrameData& debugFrame);
+                             int32_t interpolatedFrame);

 static void render_impl(std::vector<RenderPass>& renderPasses, wgpu::CommandEncoder& cmd, int32_t interpolatedFrame,
-                        bool finalize, DebugFrameData& debugFrame, const depth_peek::FrameMapping& depthMapping) {
+                        bool finalize) {
  ZoneScoped;
  // Palette conversions, MSAA resolves and EFB copies depend on sealed frame state, not on the
  // interpolation weight, so encode them on the native render and let replay slots sample them.
@@ -1368,11 +1249,11 @@ static void render_impl(std::vector<RenderPass>& renderPasses, wgpu::CommandEnco
    };

    auto pass = cmd.BeginRenderPass(&renderPassDescriptor);
-    render_pass_impl(pass, renderPasses, i, interpolatedFrame, debugFrame);
+    render_pass_impl(pass, renderPasses, i, interpolatedFrame);
    pass.End();

    if (finalize && i == renderPasses.size() - 1) {
-      depth_peek::encode_frame_snapshot(cmd, passInfo.copySourceDepthView, passInfo.targetSize, passInfo.msaaSamples, depthMapping);
+      depth_peek::encode_frame_snapshot(cmd, passInfo.copySourceDepthView, passInfo.targetSize, passInfo.msaaSamples);
    }

    if (passInfo.resolveTarget) {
@@ -1446,21 +1327,20 @@ static void render_impl(std::vector<RenderPass>& renderPasses, wgpu::CommandEnco
  }

 #if defined(AURORA_GFX_DEBUG_GROUPS)
-  if (finalize && !debugFrame.groups.empty()) {
-    for (auto it = debugFrame.groups.rbegin(); it != debugFrame.groups.rend(); ++it) {
-      Log.warn("Debug group was not popped at end of frame: {}", *it);
+  if (finalize && !g_debugGroupStack.empty()) {
+    for (auto& it : std::ranges::reverse_view(g_debugGroupStack)) {
+      Log.warn("Debug group was not popped at end of frame: {}", it);
    }
-    debugFrame.groups.clear();
+    g_debugGroupStack.clear();
  }

-  if (finalize && debugFrame.markers.size() > 0) {
-    debugFrame.markers.clear();
+  if (finalize && g_debugMarkers.size() > 0) {
+    g_debugMarkers.clear();
  }
 #endif
 }

 void seal_frame(SealedFrame& out) noexcept {
-  out.data().depthMapping = depth_peek::capture_frame_mapping();
  ZoneScoped;
  // The encode that could still have been holding these has completed: the
  // producer joins the worker's DONE phase before it seals another frame.
@@ -1470,24 +1350,15 @@ void seal_frame(SealedFrame& out) noexcept {
  // capacity included, back to the producer.
  recycle_render_passes(passes);
  passes.swap(g_renderPasses);
-#ifdef AURORA_GFX_DEBUG_GROUPS
-  // Marker indices and unmatched-group warnings belong to these detached passes.
-  // The next producer frame must not modify strings still read by this encoder.
-  auto& debug = out.data().debug;
-  debug.groups.clear();
-  debug.markers.clear();
-  debug.groups.swap(g_debugFrame.groups);
-  debug.markers.swap(g_debugFrame.markers);
-#endif
  g_currentRenderPass = UINT32_MAX;
 }

 void render(SealedFrame& frame, wgpu::CommandEncoder& cmd, int32_t interpolatedFrame, bool finalize) {
-  render_impl(frame.data().passes, cmd, interpolatedFrame, finalize, frame.data().debug, frame.data().depthMapping);
+  render_impl(frame.data().passes, cmd, interpolatedFrame, finalize);
 }

 void render(wgpu::CommandEncoder& cmd, int32_t interpolatedFrame, bool finalize) {
-  render_impl(g_renderPasses, cmd, interpolatedFrame, finalize, g_debugFrame, depth_peek::capture_frame_mapping());
+  render_impl(g_renderPasses, cmd, interpolatedFrame, finalize);
  if (finalize) {
    g_currentRenderPass = UINT32_MAX;
    expire_bind_group_cache();
@@ -1505,7 +1376,7 @@ void after_submit() noexcept {
 }

 static void render_pass_impl(const wgpu::RenderPassEncoder& pass, const std::vector<RenderPass>& renderPasses, u32 idx,
-                             int32_t interpolatedFrame, DebugFrameData& debugFrame) {
+                             int32_t interpolatedFrame) {
  // Per-invocation, not per-process: two encoders can be recording at once.
  gx::DrawEncodeState encodeState{};
  encodeState.boundTextureBindGroup = gx::g_emptyTextureBindGroup.Get();
@@ -1539,19 +1410,10 @@ static void render_pass_impl(const wgpu::RenderPassEncoder& pass, const std::vec
    switch (cmd.type) {
    case CommandType::SetViewport: {
      const auto& vp = cmd.data.setViewport;
-      // WebGPU requires 0 <= minDepth <= maxDepth <= 1. vp.znear/vp.zfar are in GX's own distance
-      // terms (0 = near); under UseReversedZ the host depth-buffer storage direction is flipped
-      // (near = 1, far = 0), so this range has to be remapped through 1-x the same way the
-      // projection matrix, depth compare function, and clear value all are - a plain min/max clamp
-      // (the previous code here) maps a *restricted* range (e.g. a viewport deliberately narrowed
-      // to force something to draw "in front of everything") to the wrong end of the buffer: what
-      // should land near the near-storage-extreme (1.0) instead lands near the far-storage-extreme
-      // (0.0), so anything else drawn afterward at its true depth wins the compare test and the
-      // "in front" geometry silently vanishes. A full [0,1] viewport is unaffected either way,
-      // which is why this only broke specific elements, not the whole scene. Matches upstream
-      // aurora's apply_viewport (lib/gfx/encoding.cpp) exactly.
-      const float minDepth = gx::UseReversedZ ? 1.0f - vp.zfar : vp.znear;
-      const float maxDepth = gx::UseReversedZ ? 1.0f - vp.znear : vp.zfar;
+      // WebGPU requires 0 <= minDepth <= maxDepth <= 1, and the guest's (near, far) order is already
+      // reproduced in clip space. Passing the raw swapped pair diverged per backend in release builds.
+      const float minDepth = std::clamp(std::min(vp.znear, vp.zfar), 0.0f, 1.0f);
+      const float maxDepth = std::clamp(std::max(vp.znear, vp.zfar), 0.0f, 1.0f);
      pass.SetViewport(vp.left, vp.top, vp.width, vp.height, minDepth, maxDepth);
    } break;
    case CommandType::SetScissor: {
@@ -1585,7 +1447,7 @@ static void render_pass_impl(const wgpu::RenderPassEncoder& pass, const std::vec
    } break;
    case CommandType::DebugMarker: {
 #if defined(AURORA_GFX_DEBUG_GROUPS)
-      pass.InsertDebugMarker(wgpu::StringView(debugFrame.markers[cmd.data.debugMarkerIndex]));
+      pass.InsertDebugMarker(wgpu::StringView(g_debugMarkers[cmd.data.debugMarkerIndex]));
 #endif
    } break;
    }
@@ -1738,8 +1600,8 @@ uint32_t align_uniform(uint32_t value) { return AURORA_ALIGN(value, g_cachedLimi

 void insert_debug_marker(std::string label) {
 #if defined(AURORA_GFX_DEBUG_GROUPS)
-  auto idx = g_debugFrame.markers.size();
-  g_debugFrame.markers.emplace_back(std::move(label));
+  auto idx = g_debugMarkers.size();
+  g_debugMarkers.emplace_back(std::move(label));
  push_command(CommandType::DebugMarker, {.debugMarkerIndex = idx});
 #endif
 }
@@ -1748,22 +1610,22 @@ void insert_debug_marker(std::string label) {

 void aurora::gfx::push_debug_group(std::string label) {
 #if defined(AURORA_GFX_DEBUG_GROUPS)
-  g_debugFrame.groups.push_back(std::move(label));
+  g_debugGroupStack.push_back(std::move(label));
 #endif
 }
 void aurora_push_debug_group(const char* label) {
 #ifdef AURORA_GFX_DEBUG_GROUPS
-  aurora::gfx::g_debugFrame.groups.emplace_back(label);
+  aurora::gfx::g_debugGroupStack.emplace_back(label);
 #endif
 }
 void aurora_pop_debug_group() {
 #ifdef AURORA_GFX_DEBUG_GROUPS
-  if (aurora::gfx::g_debugFrame.groups.empty()) {
+  if (aurora::gfx::g_debugGroupStack.empty()) {
    aurora::gfx::Log.error("Debug group stack underflowed!");
    return;
  }

-  aurora::gfx::g_debugFrame.groups.pop_back();
+  aurora::gfx::g_debugGroupStack.pop_back();
 #endif
 }

@@ -1,5 +1,4 @@
 #pragma once
-#include "staging_capacity.hpp"

 #include "../internal.hpp"
 #include "../webgpu/gpu.hpp"
@@ -395,20 +394,6 @@ wgpu::BindGroup& find_bind_group(BindGroupRef id);
 wgpu::Sampler& sampler_ref(const wgpu::SamplerDescriptor& descriptor);

 uint32_t align_uniform(uint32_t value);
-uint64_t staging_uniform_bytes(uint64_t bytes);
-uint64_t staging_storage_bytes(uint64_t bytes);
-// Admission does not allocate. A false result requires a producer-side split.
-// Oversized operations fail before mutating the current draw/pass.
-bool staging_has_space(const StagingSizes& demand);
-void ensure_staging_space(const StagingSizes& demand);
-void split_staging_batch();
-uint64_t staging_epoch() noexcept;
-StagingSizes staging_usage() noexcept;
-StagingSizes staging_high_water() noexcept;
-uint64_t staging_split_count() noexcept;
-// Internal integration-test seam: never increases the physical allocation.
-void set_staging_capacity_limits_for_testing(const StagingSizes& limits);
-

 Vec2<uint32_t> get_render_target_size() noexcept;
 // Same value as get_render_target_size() outside a render pass, but never
@@ -92,7 +92,7 @@ struct Params {

 constexpr std::string_view ReversedZBody = R"(
 fn gx_z24(depth: f32) -> u32 {
-    return min(u32(clamp(1.0 - depth, 0.0, 1.0) * 16777215.0 + 0.5), 0x00ffffffu);
+    return min(u32(clamp(depth, 0.0, 1.0) * 16777216.0), 0x00ffffffu);
 }
 )"sv;

@@ -196,8 +196,7 @@ wgpu::BindGroupLayout create_bind_group_layout(const char* label) {
  return g_device.CreateBindGroupLayout(&descriptor);
 }

-Params make_params(wgpu::Extent3D sourceSize, const FrameMapping& mapping) noexcept {
-  const auto dstSize = mapping.logicalSize;
+Params make_params(wgpu::Extent3D sourceSize, Vec2<uint32_t> dstSize) noexcept {
  Params params{
      .dstWidth = dstSize.x,
      .dstHeight = dstSize.y,
@@ -205,17 +204,16 @@ Params make_params(wgpu::Extent3D sourceSize, const FrameMapping& mapping) noexc
      .srcHeight = sourceSize.height,
  };

-  if (mapping.viewportPolicy == AURORA_VIEWPORT_NATIVE) {
+  if (gx::g_gxState.viewportPolicy == AURORA_VIEWPORT_NATIVE) {
    return params;
  }

-  const auto logicalSize = mapping.logicalSize;
+  const auto logicalSize = vi::configured_fb_size();
  if (logicalSize.x == 0 || logicalSize.y == 0 || sourceSize.width == 0 || sourceSize.height == 0) {
    return params;
  }

-  const bool stretch = mapping.viewportPolicy == AURORA_VIEWPORT_STRETCH ||
-                       mapping.viewportPolicy == AURORA_VIEWPORT_16_9;
+  const bool stretch = gx::g_gxState.viewportPolicy == AURORA_VIEWPORT_STRETCH;
  const float scaleX = static_cast<float>(sourceSize.width) / static_cast<float>(logicalSize.x);
  const float scaleY = static_cast<float>(sourceSize.height) / static_cast<float>(logicalSize.y);
  const float scale = std::min(scaleX, scaleY);
@@ -338,12 +336,8 @@ void poll() noexcept {
  }
 }

-FrameMapping capture_frame_mapping() noexcept {
-  return {vi::configured_fb_size(), gx::g_gxState.viewportPolicy};
-}
-
 void encode_frame_snapshot(const wgpu::CommandEncoder& cmd, const wgpu::TextureView& depthView,
-                           wgpu::Extent3D sourceSize, uint32_t msaaSamples, const FrameMapping& mapping) noexcept {
+                           wgpu::Extent3D sourceSize, uint32_t msaaSamples) noexcept {
  ZoneScoped;
  const auto now = Clock::now();
  {
@@ -355,7 +349,7 @@ void encode_frame_snapshot(const wgpu::CommandEncoder& cmd, const wgpu::TextureV
    g_nextSnapshotTime = now + SnapshotInterval;
  }

-  const auto dstSize = mapping.logicalSize;
+  const auto dstSize = vi::configured_fb_size();
  if (!depthView || dstSize.x == 0 || dstSize.y == 0 || sourceSize.width == 0 || sourceSize.height == 0) {
    return;
  }
@@ -363,7 +357,7 @@ void encode_frame_snapshot(const wgpu::CommandEncoder& cmd, const wgpu::TextureV
    Log.fatal("Depth Peek from multisampled EFB targets is not supported");
  }

-  const Params params = make_params(sourceSize, mapping);
+  const Params params = make_params(sourceSize, dstSize);
  wgpu::Buffer storageBuffer;
  wgpu::Buffer readbackBuffer;
  wgpu::Buffer paramsBuffer;
@@ -1,7 +1,6 @@
 #pragma once

 #include "common.hpp"
-#include <dolphin/gx/GXAurora.h>

 #include <vector>

@@ -14,15 +13,8 @@ void request_snapshot() noexcept;
 bool read_latest(uint16_t x, uint16_t y, uint32_t& z) noexcept;
 void poll() noexcept;

-// Captured before SEALED; the producer may configure the next frame during encode.
-struct FrameMapping {
-  Vec2<uint32_t> logicalSize{};
-  AuroraViewportPolicy viewportPolicy = AURORA_VIEWPORT_FIT;
-};
-FrameMapping capture_frame_mapping() noexcept;
-
 void encode_frame_snapshot(const wgpu::CommandEncoder& cmd, const wgpu::TextureView& depthView,
-                           wgpu::Extent3D sourceSize, uint32_t msaaSamples, const FrameMapping& mapping) noexcept;
+                           wgpu::Extent3D sourceSize, uint32_t msaaSamples) noexcept;
 void after_submit() noexcept;

 namespace testing {
@@ -8,9 +8,7 @@
 #include <algorithm>
 #include <array>
 #include <cstring>
-#include <memory>
 #include <mutex>
-#include <string>
 #include <unordered_map>
 #include <vector>

@@ -29,7 +27,7 @@ using webgpu::g_instance;
 constexpr size_t kAsyncReadbackMaxBytes = 256;
 // Each destination keeps its readback buffer forever. Only a handful are expected, and the cap
 // stops an unexpected pattern of one-shot destinations from leaking GPU buffers.
-constexpr size_t kMaxAsyncSlots = MaxAsyncReadbackSlots;
+constexpr size_t kMaxAsyncSlots = 32;

 struct PendingCopy {
  void* dest = nullptr;
@@ -39,7 +37,6 @@ struct PendingCopy {
  TextureHandle texture;
  TextureHandle nativeTexture;
  Range nativeBlitUniform;
-  uint64_t nativeUniformEpoch = 0;
 };

 struct Download {
@@ -84,7 +81,6 @@ std::vector<PendingCopy> g_asyncSealed;
 std::mutex g_asyncMutex;
 std::unordered_map<void*, AsyncSlot> g_asyncSlots;
 uint32_t g_asyncMapsInFlight = 0;
-uint64_t g_asyncGeneration = 1;

 uint32_t align_to(uint32_t value, uint32_t alignment) noexcept { return (value + alignment - 1) & ~(alignment - 1); }

@@ -94,10 +90,10 @@ void ensure_native_texture(PendingCopy& pending, TextureHandle* cache = nullptr)
  if (pending.texture->size.width == pending.width && pending.texture->size.height == pending.height) {
    return;
  }
-  if (pending.nativeTexture && pending.nativeUniformEpoch == staging_epoch()) return;
  if (pending.nativeTexture) {
-    // Keep the texture; its old staging range belongs to a submitted batch.
-  } else if (cache != nullptr && *cache && (*cache)->size.width == pending.width &&
+    return;
+  }
+  if (cache != nullptr && *cache && (*cache)->size.width == pending.width &&
      (*cache)->size.height == pending.height) {
    pending.nativeTexture = *cache;
  } else {
@@ -106,12 +102,10 @@ void ensure_native_texture(PendingCopy& pending, TextureHandle* cache = nullptr)
      *cache = pending.nativeTexture;
    }
  }
-  // The shared blit shader clamps Y to flags.z/w; preserve the full source.
  const std::array nativeBlitUniform{
-      0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 64.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
+      0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 64.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
  };
  pending.nativeBlitUniform = push_uniform(nativeBlitUniform);
-  pending.nativeUniformEpoch = staging_epoch();
 }

 void encode_native_blit(const wgpu::CommandEncoder& encoder, const PendingCopy& pending) noexcept {
@@ -131,17 +125,16 @@ HostPixelOrder texture_pixel_order(const TextureHandle& texture) noexcept {
  return texture->format == wgpu::TextureFormat::BGRA8Unorm ? HostPixelOrder::BGRA : HostPixelOrder::RGBA;
 }

-void complete_async_slot(void* dest, uint64_t generation, wgpu::MapAsyncStatus status,
-                         wgpu::StringView message) noexcept {
+void complete_async_slot(void* dest, wgpu::MapAsyncStatus status, wgpu::StringView message) noexcept {
  std::lock_guard lock{g_asyncMutex};
-  if (generation != g_asyncGeneration) return;
+  if (g_asyncMapsInFlight > 0) {
+    --g_asyncMapsInFlight;
+  }
  const auto it = g_asyncSlots.find(dest);
  if (it == g_asyncSlots.end()) {
    return;
  }
  auto& slot = it->second;
-  if (slot.state != AsyncState::MapPending) return;
-  if (g_asyncMapsInFlight > 0) --g_asyncMapsInFlight;
  if (status == wgpu::MapAsyncStatus::Success) {
    const auto* pixels = static_cast<const uint8_t*>(slot.buffer.GetConstMappedRange(0, slot.bufferSize));
    if (pixels != nullptr) {
@@ -234,14 +227,7 @@ bool has_pending(void* dest) noexcept {
                     [dest](const Download& download) { return download.copy.dest == dest; });
 }

-bool prepare_downloads(void* dest) {
-  uint64_t copies = 0;
-  for (const auto& pending : g_pending) {
-    if (dest != nullptr && pending.dest != dest) continue;
-    if (pending.texture->size.width != pending.width || pending.texture->size.height != pending.height) ++copies;
-  }
-  // Reserve all copies, even already-prepared ones: a split retires their ranges.
-  ensure_staging_space({0, copies * staging_uniform_bytes(48), 0, 0});
+bool prepare_downloads(void* dest) noexcept {
  bool found = false;
  for (auto& pending : g_pending) {
    if (dest != nullptr && pending.dest != dest) continue;
@@ -304,35 +290,15 @@ void encode_downloads(const wgpu::CommandEncoder& encoder, void* dest) noexcept
 bool complete_downloads() noexcept {
  bool success = true;
  for (auto& download : g_downloads) {
-    // WaitAny may time out before Dawn delivers cancellation. The callback must
-    // own its result rather than retaining references to this stack frame.
-    struct MapResult {
-      std::mutex mutex;
-      wgpu::MapAsyncStatus status = wgpu::MapAsyncStatus::CallbackCancelled;
-      std::string message;
-    };
-    const auto result = std::make_shared<MapResult>();
+    wgpu::MapAsyncStatus mapStatus = wgpu::MapAsyncStatus::CallbackCancelled;
+    wgpu::StringView mapMessage{};
    const auto future =
        download.buffer.MapAsync(wgpu::MapMode::Read, 0, download.bufferSize, wgpu::CallbackMode::WaitAnyOnly,
-                                 [result](wgpu::MapAsyncStatus status, wgpu::StringView message) {
-                                   std::lock_guard lock{result->mutex};
-                                   result->status = status;
-                                   if (message.data != nullptr) {
-                                     size_t length = 0;
-                                     while (length < 512 && length < message.length && message.data[length] != '\0') {
-                                       ++length;
-                                     }
-                                     result->message.assign(message.data, length);
-                                   }
+                                 [&mapStatus, &mapMessage](wgpu::MapAsyncStatus status, wgpu::StringView message) {
+                                   mapStatus = status;
+                                   mapMessage = message;
                                 });
    const auto waitStatus = g_instance.WaitAny(future, 5000000000);
-    wgpu::MapAsyncStatus mapStatus;
-    std::string mapMessage;
-    {
-      std::lock_guard lock{result->mutex};
-      mapStatus = result->status;
-      mapMessage = result->message;
-    }
    if (waitStatus != wgpu::WaitStatus::Success || mapStatus != wgpu::MapAsyncStatus::Success) {
      Log.error("EFB RAM readback failed wait={} map={} message={}", magic_enum::enum_name(waitStatus),
                magic_enum::enum_name(mapStatus), mapMessage);
@@ -446,7 +412,6 @@ void after_submit() noexcept {
    void* dest;
    wgpu::Buffer buffer;
    uint64_t bufferSize;
-    uint64_t generation;
  };
  std::vector<PendingMap> pendingMaps;
  {
@@ -457,15 +422,14 @@ void after_submit() noexcept {
      }
      slot.state = AsyncState::MapPending;
      ++g_asyncMapsInFlight;
-      pendingMaps.push_back({dest, slot.buffer, slot.bufferSize, g_asyncGeneration});
+      pendingMaps.push_back({dest, slot.buffer, slot.bufferSize});
    }
  }

  for (const auto& pending : pendingMaps) {
    pending.buffer.MapAsync(wgpu::MapMode::Read, 0, pending.bufferSize, wgpu::CallbackMode::AllowSpontaneous,
-                            [dest = pending.dest, generation = pending.generation](wgpu::MapAsyncStatus status,
-                                                                                 wgpu::StringView message) {
-                              complete_async_slot(dest, generation, status, message);
+                            [dest = pending.dest](wgpu::MapAsyncStatus status, wgpu::StringView message) {
+                              complete_async_slot(dest, status, message);
                            });
  }

@@ -479,15 +443,9 @@ void abort_async() noexcept { g_asyncSealed.clear(); }
 void shutdown() noexcept {
  cancel();
  g_asyncSealed.clear();
-  // Retire callbacks before releasing buffers, and release outside their mutex:
-  // destruction may itself deliver an AllowSpontaneous cancellation callback.
-  decltype(g_asyncSlots) retiredSlots;
-  {
-    std::lock_guard lock{g_asyncMutex};
-    ++g_asyncGeneration;
-    retiredSlots.swap(g_asyncSlots);
-    g_asyncMapsInFlight = 0;
-  }
+  std::lock_guard lock{g_asyncMutex};
+  g_asyncSlots.clear();
+  g_asyncMapsInFlight = 0;
 }

 } // namespace aurora::gfx::efb_ram
@@ -7,11 +7,9 @@

 namespace aurora::gfx::efb_ram {

-inline constexpr size_t MaxAsyncReadbackSlots = 32;
-
 void schedule(void* dest, uint32_t width, uint32_t height, GXTexFmt format, TextureHandle texture) noexcept;
 bool has_pending(void* dest = nullptr) noexcept;
-bool prepare_downloads(void* dest = nullptr);
+bool prepare_downloads(void* dest = nullptr) noexcept;
 void encode_downloads(const wgpu::CommandEncoder& encoder, void* dest = nullptr) noexcept;
 bool complete_downloads() noexcept;
 void cancel() noexcept;
@@ -396,7 +396,6 @@ static PendingPipeline* touch_pending_pipeline(PipelineRef hash, bool prioritize

  g_priorityPipelines.emplace_back(std::move(*backgroundIt));
  g_backgroundPipelines.erase(backgroundIt);
-  g_pipelineCv.notify_all();
  return &g_priorityPipelines.back();
 }

@@ -531,8 +530,7 @@ static PipelineRef find_pipeline_impl(ShaderType type, const PipelineConfig& con
  }

  if (notifyWorker) {
-    // Compiler workers and renderer waiters share this condition variable.
-    g_pipelineCv.notify_all();
+    g_pipelineCv.notify_one();
  }
  if (notifyWaiters) {
    g_pipelineCv.notify_all();
@@ -1,33 +0,0 @@
-#pragma once
-#include <array>
-#include <cstdint>
-#include <limits>
-#include <stdexcept>
-
-namespace aurora::gfx {
-// Byte counts after each allocation's own trailing alignment, in V/U/I/S order.
-using StagingSizes = std::array<uint64_t, 4>;
-class StagingCapacityError : public std::runtime_error {
-public:
-  using std::runtime_error::runtime_error;
-};
-struct StagingBatchFull {};
-inline uint64_t staging_padded(uint64_t bytes, uint64_t alignment) {
-  if (!bytes) return alignment;
-  const auto remainder = alignment ? bytes % alignment : 0;
-  const auto padding = remainder ? alignment - remainder : 0;
-  if (bytes > UINT64_MAX - padding) throw StagingCapacityError("Staging allocation size overflow");
-  return bytes + padding;
-}
-inline bool staging_fits(const StagingSizes& used, const StagingSizes& demand,
-                         const StagingSizes& tail, const StagingSizes& capacity) noexcept {
-  for (unsigned i = 0; i < used.size(); ++i) {
-    const auto limit = capacity[i] < UINT32_MAX ? capacity[i] : UINT32_MAX;
-    // The final GPU copy rounds to four bytes. Subtractions avoid wraparound.
-    const auto alignedLimit = limit & ~uint64_t(3);
-    if (tail[i] > alignedLimit || used[i] > alignedLimit - tail[i] ||
-        demand[i] > alignedLimit - tail[i] - used[i]) return false;
-  }
-  return true;
-}
-} // namespace aurora::gfx
@@ -1,61 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <mutex>
-
-namespace aurora::gfx {
-
-enum class BufferMapState { Unmapped, Mapping, Mapped };
-
-// The renderer owns request/reset; Dawn may complete a request on another thread.
-// An old callback must never publish readiness for a different staging slot.
-class StagingMapState {
-  mutable std::mutex mutex_;
-  std::condition_variable changed_;
-  uint64_t generation_ = 0;
-  BufferMapState state_ = BufferMapState::Unmapped;
-
-public:
-  uint64_t request() {
-    std::lock_guard lock(mutex_);
-    if (state_ != BufferMapState::Unmapped) return 0;
-    state_ = BufferMapState::Mapping;
-    return ++generation_;
-  }
-
-  bool complete(uint64_t generation, BufferMapState state) {
-    {
-      std::lock_guard lock(mutex_);
-      if (generation != generation_ || state_ != BufferMapState::Mapping) return false;
-      state_ = state;
-    }
-    changed_.notify_all();
-    return true;
-  }
-
-  void reset() {
-    {
-      std::lock_guard lock(mutex_);
-      ++generation_;
-      state_ = BufferMapState::Unmapped;
-    }
-    changed_.notify_all();
-  }
-
-  BufferMapState state() const {
-    std::lock_guard lock(mutex_);
-    return state_;
-  }
-
-  void wait_for_progress() {
-    std::unique_lock lock(mutex_);
-    // ProcessEvents is still serviced between waits for implementations that
-    // need it. A spontaneous completion wakes immediately, without polling.
-    changed_.wait_for(lock, std::chrono::milliseconds(1),
-                      [&] { return state_ != BufferMapState::Mapping; });
-  }
-};
-
-} // namespace aurora::gfx
@@ -137,7 +137,7 @@ fn gx_z24_at_coord(unclamped_coord: vec2i) -> u32 {
    let tex_size = vec2i(textureDimensions(src));
    let coord = clamp(unclamped_coord, vec2i(0), tex_size - vec2i(1));
    let depth = textureLoad(src, coord, 0);
-    return min(u32(clamp(1.0 - depth, 0.0, 1.0) * 16777215.0 + 0.5), 0x00ffffffu);
+    return min(u32(clamp(depth, 0.0, 1.0) * 16777216.0), 0x00ffffffu);
 }
 )"s
                        : R"(
@@ -373,7 +373,7 @@ static wgpu::BindGroupLayout g_depthBindGroupLayout;
 static wgpu::Sampler g_nearestSampler;
 static wgpu::Sampler g_linearSampler;
 static absl::flat_hash_map<GXTexFmt, wgpu::RenderPipeline> g_pipelines;
-static absl::flat_hash_map<wgpu::TextureFormat, wgpu::RenderPipeline> g_blitPipelines;
+static wgpu::RenderPipeline g_blitPipeline;

 static wgpu::RenderPipeline create_pipeline(const ConvPipeline& conv, const std::string_view shaderPreamble,
                                            const wgpu::BindGroupLayout& bindGroupLayout) {
@@ -487,12 +487,9 @@ void initialize() {
  };
  g_depthBindGroupLayout = g_device.CreateBindGroupLayout(&depthBindGroupLayoutDescriptor);

-  // Native RAM readback uses RGBA even when the EFB/surface uses BGRA.
-  // Build both variants here; frame workers only read the completed map.
-  for (const auto format : {wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureFormat::BGRA8Unorm}) {
-    g_blitPipelines[format] = create_pipeline(
-        {GX_TF_RGBA8, FragPassthrough, format, "TexCopyConv Blit"}, ShaderPreamble, g_bindGroupLayout);
-  }
+  g_blitPipeline = create_pipeline(
+      {GX_TF_RGBA8, FragPassthrough, webgpu::g_graphicsConfig.surfaceConfiguration.format, "TexCopyConv Blit"},
+      ShaderPreamble, g_bindGroupLayout);
  for (const auto& conv : ConvPipelines) {
    g_pipelines[conv.fmt] = create_pipeline(conv, ShaderPreamble, g_bindGroupLayout);
    if (conv.outputFormat != to_wgpu(conv.fmt)) {
@@ -523,7 +520,7 @@ void initialize() {

 void shutdown() {
  g_pipelines.clear();
-  g_blitPipelines.clear();
+  g_blitPipeline = {};
  g_bindGroupLayout = {};
  g_depthBindGroupLayout = {};
  g_nearestSampler = {};
@@ -605,12 +602,6 @@ void run(const wgpu::CommandEncoder& cmd, const ConvRequest& req) {
  execute(cmd, req, it->second);
 }

-void blit(const wgpu::CommandEncoder& cmd, const ConvRequest& req) {
-  const auto it = g_blitPipelines.find(req.dst->format);
-  if (it == g_blitPipelines.end()) {
-    Log.fatal("Unsupported blit destination format {}", static_cast<int>(req.dst->format));
-  }
-  execute(cmd, req, it->second);
-}
+void blit(const wgpu::CommandEncoder& cmd, const ConvRequest& req) { execute(cmd, req, g_blitPipeline); }

 } // namespace aurora::gfx::tex_copy_conv
@@ -553,7 +553,7 @@ void build_index() noexcept {
      continue;
    }

-    s_replacementIndex.try_emplace(*parsed, ReplacementIndexEntry{path});
+    s_replacementIndex.try_emplace(*parsed, path);
  }

  Log.info("Indexed {} texture replacements", s_replacementIndex.size());
@@ -30,11 +30,10 @@ using IndexBuffer = std::vector<u16>;
 static u32 prepare_idx_template(IndexBuffer& buf, GXPrimitive prim, u16 vtxCount) {
  size_t writePos = 0;
  if (prim == GX_QUADS) {
-    // GX renders a three-vertex remainder as a triangle. One/two are ignored.
-    const u32 completeVertices = static_cast<u32>(vtxCount) & ~3u;
-    buf.resize((completeVertices / 4u) * 6u + (vtxCount % 4u == 3u ? 3u : 0u));
+    // Retain the existing incomplete-quad behavior: every started group emits a complete six-index quad.
+    buf.resize(((static_cast<u32>(vtxCount) + 3u) / 4u) * 6u);

-    for (u32 v = 0; v < completeVertices; v += 4) {
+    for (u16 v = 0; v < vtxCount; v += 4) {
      const u16 idx0 = v;
      const u16 idx1 = static_cast<u16>(v + 1);
      const u16 idx2 = static_cast<u16>(v + 2);
@@ -46,21 +45,15 @@ static u32 prepare_idx_template(IndexBuffer& buf, GXPrimitive prim, u16 vtxCount
      buf[writePos++] = idx3;
      buf[writePos++] = idx0;
    }
-    if (vtxCount % 4u == 3u) {
-      buf[writePos++] = static_cast<u16>(completeVertices);
-      buf[writePos++] = static_cast<u16>(completeVertices + 1u);
-      buf[writePos++] = static_cast<u16>(completeVertices + 2u);
-    }
  } else if (prim == GX_TRIANGLES) {
-    const u32 completeVertices = (static_cast<u32>(vtxCount) / 3u) * 3u;
-    buf.resize(completeVertices);
-    for (u32 v = 0; v < completeVertices; ++v) {
+    buf.resize(vtxCount);
+    for (u16 v = 0; v < vtxCount; ++v) {
      buf[writePos++] = v;
    }
  } else if (prim == GX_TRIANGLEFAN) {
-    const u32 indexCount = vtxCount < 3 ? 0u : (static_cast<u32>(vtxCount) - 2u) * 3u;
+    const u32 indexCount = vtxCount <= 3 ? vtxCount : 3u + (static_cast<u32>(vtxCount) - 3u) * 3u;
    buf.resize(indexCount);
-    for (u32 v = 0; indexCount != 0 && v < vtxCount; ++v) {
+    for (u16 v = 0; v < vtxCount; ++v) {
      if (v < 3) {
        buf[writePos++] = v;
        continue;
@@ -70,9 +63,9 @@ static u32 prepare_idx_template(IndexBuffer& buf, GXPrimitive prim, u16 vtxCount
      buf[writePos++] = v;
    }
  } else if (prim == GX_TRIANGLESTRIP) {
-    const u32 indexCount = vtxCount < 3 ? 0u : (static_cast<u32>(vtxCount) - 2u) * 3u;
+    const u32 indexCount = vtxCount <= 3 ? vtxCount : 3u + (static_cast<u32>(vtxCount) - 3u) * 3u;
    buf.resize(indexCount);
-    for (u32 v = 0; indexCount != 0 && v < vtxCount; ++v) {
+    for (u16 v = 0; v < vtxCount; ++v) {
      if (v < 3) {
        buf[writePos++] = v;
        continue;
@@ -95,13 +88,6 @@ static u32 prepare_idx_template(IndexBuffer& buf, GXPrimitive prim, u16 vtxCount
  return static_cast<u32>(writePos);
 }

-// Empty/incomplete draws consume FIFO bytes but cannot produce a primitive.
-static bool has_complete_primitive(GXPrimitive prim, u16 count) {
-  if (prim == GX_POINTS) return count >= 1;
-  if (prim == GX_LINES || prim == GX_LINESTRIP) return count >= 2;
-  return count >= 3;
-}
-
 // GX FIFO opcodes - use CP_ prefix to avoid clashing with GXCommandList.h macros
 static constexpr u8 CP_CMD_NOP = GX_NOP;
 static constexpr u8 CP_CMD_LOAD_CP_REG = GX_LOAD_CP_REG;
@@ -480,14 +466,13 @@ static void handle_xf(const u8* data, u32& pos, u32 size, bool bigEndian);
 static bool handle_draw(u8 cmd, const u8* data, u32& pos, u32 size, bool bigEndian);
 static bool handle_aurora(const u8* data, u32& pos, u32 size, bool bigEndian);

-uint32_t process(const u8* data, u32 size, bool bigEndian) {
+void process(const u8* data, u32 size, bool bigEndian) {
  ZoneScoped;
  // Everything decoded here mutates renderer state (GX state, the recorded command lists and the mapped staging buffers), so take the renderer GPU mutex once for the whole drain rather than once per draw command.
  std::lock_guard gpuLock(aurora::renderer_gpu_mutex());
  u32 pos = 0;

  while (pos < size) {
-    const u32 commandStart = pos;
    u8 cmd = data[pos++];
    u8 opcode = cmd & CP_OPCODE_MASK;
    // Log.warn("Processing opcode {:02x} at pos {} (size {})", opcode, pos - 1, size);
@@ -566,16 +551,12 @@ uint32_t process(const u8* data, u32 size, bool bigEndian) {
      for (int i = GX_VA_POS; i <= GX_VA_TEX7; ++i) {
        g_gxState.arrays[i].cachedRange = {};
      }
-      // A merged draw retains its previous array uploads. Force a new draw so
-      // handle_draw_unmerged observes the invalidation and uploads fresh data.
-      // Pipeline configuration itself did not change.
-      g_gxState.stateDirty = true;
      break;
    }

    case GX_LOAD_AURORA: {
      if (!handle_aurora(data, pos, size, bigEndian)) {
-        return size;
+        return;
      }
      break;
    }
@@ -583,10 +564,8 @@ uint32_t process(const u8* data, u32 size, bool bigEndian) {
    default:
      // Draw commands occupy the full 0x80-0xBF range.
      if (is_draw_cmd(cmd)) {
-        try {
-          if (!handle_draw(cmd, data, pos, size, bigEndian)) return size;
-        } catch (const gfx::StagingBatchFull&) {
-          return commandStart;
+        if (!handle_draw(cmd, data, pos, size, bigEndian)) {
+          return;
        }
      } else {
        static u32 unknownLogCount = 0;
@@ -609,7 +588,6 @@ uint32_t process(const u8* data, u32 size, bool bigEndian) {
      break;
    }
  }
-  return size;
 }

 // Helper to extract bit fields from a 32-bit register
@@ -1870,10 +1848,6 @@ static u32 calculate_last_vtx_size(GXVtxFmt fmt) {

  g_gxState.lastVtxFmt = fmt;
  g_gxState.lastVtxSize = vtxSize;
-  // The format is selected by the draw opcode, without a register write.
-  // Even equal-stride formats may decode bytes differently, so do not merge
-  // into a draw using the previous format's shader and uniform layout.
-  g_gxState.stateDirty = true;

  return vtxSize;
 }
@@ -2106,22 +2080,6 @@ static const CachedPipelineState& resolve_pipeline_state(GXPrimitive prim, GXVtx
  return state;
 }

-static bool admit_draw(GXPrimitive prim, GXVtxFmt fmt, u16 count, uint32_t vertexBytes, bool merged = false) {
-  const auto& indexTemplate = cached_index_template(prim, count);
-  gfx::StagingSizes demand{vertexBytes, 0, indexTemplate.indices.size() * sizeof(u16), 0};
-  if (merged) return gfx::staging_has_space(demand);
-  const auto& info = resolve_pipeline_state(prim, fmt).shaderInfo;
-  demand[1] = gfx::staging_uniform_bytes(info.uniformSize);
-  if (frame_interpolation_identity_needed() && frame_interpolation_replay_safe())
-    demand[1] *= 1 + MaxInterpolatedFrames;
-  for (int i = GX_VA_POS; i <= GX_VA_TEX7; ++i) {
-    if ((g_gxState.vtxDesc[i] == GX_INDEX8 || g_gxState.vtxDesc[i] == GX_INDEX16) &&
-        g_gxState.arrays[i].cachedRange.size == 0)
-      demand[3] += gfx::staging_storage_bytes(g_gxState.arrays[i].size);
-  }
-  return gfx::staging_has_space(demand);
-}
-
 bool submit_raw_draw(GXPrimitive prim, GXVtxFmt fmt, const uint8_t* vertices, uint16_t vtxCount,
                     uint32_t vertexBytes) {
  ZoneScoped;
@@ -2154,17 +2112,8 @@ bool submit_raw_draw(GXPrimitive prim, GXVtxFmt fmt, const uint8_t* vertices, ui
    return false;
  }

-  if (!has_complete_primitive(prim, vtxCount)) return true;
-
  // This entry point bypasses process(), so it owns the renderer lock itself.
-  std::unique_lock gpuLock(aurora::renderer_gpu_mutex());
-  if (!admit_draw(prim, fmt, vtxCount, vertexBytes)) {
-    gpuLock.unlock();
-    gfx::split_staging_batch();
-    gpuLock.lock();
-    if (!admit_draw(prim, fmt, vtxCount, vertexBytes))
-      throw gfx::StagingCapacityError("Raw draw does not fit after capacity submission");
-  }
+  std::lock_guard gpuLock(aurora::renderer_gpu_mutex());
  const gfx::Range vertRange = gfx::push_verts(vertices, vertexBytes);
  const bool interpolationIdentityActive = frame_interpolation_identity_needed();
  const PnMtxUsage matrixUsage = interpolationIdentityActive
@@ -2202,32 +2151,17 @@ static bool handle_draw(u8 cmd, const u8* data, u32& pos, u32 size, bool bigEndi
  }


-  if (!has_complete_primitive(prim, vtxCount)) {
-    pos += totalVtxBytes;
-    return true;
-  }
-
-  DrawData* mergeTarget = nullptr;
-  // Decide admission before allocating anything. The merged path needs only
-  // vertices and indices; it must not resolve pipelines or upload arrays.
-  // Try to merge with previous draw call
-  if (!g_gxState.stateDirty) LIKELY {
-    auto* lastDraw = gfx::get_last_draw_command<DrawData>();
-    // Expanded lines/points have different vertex interpretation even with one instance.
-    // Triangle-list output has no restart index; index 65535 is usable.
-    // Overflow would address earlier vertices instead of the appended geometry.
-    if (lastDraw != nullptr && prim != GX_LINES && prim != GX_LINESTRIP && prim != GX_POINTS &&
-        !lastDraw->expandedPrimitive && lastDraw->instanceCount == 1 &&
-        uint64_t(lastDraw->vtxCount) +
-            vtxCount <= 65536u) LIKELY {
-      mergeTarget = lastDraw;
-    }
-  }
-  if (!admit_draw(prim, fmt, vtxCount, totalVtxBytes, mergeTarget != nullptr)) throw gfx::StagingBatchFull{};
+  // Push raw vertex data to buffer
  const uint8_t* vertices = data + pos;
  gfx::Range vertRange = gfx::push_verts(vertices, totalVtxBytes);
  pos += totalVtxBytes;
-  if (auto* lastDraw = mergeTarget) {
+
+  // Try to merge with previous draw call
+  if (!g_gxState.stateDirty) LIKELY {
+    auto* lastDraw = gfx::get_last_draw_command<DrawData>();
+    // Only if the previous draw call was a single instance draw (no lines/points handling)
+    if (lastDraw != nullptr && prim != GX_LINES && prim != GX_LINESTRIP && prim != GX_POINTS &&
+        lastDraw->instanceCount == 1) LIKELY {
      const auto& indexTemplate = cached_index_template(prim, vtxCount);
      const auto indices = offset_index_template(indexTemplate, lastDraw->vtxCount);
      const u32 numIndices = indexTemplate.indexCount;
@@ -2248,6 +2182,7 @@ static bool handle_draw(u8 cmd, const u8* data, u32& pos, u32 size, bool bigEndi
        extend_interpolation_draw(pn_mtx_mask(vertices, vtxCount, vtxSize));
      }
      return true;
+    }
  }

  const bool interpolationIdentityActive = frame_interpolation_identity_needed();
@@ -2343,7 +2278,6 @@ static void handle_draw_unmerged(GXPrimitive prim, GXVtxFmt fmt, u16 vtxCount,
      .vtxCount = vtxCount,
      .indexCount = numIndices,
      .instanceCount = instanceCount,
-      .expandedPrimitive = prim == GX_LINES || prim == GX_LINESTRIP || prim == GX_POINTS,
      .bindGroups = bindGroups,
      .dstAlpha = pipelineState.dstAlpha,
  });
@@ -9,7 +9,7 @@ namespace aurora::gx::fifo {
 void reset_cp_register_cache();

 // Process a buffer of GX FIFO commands
-uint32_t process(const uint8_t* data, uint32_t size, bool bigEndian);
+void process(const uint8_t* data, uint32_t size, bool bigEndian);

 // Submit already-packed direct vertex bytes against the current GX state.
 bool submit_raw_draw(GXPrimitive prim, GXVtxFmt fmt, const uint8_t* vertices, uint16_t vtxCount,
@@ -1,6 +1,5 @@
 #include "fifo.hpp"
 #include "command_processor.hpp"
-#include "../gfx/common.hpp"
 #include "../internal.hpp"

 #include <chrono>
@@ -82,25 +81,10 @@ void drain() {
  if (detail::sBufferSize == 0) {
    return;
  }
-  process_all(detail::sBufferData, detail::sBufferSize, true);
+  process(detail::sBufferData, detail::sBufferSize, true);
  detail::sBufferSize = 0;
 }

-void process_all(const uint8_t* data, uint32_t size, bool bigEndian) {
-  uint32_t consumed = 0;
-  bool retried = false;
-  while (consumed < size) {
-    const auto count = process(data + consumed, size - consumed, bigEndian);
-    if (count == 0 && retried)
-      throw gfx::StagingCapacityError("FIFO draw does not fit after capacity submission");
-    consumed += count;
-    if (consumed == size) break;
-    // process returned with its renderer lock released. No recursive drain.
-    gfx::split_staging_batch();
-    retried = true;
-  }
-}
-
 const uint8_t* get_buffer_data() { return detail::sBufferData; }
 uint32_t get_buffer_size() { return detail::sBufferSize; }
 void clear_buffer() {
@@ -81,10 +81,6 @@ bool in_display_list();
 // Drain the internal FIFO buffer through the command processor
 void drain();

-// Decode a whole command stream, submitting the staging batch whenever a draw does not fit.
-// process() alone stops at that draw, so a caller that ignores its count drops the rest.
-void process_all(const uint8_t* data, uint32_t size, bool bigEndian);
-
 // Internal buffer inspection
 const uint8_t* get_buffer_data();
 uint32_t get_buffer_size();
@@ -143,7 +143,6 @@ private:
 };
 struct FrameTransformSnapshot {
  Mat4x4<float> projection{};
-  HashType viewportIdentity = 0;
  Mat3x4<float> position{};
  Mat3x4<float> normal{};
  uint16_t usedMatrixMask = 1;
@@ -1186,8 +1185,7 @@ void finalize_frame_interpolation() noexcept {
        if ((transform.usedMatrixMask & (1u << slot)) == 0) {
          continue;
        }
-        paletteSlotKeys.push_back({combine_identity(transform.indexedMatrices->slotHash[slot],
-                                                   transform.viewportIdentity), palette, slot});
+        paletteSlotKeys.push_back({transform.indexedMatrices->slotHash[slot], palette, slot});
      }
    }
    std::sort(paletteSlotKeys.begin(), paletteSlotKeys.end(),
@@ -1448,21 +1446,10 @@ void extend_interpolation_draw(uint16_t usedPnMtxMask) noexcept {
 }

 std::array<gfx::Range, MaxInterpolatedFrames> record_interpolation_draw(
-    const FrameInterpolationDrawIdentity& drawIdentity, const Mat4x4<float>& projection,
+    const FrameInterpolationDrawIdentity& identity, const Mat4x4<float>& projection,
    uint16_t usedPnMtxMask, const InterpolatedUniformLayout& uniformLayout) noexcept {
-  // Split-screen cameras can draw identical meshes in unrelated view spaces.
-  // Scope exact, material-only and sibling-palette history to the guest viewport.
-  // Logical coordinates keep render-scale changes out of the camera identity.
-  const auto& viewport = g_gxState.logicalViewport;
-  const std::array viewportValues{viewport.left, viewport.top, viewport.width,
-                                  viewport.height, viewport.znear, viewport.zfar};
-  const HashType viewportIdentity = xxh3_hash_s(viewportValues.data(), sizeof(viewportValues));
-  auto identity = drawIdentity;
-  identity.combined = combine_identity(identity.combined, viewportIdentity);
-  identity.pipeline = combine_identity(identity.pipeline, viewportIdentity);
  FrameTransformSnapshot snapshot{
      .projection = projection,
-      .viewportIdentity = viewportIdentity,
      .usedMatrixMask = usedPnMtxMask,
  };
  if (uniformLayout.indexedMatrices) {
@@ -1416,32 +1416,23 @@ static inline GXBlendFactor remove_dst_alpha_usage(GXBlendFactor fac) {
  }
 }

-// GX_LEQUAL etc. describe "pass if this pixel is closer than/equal to what's stored" in GX's own
-// distance terms, independent of how that distance is encoded as a host depth value. Under
-// UseReversedZ the encoding is flipped (near=1, far=0), so "closer" now corresponds to a *larger*
-// stored value, not a smaller one - the ordered compare functions (LESS/LEQUAL/GREATER/GEQUAL)
-// must invert to match, or the depth test silently runs backwards (verified directly: this was
-// the actual cause of a bug report after the projection/shader half of the reverse-Z fix
-// eliminated the double-negation that used to accidentally keep the unreversed comparisons
-// correct - LEQUAL now needs GreaterEqual, not LessEqual, once the encoding it's testing against
-// is genuinely reversed). Matches upstream aurora's to_compare_function exactly.
 static inline wgpu::CompareFunction to_compare_function(GXCompare func) {
  switch (func) {
    DEFAULT_FATAL("invalid depth fn {}", underlying(func));
  case GX_NEVER:
    return wgpu::CompareFunction::Never;
  case GX_LESS:
-    return UseReversedZ ? wgpu::CompareFunction::Greater : wgpu::CompareFunction::Less;
+    return wgpu::CompareFunction::Less;
  case GX_EQUAL:
    return wgpu::CompareFunction::Equal;
  case GX_LEQUAL:
-    return UseReversedZ ? wgpu::CompareFunction::GreaterEqual : wgpu::CompareFunction::LessEqual;
+    return wgpu::CompareFunction::LessEqual;
  case GX_GREATER:
-    return UseReversedZ ? wgpu::CompareFunction::Less : wgpu::CompareFunction::Greater;
+    return wgpu::CompareFunction::Greater;
  case GX_NEQUAL:
    return wgpu::CompareFunction::NotEqual;
  case GX_GEQUAL:
-    return UseReversedZ ? wgpu::CompareFunction::LessEqual : wgpu::CompareFunction::GreaterEqual;
+    return wgpu::CompareFunction::GreaterEqual;
  case GX_ALWAYS:
    return wgpu::CompareFunction::Always;
  }
@@ -436,8 +436,6 @@ struct GXState {
  u32 pipelineStateGeneration = next_gx_state_epoch();
  std::array<u32, 0x100> bpRegCache = [] {
    std::array<u32, 0x100> regs{};
-    // Force the first GEN_MODE decode without changing its masked reset value.
-    regs[0x00] = 0xFF000000;
    regs[0xFE] = 0x00FFFFFF;
    return regs;
  }();
@@ -487,14 +485,7 @@ const gfx::TextureBind& get_texture(GXTexMapID id) noexcept;
 void resolve_sampled_textures(const ShaderInfo& info) noexcept;

 inline float clear_depth_value() {
-  // g_gxState.clearDepth is in GX's own distance terms (0 = near, larger = farther), independent of
-  // how UseReversedZ encodes that as a host depth value - it must be re-mapped the same way the
-  // projection matrix and depth compare function are, or the buffer clears to the wrong extreme
-  // (verified directly: matches upstream aurora's clear_depth_value, which does this same inversion
-  // and was the second missing piece alongside to_compare_function's compare-op inversion).
-  const float normalizedDepth =
-      std::min(static_cast<float>(g_gxState.clearDepth) / 16777216.f, 16777215.f / 16777216.f);
-  return UseReversedZ ? (1.f - normalizedDepth) : normalizedDepth;
+  return std::min(static_cast<float>(g_gxState.clearDepth) / 16777216.f, 16777215.f / 16777216.f);
 }

 inline bool render_target_has_alpha(GXPixelFmt pixelFmt) noexcept { return pixelFmt == GX_PF_RGBA6_Z24; }
@@ -13,7 +13,6 @@ struct DrawData {
  uint32_t vtxCount;
  uint32_t indexCount;
  uint32_t instanceCount;
-  bool expandedPrimitive;
  GXBindGroups bindGroups;
  uint32_t dstAlpha;
 };
@@ -993,13 +993,11 @@ wgpu::ShaderModule build_shader(const ShaderConfig& config) noexcept {
        "\n    let clip_base = select(clip_a, clip_b, use_b);"
        "\n    out.pos = vec4f(clip_base.xy + offset_ndc * clip_base.w, clip_base.zw);";
  }
-  // The near/far depth correction used to be applied here per-vertex (out.pos.z = -out.pos.z for
-  // reversed, or += out.pos.w for forward), redundantly on top of the same correction already
-  // folded into ubuf.proj by effective_projection() (shader_info.cpp) - applying it twice canceled
-  // out for the common case (any draw where effective_projection() decides to flip), silently
-  // making "reversed" Z behave identically to forward Z. It is now applied exactly once, in the
-  // projection matrix alone (matching upstream aurora commit 1dde08fa: "Move depth correction to
-  // projection matrix"), so nothing needs to happen to out.pos.z here.
+  if constexpr (UseReversedZ) {
+    vtxXfrAttrsPre += "\n    out.pos.z = -out.pos.z;";
+  } else {
+    vtxXfrAttrsPre += "\n    out.pos.z += out.pos.w;";
+  }
  // GX rasterizes at a 7/12 pixel center when antialiasing is disabled, while WebGPU rasterizes at 1/2.
  vtxXfrAttrsPre +=
      "\n    let gx_pixel_center_correction = "
@@ -1467,14 +1465,7 @@ wgpu::ShaderModule build_shader(const ShaderConfig& config) noexcept {
                    textureDependency.texMapId, uvIn);
  }

-  // in.pos.z is the host NDC z (forward: 0=near/1=far; reversed: 1=near/0=far post-fix), but this
-  // expression needs to produce GX's own native distance term (always 0=near/1=far, matching how
-  // g_gxState.clearDepth/clear_depth_value() are interpreted before their own UseReversedZ
-  // inversion) - forward already matches directly; reversed needs the same 1-x flip everything
-  // else reversed-Z-aware uses. This was backwards (verified directly against upstream aurora's
-  // identical expression in build_shader_source), which fed both fog density and the GX_ZT_ADD
-  // z-texture path the wrong distance value.
-  std::string fogDepthExpr = UseReversedZ ? "(1.0 - in.pos.z)" : "in.pos.z";
+  std::string fogDepthExpr = UseReversedZ ? "in.pos.z" : "(1.0 - in.pos.z)";
  std::string fogZCoordExpr =
      fmt::format("u32(round(clamp({}, 0.0, 1.0) * 16777216.0))", fogDepthExpr);
  if (usesZTextureDepth) {
@@ -1507,7 +1498,7 @@ wgpu::ShaderModule build_shader(const ShaderConfig& config) noexcept {
      fragmentFn += fmt::format(
          "\n    let oldZ = u32(round(clamp({0}, 0.0, 1.0) * 16777216.0));"
          "\n    ztexCoord = (ztexCoord + oldZ) & 0x00ffffffu;",
-          UseReversedZ ? "(1.0 - in.pos.z)" : "in.pos.z");
+          UseReversedZ ? "in.pos.z" : "(1.0 - in.pos.z)");
    }
    fragmentFn += "\n    let ztexDepth = f32(ztexCoord) / 16777216.0;";
    fogZCoordExpr = "ztexCoord";
@@ -1648,13 +1639,7 @@ wgpu::ShaderModule build_shader(const ShaderConfig& config) noexcept {
        "    @builtin(frag_depth) depth: f32,\n"
        "};";

-    // ztexDepth is in GX's native distance terms (0=near/1=far, see fogDepthExpr's comment above),
-    // but frag_depth must be written in the same host NDC-z convention in.pos.z itself uses -
-    // forward matches directly (no change), reversed needs the same 1-x flip. This was backwards
-    // the same way fogDepthExpr was (verified by the same derivation, since aurora upstream has no
-    // directly equivalent line here to cross-check against - this z-texture-depth-output path
-    // appears to be specific to this fork).
-    fragmentFn += fmt::format("\n    let fragDepth = {}ztexDepth;", UseReversedZ ? "1.0 - " : "");
+    fragmentFn += fmt::format("\n    let fragDepth = {}ztexDepth;", UseReversedZ ? "" : "1.0 - ");
    fragmentReturnType = "FragmentOutput";
    fragmentReturn =
        "    var out: FragmentOutput;\n"
@@ -1708,22 +1693,8 @@ fn load_u16(p: ptr<storage, array<u32>>, byte_off: u32, le: bool) -> u32 {{
  return bswap16(raw, le);
 }}

-fn load_u24_raw(p: ptr<storage, array<u32>>, byte_off: u32) -> u32 {{
-  let word_idx = byte_off >> 2u;
-  let sub = byte_off & 3u;
-  let word = p[word_idx];
-  // Three bytes at offsets zero or one fit entirely in this word. Do not
-  // access the next word: this attribute may end at the binding boundary.
-  if (sub <= 1u) {{
-    return (word >> (sub * 8u)) & 0x00FFFFFFu;
-  }}
-  let next = p[word_idx + 1u];
-  let shift = sub * 8u;
-  return ((word >> shift) | (next << (32u - shift))) & 0x00FFFFFFu;
-}}
-
 fn load_u24(p: ptr<storage, array<u32>>, byte_off: u32, le: bool) -> u32 {{
-  let raw = load_u24_raw(p, byte_off);
+  let raw = load_u32_raw(p, byte_off) & 0x00FFFFFFu;
  if (le) {{
    return raw;
  }}
@@ -1763,7 +1734,7 @@ fn raw_fetch_u8_2(p: ptr<storage, array<u32>>, byte_off: u32) -> vec2u {{
 }}

 fn raw_fetch_u8_3(p: ptr<storage, array<u32>>, byte_off: u32) -> vec3u {{
-  let raw = load_u24_raw(p, byte_off);
+  let raw = load_u32_raw(p, byte_off);
  return vec3u(
    extractBits(raw, 0u, 8u),
    extractBits(raw, 8u, 8u),
@@ -548,22 +548,14 @@ constexpr size_t kStagedUniformBytes =
    96 + sizeof(Mat4x4<float>) + sizeof(Mat3x4<float>) * (MaxPostexMtx + MaxPnMtx);

 // The host viewport always receives the normalized GX depth window (render_pass_impl clamps to minDepth <= maxDepth).
-//
-// Folds the near/far depth correction the vertex shader used to apply per-vertex directly into the
-// projection matrix instead (matching upstream aurora commit 1dde08fa, "Move depth correction to
-// projection matrix") - valid because the correction is a linear combination of the z/w rows, so
-// applying it once here to the row is equivalent to applying it once per-vertex to the dot product,
-// and it must be applied exactly once: doing it here AND in the shader (the previous bug) canceled
-// the negation out for `flip`, silently making "reversed" Z behave identically to forward Z.
-// `flip` decides which of the two single-application forms this draw needs: true bakes in the
-// reversed-Z inversion (z' = -z), false bakes in the forward-Z near/far combination (z' = z + w) -
-// exactly one always applies, never both, and never neither.
 static Mat4x4<float> effective_projection() noexcept {
  const auto& vp = g_gxState.renderViewport;
  const bool flip = (vp.znear <= vp.zfar) == UseReversedZ;
  Mat4x4<float> proj = g_gxState.proj;
-  for (size_t i = 0; i < 4; ++i) {
-    proj.m2.m[i] = flip ? -proj.m2.m[i] : (proj.m2.m[i] + proj.m3.m[i]);
+  if (flip) {
+    for (size_t i = 0; i < 4; ++i) {
+      proj.m2.m[i] = -(proj.m2.m[i] + proj.m3.m[i]);
+    }
  }
  return proj;
 }
@@ -75,30 +75,18 @@ void initialize() noexcept {

 void shutdown() noexcept {
  ZoneScoped;
-  // Startup can fail before either backend initializes. A context alone does
-  // not mean its renderer/platform backend owns resources to release.
-  if (ImGui::GetCurrentContext() != nullptr) {
-    ImGuiIO& io = ImGui::GetIO();
-    if (io.BackendRendererUserData != nullptr) {
-      if (g_useSdlRenderer) {
-        ImGui_ImplSDLRenderer3_Shutdown();
-      } else {
-        ImGui_ImplWGPU_Shutdown();
-      }
-    }
-    if (io.BackendPlatformUserData != nullptr) {
-      ImGui_ImplSDL3_Shutdown();
-    }
-    ImGui::DestroyContext();
+  if (g_useSdlRenderer) {
+    ImGui_ImplSDLRenderer3_Shutdown();
+  } else {
+    ImGui_ImplWGPU_Shutdown();
  }
+  ImGui_ImplSDL3_Shutdown();
+  ImGui::DestroyContext();
  for (const auto& texture : g_sdlTextures) {
    SDL_DestroyTexture(texture);
  }
  g_sdlTextures.clear();
  g_wgpuTextures.clear();
-  g_useSdlRenderer = false;
-  g_scale = 0.f;
-  g_frameDataBuilt = false;
 }

 void process_event(const SDL_Event& event) noexcept {
@@ -401,8 +401,6 @@ SDL_JoystickID add_controller(SDL_JoystickID which) noexcept {
      return -1;
    }
    controller.m_isGameCube = controller.m_vid == 0x057E && controller.m_pid == 0x0337;
-    const char* serial = SDL_GetGamepadSerial(ctrl);
-    controller.m_gameCubeUseOrdinaryStop = controller.m_isGameCube && serial && "GCP+"sv == serial;
    if (controller.m_isGameCube ||
        (SDL_GetGamepadType(ctrl) == SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO && controller.m_pid == 0x2073)) {
      controller.m_deadZones.emulateTriggers = false;
@@ -414,29 +412,6 @@ SDL_JoystickID add_controller(SDL_JoystickID which) noexcept {
    g_GameControllers[instance] = controller;
    ensure_player_index(g_GameControllers[instance]);
    apply_port_preferences();
-#if defined(SDL_PLATFORM_MACOS)
-    // First-use convenience only: never override a saved assignment or None.
-    if (g_portPreferences[0].state == PortPreferenceState::Unset) {
-      bool hasOtherPortPreference = false;
-      for (size_t port = 1; port < g_portPreferences.size(); ++port) {
-        if (g_portPreferences[port].state == PortPreferenceState::Controller &&
-            identity_match(g_portPreferences[port].identity, controller_identity(g_GameControllers[instance])) !=
-                IdentityMatch::None) {
-          hasOtherPortPreference = true;
-          break;
-        }
-      }
-      if (!hasOtherPortPreference) {
-        const auto* p0 = get_controller_for_player(0);
-        if (p0 == nullptr) {
-          assign_player_index(g_GameControllers[instance], 0);
-          persist_controller_for_player(0, &g_GameControllers[instance]);
-        } else if (p0 == &g_GameControllers[instance]) {
-          persist_controller_for_player(0, &g_GameControllers[instance]);
-        }
-      }
-    }
-#endif
    return instance;
  }

@@ -506,13 +481,6 @@ bool controller_has_rumble(Uint32 instance) noexcept {
 void controller_rumble(uint32_t instance, uint16_t low_freq_intensity, uint16_t high_freq_intensity,
                       uint16_t duration_ms) noexcept {
  if (auto it = g_GameControllers.find(instance); it != g_GameControllers.end()) {
-    // GC Pocket+ has been observed continuing to vibrate after a hard stop;
-    // an ordinary stop cleared it. With GAMECUBE_RUMBLE_BRAKE enabled, SDL
-    // encodes (0, 1) as adapter command 0, whereas (0, 0) sends command 2.
-    // Apply the workaround here so shutdown uses the same stop as PAD calls.
-    if (it->second.m_gameCubeUseOrdinaryStop && low_freq_intensity == 0 && high_freq_intensity == 0) {
-      high_freq_intensity = 1;
-    }
    SDL_RumbleGamepad(it->second.m_controller, low_freq_intensity, high_freq_intensity, duration_ms);
  }
 }
@@ -17,7 +17,6 @@ extern Module Log;
 struct GameController {
  SDL_Gamepad* m_controller = nullptr;
  bool m_isGameCube = false;
-  bool m_gameCubeUseOrdinaryStop = false;
  Sint32 m_index = -1;
  Sint32 m_playerIndex = -1;
  bool m_hasRumble = false;
@@ -122,10 +122,7 @@ auto underlying(T value) -> std::underlying_type_t<T> {

 #define UNIMPLEMENTED() FATAL("UNIMPLEMENTED: {}", __FUNCTION__)

-namespace wgpu { class CommandBuffer; }
-
 namespace aurora {
-void submit_staging_commands(const wgpu::CommandBuffer& commands);
 extern AuroraConfig g_config;
 extern uint32_t g_sdlCustomEventsStart;
 extern char g_gameName[4];
@@ -235,7 +235,7 @@ std::string GetOSVersion() {
  constexpr auto name = "iOS";
 #elif TARGET_OS_TV
  constexpr auto name = "tvOS";
-#else
+#elif
  constexpr auto name = Unknown;
 #endif

@@ -570,16 +570,12 @@ bool initialize(AuroraBackend auroraBackend) {
            g_adapter = std::move(adapter);
          } else {
            Log.warn("Adapter request failed: {}", message);
-            const std::string_view reason{message};
-            SDL_SetError("Graphics adapter unavailable: %.*s",
-                         static_cast<int>(std::min<size_t>(reason.size(), 512)), reason.data());
          }
        });
    const auto status = g_instance.WaitAny(future, 5000000000);
    if (status != wgpu::WaitStatus::Success) {
      Log.error("Failed to create {} adapter: {}", magic_enum::enum_name(backend),
                magic_enum::enum_name(status));
-      SDL_SetError("Graphics adapter request did not complete within its startup deadline");
      return false;
    }
    if (!g_adapter) {
@@ -642,14 +638,6 @@ bool initialize(AuroraBackend auroraBackend) {
        requiredLimits.maxDynamicStorageBuffersPerPipelineLayout, requiredLimits.maxStorageBuffersPerShaderStage,
        requiredLimits.minUniformBufferOffsetAlignment, requiredLimits.minStorageBufferOffsetAlignment);
    std::vector<wgpu::FeatureName> requiredFeatures;
-    // Optional native sharing for MetalFX. Devices without either feature keep
-    // the normal renderer; the upscaler checks the enabled pair at runtime.
-    if (backend == wgpu::BackendType::Metal &&
-        g_adapter.HasFeature(wgpu::FeatureName::SharedTextureMemoryIOSurface) &&
-        g_adapter.HasFeature(wgpu::FeatureName::SharedFenceMTLSharedEvent)) {
-      requiredFeatures.push_back(wgpu::FeatureName::SharedTextureMemoryIOSurface);
-      requiredFeatures.push_back(wgpu::FeatureName::SharedFenceMTLSharedEvent);
-    }
    bool implicitDeviceSynchronizationSupported = false;
    wgpu::SupportedFeatures supportedFeatures;
    g_adapter.GetFeatures(&supportedFeatures);
@@ -750,15 +738,11 @@ bool initialize(AuroraBackend auroraBackend) {
                                    g_device = std::move(device);
                                  } else {
                                    Log.warn("Device request failed: {}", message);
-                                    const std::string_view reason{message};
-                                    SDL_SetError("Graphics device unavailable: %.*s",
-                                        static_cast<int>(std::min<size_t>(reason.size(), 512)), reason.data());
                                  }
                                });
    const auto status = g_instance.WaitAny(future, 5000000000);
    if (status != wgpu::WaitStatus::Success) {
      Log.error("Failed to create device: {}", magic_enum::enum_name(status));
-      SDL_SetError("Graphics device request did not complete within its startup deadline");
      return false;
    }
    if (!g_device) {
@@ -2,7 +2,6 @@
 #include <cstring>
 #include <ctime>
 #include <mutex>
-#include <limits>
 #include <string>
 #include <filesystem>
 #include <vector>
@@ -287,33 +286,8 @@ size_t load_from_cache(void const* key, size_t keySize, void* value, size_t valu
  if (ret == SQLITE_ROW) {
    // Hit
    const auto foundPtr = sqlite3_column_blob(load_stmt, 0);
-    const auto declaredSize = sqlite3_column_int64(load_stmt, 1);
-    const auto storedSize = sqlite3_column_bytes(load_stmt, 0);
-    const auto compression = sqlite3_column_int(load_stmt, 2);
-    const bool compressed = compression == 1;
-    // Dawn asks for the size before allocating its destination. Validate here,
-    // not only during the copy: corrupt metadata must become a cache miss.
-    bool valid = declaredSize > 0 &&
-                 static_cast<uint64_t>(declaredSize) <= std::numeric_limits<size_t>::max() &&
-                 foundPtr != nullptr && storedSize > 0 && (compression == 0 || compression == 1);
-    if (valid && compressed) {
-#if defined(AURORA_CACHE_USE_ZSTD)
-      // Our writer uses ZSTD_compress, which records the original content size.
-      const auto frameSize = ZSTD_getFrameContentSize(foundPtr, static_cast<size_t>(storedSize));
-      valid = frameSize != ZSTD_CONTENTSIZE_ERROR && frameSize != ZSTD_CONTENTSIZE_UNKNOWN &&
-              frameSize == static_cast<uint64_t>(declaredSize);
-#else
-      valid = false;
-#endif
-    } else if (valid) {
-      valid = declaredSize == storedSize;
-    }
-    if (!valid) {
-      Log.error("Ignoring cache entry with inconsistent size or compression metadata");
-      check(sqlite3_reset(load_stmt));
-      return 0;
-    }
-    foundSize = static_cast<size_t>(declaredSize);
+    foundSize = sqlite3_column_int64(load_stmt, 1);
+    const bool compressed = sqlite3_column_int(load_stmt, 2) != 0;
    if (value == nullptr) {
      g_hits.fetch_add(1, std::memory_order_relaxed);
    } else {
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <webgpu/webgpu_cpp.h>
-
-#include <memory>
-#include <string>
-
-namespace aurora::webgpu::metalfx {
-struct Size {
-  uint32_t inputWidth;
-  uint32_t inputHeight;
-  uint32_t outputWidth;
-  uint32_t outputHeight;
-  wgpu::TextureFormat format;
-
-  bool operator==(const Size&) const = default;
-};
-
-// All methods except supported() belong to the serialized frame encoder.
-// GPU ownership is explicit: begin_input -> submit input -> upscale ->
-// submit output consumption -> end_output. Neither texture may be used by
-// Dawn outside its access interval. Destruction retires in-flight resources.
-class SpatialScaler {
-public:
-  virtual ~SpatialScaler() = default;
-  virtual const wgpu::TextureView& input_view() const = 0;
-  virtual const wgpu::TextureView& output_view() const = 0;
-  virtual const wgpu::Texture& output_texture() const = 0;
-  virtual bool begin_input() = 0;
-  virtual bool upscale() = 0;
-  virtual bool end_output() = 0;
-  virtual const std::string& error() const = 0;
-};
-
-bool supported(const wgpu::Device& device, wgpu::BackendType backend);
-// A null result with no error means the bounded retirement pool is busy;
-// skip upscaling for this frame and retry at a later frame boundary.
-std::unique_ptr<SpatialScaler> create(const wgpu::Instance& instance,
-                                      const wgpu::Device& device, const Size& size,
-                                      std::string& error);
-} // namespace aurora::webgpu::metalfx
@@ -1,326 +0,0 @@
-#include "metalfx.hpp"
-
-#import <Foundation/Foundation.h>
-#import <IOSurface/IOSurface.h>
-#import <Metal/Metal.h>
-#import <MetalFX/MetalFX.h>
-
-#include <dawn/native/MetalBackend.h>
-
-#include <atomic>
-#include <string_view>
-
-namespace aurora::webgpu::metalfx {
-namespace {
-constexpr uint64_t kScheduleTimeoutNs = 1'000'000'000;
-// Four current slots plus at most four retiring slots during resize. A busy
-// GPU must not allow resize events to allocate unbounded full-resolution images.
-constexpr unsigned kMaxLiveResources = 8;
-std::atomic<unsigned> g_liveResources{0};
-
-struct SharedImage {
-  IOSurfaceRef surface = nullptr;
-  id<MTLTexture> metal;
-  wgpu::SharedTextureMemory memory;
-  wgpu::Texture texture;
-  wgpu::TextureView view;
-
-  ~SharedImage() { if (surface) CFRelease(surface); }
-
-  bool create(const wgpu::Device& device, id<MTLDevice> native, uint32_t width,
-              uint32_t height, wgpu::TextureFormat format, MTLTextureUsage nativeUsage,
-              wgpu::TextureUsage usage) {
-    const bool bgra = format == wgpu::TextureFormat::BGRA8Unorm;
-    const size_t rowBytes = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size_t(width) * 4);
-    NSDictionary* properties = @{
-      (id)kIOSurfaceWidth: @(width), (id)kIOSurfaceHeight: @(height),
-      (id)kIOSurfaceBytesPerElement: @4, (id)kIOSurfaceBytesPerRow: @(rowBytes),
-      (id)kIOSurfaceAllocSize: @(rowBytes * height),
-      (id)kIOSurfacePixelFormat: @(bgra ? 0x42475241u : 0x52474241u)
-    };
-    surface = IOSurfaceCreate((__bridge CFDictionaryRef)properties);
-    if (!surface) return false;
-    auto descriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:
-        bgra ? MTLPixelFormatBGRA8Unorm : MTLPixelFormatRGBA8Unorm
-        width:width height:height mipmapped:NO];
-    descriptor.storageMode = MTLStorageModeShared;
-    descriptor.usage = nativeUsage;
-    metal = [native newTextureWithDescriptor:descriptor iosurface:surface plane:0];
-    if (!metal) return false;
-
-    wgpu::SharedTextureMemoryIOSurfaceDescriptor io{};
-    io.ioSurface = surface;
-    io.allowStorageBinding = false;
-    wgpu::SharedTextureMemoryDescriptor importDescriptor{};
-    importDescriptor.nextInChain = &io;
-    memory = device.ImportSharedTextureMemory(&importDescriptor);
-    wgpu::SharedTextureMemoryProperties actual{};
-    if (!memory || memory.GetProperties(&actual) != wgpu::Status::Success ||
-        actual.format != format || actual.size.width != width || actual.size.height != height ||
-        (actual.usage & usage) != usage) return false;
-    wgpu::TextureDescriptor textureDescriptor{};
-    textureDescriptor.label = "MetalFX shared texture";
-    textureDescriptor.size = {width, height, 1};
-    textureDescriptor.format = format;
-    textureDescriptor.usage = usage;
-    texture = memory.CreateTexture(&textureDescriptor);
-    if (!texture) return false;
-    view = texture.CreateView();
-    return view != nullptr;
-  }
-};
-
-struct API_AVAILABLE(macos(13.0)) Resources {
-  SharedImage input, output;
-  id<MTLFXSpatialScaler> scaler;
-  id<MTLTexture> privateOutput;
-  id<MTLCommandQueue> nativeQueue;
-  id<MTLSharedEvent> event;
-  wgpu::SharedFence fence;
-  std::atomic<bool> failed{false};
-
-  Resources() { ++g_liveResources; }
-  ~Resources() { --g_liveResources; }
-};
-
-class API_AVAILABLE(macos(13.0)) MetalSpatialScaler final : public SpatialScaler {
-  wgpu::Instance m_instance;
-  wgpu::Queue m_queue;
-  std::shared_ptr<Resources> m_resources;
-  wgpu::SharedTextureMemoryEndAccessState m_outputReleased{};
-  wgpu::Future m_outputScheduled{};
-  uint64_t m_value = 0;
-  std::string m_error;
-
-  bool fail(const char* reason) {
-    m_error = reason;
-    m_resources->failed = true;
-    return false;
-  }
-
-  bool wait_scheduled(wgpu::Future future) {
-    return m_instance.WaitAny(future, kScheduleTimeoutNs) == wgpu::WaitStatus::Success ||
-           fail("Timed out scheduling MetalFX GPU work");
-  }
-
-  bool end_access(SharedImage& image, wgpu::SharedTextureMemoryEndAccessState& state,
-                  wgpu::Future& scheduled) {
-    wgpu::SharedTextureMemoryMetalEndAccessState metal{};
-    state.nextInChain = &metal;
-    const auto status = image.memory.EndAccess(image.texture, &state);
-    state.nextInChain = nullptr;
-    scheduled = metal.commandsScheduledFuture;
-    return status == wgpu::Status::Success || fail("MetalFX Dawn EndAccess failed");
-  }
-
-  bool begin_access(SharedImage& image, bool initialized, uint64_t value) {
-    wgpu::SharedTextureMemoryBeginAccessDescriptor access{};
-    access.initialized = initialized;
-    if (value) {
-      access.fenceCount = 1;
-      access.fences = &m_resources->fence;
-      access.signaledValueCount = 1;
-      access.signaledValues = &value;
-    }
-    return image.memory.BeginAccess(image.texture, &access) == wgpu::Status::Success ||
-           fail("MetalFX Dawn BeginAccess failed");
-  }
-
-  bool encode_waits(id<MTLCommandBuffer> commands,
-                    const wgpu::SharedTextureMemoryEndAccessState& state) {
-    for (size_t i = 0; i < state.fenceCount; ++i) {
-      wgpu::SharedFenceMTLSharedEventExportInfo metal{};
-      wgpu::SharedFenceExportInfo info{};
-      info.nextInChain = &metal;
-      state.fences[i].ExportInfo(&info);
-      if (info.type != wgpu::SharedFenceType::MTLSharedEvent || !metal.sharedEvent)
-        return fail("Dawn did not export a MetalFX shared-event dependency");
-      [commands encodeWaitForEvent:(__bridge id<MTLSharedEvent>)metal.sharedEvent
-                             value:state.signaledValues[i]];
-    }
-    return true;
-  }
-
-  void retain_until_dawn_done() {
-    // A resize/toggle can destroy this wrapper immediately. The last submitted
-    // Dawn consumer keeps the IOSurfaces/scaler alive independently of the cache.
-    m_queue.OnSubmittedWorkDone(wgpu::CallbackMode::AllowSpontaneous,
-        [resources = m_resources](wgpu::QueueWorkDoneStatus status, wgpu::StringView) {
-          if (status != wgpu::QueueWorkDoneStatus::Success) resources->failed = true;
-        });
-  }
-
-public:
-  MetalSpatialScaler(const wgpu::Instance& instance, const wgpu::Device& device,
-                      std::shared_ptr<Resources> resources)
-  : m_instance(instance), m_queue(device.GetQueue()), m_resources(std::move(resources)) {}
-
-  const wgpu::TextureView& input_view() const override { return m_resources->input.view; }
-  const wgpu::TextureView& output_view() const override { return m_resources->output.view; }
-  const wgpu::Texture& output_texture() const override { return m_resources->output.texture; }
-  const std::string& error() const override { return m_error; }
-
-  bool begin_input() override {
-    if (m_resources->failed) return fail("Previous MetalFX GPU work failed");
-    return begin_access(m_resources->input, m_value != 0, m_value);
-  }
-
-  bool upscale() override {
-    @autoreleasepool {
-      // Input has already been submitted. Retain it even if an export or native
-      // allocation fails and the caller immediately falls back to normal copy.
-      retain_until_dawn_done();
-      wgpu::SharedTextureMemoryEndAccessState inputReleased{};
-      wgpu::Future inputScheduled{};
-      if (!end_access(m_resources->input, inputReleased, inputScheduled) ||
-          !wait_scheduled(inputScheduled)) return false;
-      if (m_value && !wait_scheduled(m_outputScheduled)) return false;
-      id<MTLCommandBuffer> commands = [m_resources->nativeQueue commandBuffer];
-      if (!commands) return fail("Could not allocate a MetalFX command buffer");
-      commands.label = @"MetalFX spatial upscale and return to Dawn";
-      if (!encode_waits(commands, inputReleased) || !encode_waits(commands, m_outputReleased))
-        return false;
-      [m_resources->scaler encodeToCommandBuffer:commands];
-      id<MTLBlitCommandEncoder> blit = [commands blitCommandEncoder];
-      if (!blit) return fail("Could not allocate the MetalFX output blit");
-      [blit copyFromTexture:m_resources->privateOutput sourceSlice:0 sourceLevel:0
-          sourceOrigin:MTLOriginMake(0, 0, 0)
-          sourceSize:MTLSizeMake(m_resources->privateOutput.width, m_resources->privateOutput.height, 1)
-          toTexture:m_resources->output.metal destinationSlice:0 destinationLevel:0
-          destinationOrigin:MTLOriginMake(0, 0, 0)];
-      [blit endEncoding];
-      ++m_value;
-      [commands encodeSignalEvent:m_resources->event value:m_value];
-      const auto resources = m_resources;
-      [commands addCompletedHandler:^(id<MTLCommandBuffer> completed) {
-        if (completed.status == MTLCommandBufferStatusError) resources->failed = true;
-      }];
-      [commands commit];
-      // Scheduling is required to order independent Metal queues. Completion
-      // remains asynchronous; resource reuse is guarded by shared GPU events.
-      [commands waitUntilScheduled];
-      if (commands.status == MTLCommandBufferStatusError)
-        return fail("MetalFX command buffer failed");
-      return begin_access(m_resources->output, true, m_value);
-    }
-  }
-
-  bool end_output() override {
-    retain_until_dawn_done();
-    m_outputReleased = {};
-    return end_access(m_resources->output, m_outputReleased, m_outputScheduled);
-  }
-};
-
-// Allocation failures must be caught here rather than reaching Aurora's fatal
-// uncaptured-error callback. Scope callbacks own their strings even on timeout.
-bool pop_scope(const wgpu::Instance& instance, const wgpu::Device& device, std::string& error) {
-  auto message = std::make_shared<std::string>();
-  auto future = device.PopErrorScope(wgpu::CallbackMode::WaitAnyOnly,
-      [message](wgpu::PopErrorScopeStatus status, wgpu::ErrorType type, wgpu::StringView text) {
-        if (status != wgpu::PopErrorScopeStatus::Success || type != wgpu::ErrorType::NoError) {
-          const std::string_view detail{text};
-          *message = detail.empty() ? "MetalFX texture allocation failed" : std::string(detail);
-        }
-      });
-  if (instance.WaitAny(future, kScheduleTimeoutNs) != wgpu::WaitStatus::Success) {
-    error = "Timed out checking MetalFX texture allocation";
-    return false;
-  }
-  if (!message->empty()) { error = *message; return false; }
-  return true;
-}
-} // namespace
-
-bool supported(const wgpu::Device& device, wgpu::BackendType backend) {
-  if (@available(macOS 13.0, *)) {
-    if (!device || backend != wgpu::BackendType::Metal ||
-        !device.HasFeature(wgpu::FeatureName::SharedTextureMemoryIOSurface) ||
-        !device.HasFeature(wgpu::FeatureName::SharedFenceMTLSharedEvent)) return false;
-    auto native = dawn::native::metal::GetMTLDevice(device.Get());
-    return native && [MTLFXSpatialScalerDescriptor supportsDevice:native];
-  }
-  return false;
-}
-
-std::unique_ptr<SpatialScaler> create(const wgpu::Instance& instance,
-                                      const wgpu::Device& device, const Size& size,
-                                      std::string& error) {
-  error.clear();
-  if (@available(macOS 13.0, *)) {
-    @autoreleasepool {
-      if (!supported(device, wgpu::BackendType::Metal)) {
-        error = "MetalFX spatial scaling is unsupported";
-        return {};
-      }
-      wgpu::Limits limits{};
-      device.GetLimits(&limits);
-      if (!size.inputWidth || !size.inputHeight || size.inputWidth >= size.outputWidth ||
-          size.inputHeight >= size.outputHeight || size.outputWidth > limits.maxTextureDimension2D ||
-          size.outputHeight > limits.maxTextureDimension2D ||
-          (size.format != wgpu::TextureFormat::RGBA8Unorm && size.format != wgpu::TextureFormat::BGRA8Unorm)) {
-        error = "MetalFX requires smaller input dimensions and an RGBA8/BGRA8 unorm target";
-        return {};
-      }
-      if (g_liveResources.load() >= kMaxLiveResources) {
-        return {};
-      }
-      auto native = dawn::native::metal::GetMTLDevice(device.Get());
-      auto resources = std::make_shared<Resources>();
-      auto descriptor = [MTLFXSpatialScalerDescriptor new];
-      descriptor.inputWidth = size.inputWidth;
-      descriptor.inputHeight = size.inputHeight;
-      descriptor.outputWidth = size.outputWidth;
-      descriptor.outputHeight = size.outputHeight;
-      descriptor.colorTextureFormat = size.format == wgpu::TextureFormat::BGRA8Unorm
-          ? MTLPixelFormatBGRA8Unorm : MTLPixelFormatRGBA8Unorm;
-      descriptor.outputTextureFormat = descriptor.colorTextureFormat;
-      descriptor.colorProcessingMode = MTLFXSpatialScalerColorProcessingModePerceptual;
-      resources->scaler = [descriptor newSpatialScalerWithDevice:native];
-      resources->nativeQueue = [native newCommandQueue];
-      resources->event = [native newSharedEvent];
-      if (!resources->scaler || !resources->nativeQueue || !resources->event) {
-        error = "Could not create MetalFX spatial resources";
-        return {};
-      }
-      auto outputDescriptor = [MTLTextureDescriptor
-          texture2DDescriptorWithPixelFormat:descriptor.outputTextureFormat
-          width:size.outputWidth height:size.outputHeight mipmapped:NO];
-      outputDescriptor.storageMode = MTLStorageModePrivate;
-      outputDescriptor.usage = resources->scaler.outputTextureUsage;
-      resources->privateOutput = [native newTextureWithDescriptor:outputDescriptor];
-      if (!resources->privateOutput) { error = "Could not allocate MetalFX private output"; return {}; }
-
-      device.PushErrorScope(wgpu::ErrorFilter::Validation);
-      device.PushErrorScope(wgpu::ErrorFilter::OutOfMemory);
-      device.PushErrorScope(wgpu::ErrorFilter::Internal);
-      bool allocated = resources->input.create(device, native, size.inputWidth, size.inputHeight,
-          size.format, resources->scaler.colorTextureUsage, wgpu::TextureUsage::RenderAttachment);
-      allocated = allocated && resources->output.create(device, native, size.outputWidth, size.outputHeight,
-          size.format, MTLTextureUsageShaderRead, wgpu::TextureUsage::TextureBinding | wgpu::TextureUsage::CopySrc);
-      if (allocated) {
-        wgpu::SharedFenceMTLSharedEventDescriptor event{};
-        event.sharedEvent = (__bridge void*)resources->event;
-        wgpu::SharedFenceDescriptor fence{};
-        fence.nextInChain = &event;
-        resources->fence = device.ImportSharedFence(&fence);
-        allocated = resources->fence != nullptr;
-      }
-      for (int i = 0; i < 3; ++i) {
-        if (!pop_scope(instance, device, error)) allocated = false;
-      }
-      if (!allocated) {
-        if (error.empty()) error = "Could not import MetalFX IOSurface textures into Dawn";
-        return {};
-      }
-      resources->scaler.colorTexture = resources->input.metal;
-      resources->scaler.outputTexture = resources->privateOutput;
-      resources->scaler.inputContentWidth = size.inputWidth;
-      resources->scaler.inputContentHeight = size.inputHeight;
-      return std::make_unique<MetalSpatialScaler>(instance, device, std::move(resources));
-    }
-  }
-  error = "MetalFX requires macOS 13 or newer";
-  return {};
-}
-} // namespace aurora::webgpu::metalfx
@@ -1,11 +0,0 @@
-#include "metalfx.hpp"
-
-namespace aurora::webgpu::metalfx {
-bool supported(const wgpu::Device&, wgpu::BackendType) { return false; }
-
-std::unique_ptr<SpatialScaler> create(const wgpu::Instance&, const wgpu::Device&,
-                                      const Size&, std::string& error) {
-  error = "MetalFX is not available in this build";
-  return {};
-}
-} // namespace aurora::webgpu::metalfx
@@ -11,6 +11,9 @@
 #include <aurora/event.h>
 #include <aurora/gfx.h>
 #include <aurora/render_size_limits.hpp>
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#endif
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_events.h>
 #include <SDL3/SDL_keyboard.h>
@@ -46,7 +49,6 @@ SDL_Window* g_window;
 SDL_Renderer* g_renderer;
 float g_frameBufferScale = 0.f;
 bool g_frameBufferAspectFit = true;
-std::atomic_bool g_forceAspect169{false};
 bool g_presentSurfaceFill = false;
 int g_presentAspectWidth = 0;
 int g_presentAspectHeight = 0;
@@ -409,8 +411,21 @@ bool create_window(AuroraBackend backend) {
    height = 480;
  }

-  const Sint32 posX = g_config.hasWindowPosition ? g_config.windowPosX : SDL_WINDOWPOS_CENTERED;
-  const Sint32 posY = g_config.hasWindowPosition ? g_config.windowPosY : SDL_WINDOWPOS_CENTERED;
+  Sint32 posX = g_config.hasWindowPosition ? g_config.windowPosX : SDL_WINDOWPOS_CENTERED;
+  Sint32 posY = g_config.hasWindowPosition ? g_config.windowPosY : SDL_WINDOWPOS_CENTERED;
+#if defined(__APPLE__) && TARGET_OS_IPHONE
+  // Without this the window falls back to the 1280x960 default on any device
+  // with no saved size.
+  if (const SDL_DisplayID primary = SDL_GetPrimaryDisplay(); primary != 0) {
+    SDL_Rect bounds{};
+    if (SDL_GetDisplayBounds(primary, &bounds) && bounds.w > 0 && bounds.h > 0) {
+      width = bounds.w;
+      height = bounds.h;
+    }
+    posX = SDL_WINDOWPOS_CENTERED_DISPLAY(primary);
+    posY = SDL_WINDOWPOS_CENTERED_DISPLAY(primary);
+  }
+#endif

  const auto props = SDL_CreateProperties();
  TRY(SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, g_config.appName), "Failed to set {}: {}",
@@ -526,20 +541,7 @@ AuroraWindowSize get_window_size() {
  int fb_w = native_fb_w;
  int fb_h = native_fb_h;
  const auto [baseW, baseH] = vi::configured_fb_size();
-  if (g_forceAspect169.load(std::memory_order_acquire) && native_fb_w > 0 && native_fb_h > 0) {
-    if (g_frameBufferScale > 0.f && baseW > 0 && baseH > 0) {
-      const auto [scaledW, scaledH] =
-          scale_frame_buffer_to_aspect(static_cast<int>(baseW), static_cast<int>(baseH),
-                                       g_frameBufferScale, 16.f / 9.f);
-      fb_w = scaledW;
-      fb_h = scaledH;
-    } else {
-      fb_w = std::min(native_fb_w,
-                      std::max(1, static_cast<int>(std::lround(native_fb_h * (16.f / 9.f)))));
-      fb_h = std::min(native_fb_h,
-                      std::max(1, static_cast<int>(std::lround(native_fb_w * (9.f / 16.f)))));
-    }
-  } else if (g_frameBufferAspectFit && baseW > 0 && baseH > 0) {
+  if (g_frameBufferAspectFit && baseW > 0 && baseH > 0) {
    float renderScale = g_frameBufferScale > 0.f ? g_frameBufferScale : 1.f;
    if (g_frameBufferScale <= 0.f) {
      renderScale = std::min(static_cast<float>(native_fb_w) / static_cast<float>(baseW),
@@ -773,14 +775,6 @@ void set_frame_buffer_aspect_fit(bool fit) {
  request_frame_buffer_resize();
 }

-void set_force_aspect_16_9(bool force) {
-  if (g_forceAspect169.load(std::memory_order_relaxed) == force) {
-    return;
-  }
-  g_forceAspect169.store(force, std::memory_order_release);
-  request_frame_buffer_resize();
-}
-
 void set_present_surface_fill(bool fill) {
  g_presentSurfaceFill = fill;
 }
@@ -803,10 +797,6 @@ void unlock_present_aspect_ratio() {
 }

 bool get_present_aspect_ratio(float& aspect) noexcept {
-  if (g_forceAspect169.load(std::memory_order_acquire)) {
-    aspect = 16.f / 9.f;
-    return true;
-  }
  if (g_presentSurfaceFill && g_window != nullptr) {
    // Queried once per presentation snapshot; use the cached native client size
    // instead of re-entering SDL for a value the window procedure already knows.
@@ -56,7 +56,6 @@ void sync_frame_buffer_size() noexcept;
 void request_frame_buffer_resize();
 void set_frame_buffer_scale(float scale);
 void set_frame_buffer_aspect_fit(bool fit);
-void set_force_aspect_16_9(bool force);
 void set_present_surface_fill(bool fill);
 void lock_present_aspect_ratio(int width, int height);
 void unlock_present_aspect_ratio();
@@ -5,7 +5,7 @@ if (NOT TARGET gtest)
  FetchContent_Declare(googletest
    URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
    URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(googletest)
@@ -18,7 +18,6 @@ if (AURORA_ENABLE_GX)
    gx_fifo_test.cpp
    gx_test_stubs.cpp
    texture_bind_group_cache_key_test.cpp
-    renderer_regression_test.cpp
    ../lib/gfx/efb_ram_encoder.cpp
    # GX API implementations (encoders)
    ../lib/dolphin/gx/GXBump.cpp
@@ -67,18 +66,6 @@ if (AURORA_ENABLE_GX)
  )

  gtest_discover_tests(gx_fifo_tests)
-
-  option(AURORA_BUILD_GPU_TESTS "Build renderer pixel tests requiring a graphics device" OFF)
-  if (AURORA_BUILD_GPU_TESTS)
-    add_executable(gx_readback_tests gpu_readback_test.cpp)
-    target_compile_features(gx_readback_tests PRIVATE cxx_std_20)
-    target_include_directories(gx_readback_tests PRIVATE ../lib)
-    target_link_libraries(gx_readback_tests PRIVATE
-      aurora::core aurora::gx aurora::pad aurora::vi aurora::mtx aurora::si
-      dawn::dawncpp_headers absl::flat_hash_map absl::btree TracyClient)
-    add_test(NAME gx_readback_tests COMMAND gx_readback_tests "${CMAKE_CURRENT_BINARY_DIR}/readback-cache")
-    set_tests_properties(gx_readback_tests PROPERTIES TIMEOUT 90)
-  endif ()
 endif () # AURORA_ENABLE_GX

 # DVD API tests
@@ -1,363 +0,0 @@
-// ROM-free integration probe. Links the actual maintained Aurora renderer.
-#include "gfx/common.hpp"
-#include "gfx/clear.hpp"
-#include "gfx/efb_ram_copy.hpp"
-#include "gfx/pipeline_cache.hpp"
-#include "gfx/texture.hpp"
-#include "gx/gx.hpp"
-#include "gx/fifo.hpp"
-#include "gx/command_processor.hpp"
-#include "gx/frame_interpolation.hpp"
-#include <dolphin/gx.h>
-#include <aurora/aurora.h>
-#include <array>
-#include <bit>
-#include <atomic>
-#include <chrono>
-#include <cstdio>
-#include <filesystem>
-#include <stdexcept>
-#include <thread>
-#include <vector>
-
-namespace {
-using namespace aurora;
-std::atomic<unsigned> errors{};
-std::atomic<unsigned> guestWrites{};
-// Keep destinations alive through shutdown, including any failing wait.
-std::array<uint8_t, 16 * 16 * 4 + 32> guarded;
-std::array<uint8_t, 16 * 16 * 4 + 32> guardedBake;
-void require(bool value, const char* message) {
-  if (!value) throw std::runtime_error(message);
-}
-void submit(bool final, bool download = false, bool async = false) {
-  auto encoder = webgpu::g_device.CreateCommandEncoder();
-  if (final) gfx::end_frame(encoder); else gfx::end_batch(encoder);
-  gfx::render(encoder);
-  if (download) gfx::efb_ram::encode_downloads(encoder);
-  if (async) gfx::efb_ram::encode_async_downloads(encoder);
-  auto commands = encoder.Finish();
-  webgpu::g_queue.Submit(1, &commands);
-  if (download) require(gfx::efb_ram::complete_downloads(), "EFB readback failed");
-  gfx::after_submit();
-  if (!final) require(gfx::resume_frame(), "Batch resume failed");
-}
-
-constexpr std::array<std::array<uint8_t, 4>, 4> colors{{
-    {255, 0, 0, 255}, {0, 255, 0, 255}, {0, 0, 255, 255}, {255, 255, 0, 255}}};
-using Pixels = std::vector<uint8_t>;
-Pixels expected(unsigned extent) {
-  Pixels bytes(extent * extent * 4);
-  // GX RGBA8: 4x4 tiles, sixteen A/R pairs followed by sixteen G/B pairs.
-  for (unsigned y = 0; y < extent; ++y) for (unsigned x = 0; x < extent; ++x) {
-    const auto color = colors[y * 4 / extent];
-    const auto tile = ((y / 4) * (extent / 4) + x / 4) * 64;
-    const auto pair = ((y % 4) * 4 + x % 4) * 2;
-    bytes[tile + pair] = color[3]; bytes[tile + pair + 1] = color[0];
-    bytes[tile + 32 + pair] = color[1]; bytes[tile + 33 + pair] = color[2];
-  }
-  return bytes;
-}
-
-Pixels run(unsigned splitEvery, bool async = false, bool offscreen = false, unsigned geometry = 0, bool capacityStress = false, bool interpolate = false, bool frameWorker = false, unsigned copyCase = 0) {
-  require(!async || !offscreen, "Combined probe mode is not supported");
-  guardedBake.fill(0xa5);
-  gx::g_gxState.clearColor = {0.f, 0.f, 0.f, 1.f};
-  require(frameWorker ? aurora_begin_frame() : gfx::begin_frame(), "Frame begin failed");
-  std::array<std::array<float, 3>, 4> positions{};
-  if (geometry) {
-    alignas(32) static std::array<uint8_t, 32768> fifo;
-    GXInit(fifo.data(), fifo.size());
-    gx::g_gxState.viewportPolicy = AURORA_VIEWPORT_NATIVE;
-    GXSetViewport(0.f, 0.f, 64.f, 64.f, 0.f, 1.f);
-    GXSetScissor(0, 0, 64, 64);
-    GXSetCullMode(GX_CULL_NONE);
-    GXSetZMode(false, GX_ALWAYS, false);
-    GXSetBlendMode(GX_BM_NONE, GX_BL_ONE, GX_BL_ZERO, GX_LO_COPY);
-    GXSetColorUpdate(true); GXSetAlphaUpdate(true);
-    GXSetNumTexGens(0); GXSetNumChans(1); GXSetNumTevStages(copyCase ? copyCase : 1);
-    for (unsigned stage = 1; stage < copyCase; ++stage) {
-      GXSetTevOrder(static_cast<GXTevStageID>(stage), GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
-      GXSetTevOp(static_cast<GXTevStageID>(stage), GX_PASSCLR);
-    }
-    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
-    GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
-    GXSetChanCtrl(GX_COLOR0A0, false, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE);
-    const float projection[]{interpolate ? 0.f : 1.f, 1.f, 0.f, 1.f, 0.f, 0.f, -0.5f};
-    GXSetProjectionv(projection);
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, geometry == 2 ? GX_INDEX8 : GX_DIRECT);
-    GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
-    if (geometry == 2) GXSetArray(GX_VA_POS, positions.data(), sizeof(positions), sizeof(positions[0]), true);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    gx::fifo::drain();
-  }
-  const auto pipeline = gfx::pipeline_ref(gfx::clear::PipelineConfig{});
-  for (unsigned band = 0; band < 4; ++band) {
-    const auto c = colors[band];
-    if (geometry) {
-      const float top = 1.f - band * 0.5f;
-      const float bottom = top - 0.5f;
-      const float z = interpolate ? -1.f : 0.f;
-      positions = {{{-1.f, top, z}, {1.f, top, z}, {1.f, bottom, z}, {-1.f, bottom, z}}};
-      // Keep the same array address/format and change only its bytes between draws.
-      if (geometry == 2) GXInvalidateVtxCache();
-      if (geometry == 3) {
-        std::array<uint8_t, 64> raw{};
-        for (unsigned index = 0; index < positions.size(); ++index) {
-          for (unsigned axis = 0; axis < 3; ++axis) {
-            const auto bits = std::bit_cast<uint32_t>(positions[index][axis]);
-            for (unsigned byte = 0; byte < 4; ++byte)
-              raw[index * 16 + axis * 4 + byte] = bits >> (24 - byte * 8);
-          }
-          std::copy(c.begin(), c.end(), raw.begin() + index * 16 + 12);
-        }
-        require(gx::fifo::submit_raw_draw(GX_QUADS, GX_VTXFMT0, raw.data(), 4, raw.size()),
-                "Raw bridge rejected valid quad");
-      } else {
-      GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-      for (unsigned index = 0; index < positions.size(); ++index) {
-        if (geometry == 2) GXPosition1x8(index);
-        else GXPosition3f32(positions[index][0], positions[index][1], positions[index][2]);
-        GXColor4u8(c[0], c[1], c[2], 255);
-      }
-      GXEnd();
-      }
-    } else {
-    gfx::push_draw_command(gfx::clear::DrawData{
-        .pipeline = pipeline,
-        .color = {c[0] / 255., c[1] / 255., c[2] / 255., 1.},
-        .depth = 0.5f,
-        .useScissor = true,
-        .scissor = {0, static_cast<int32_t>(band * 16), 64, 16}});
-    }
-    if (offscreen && band == 0) {
-      // Suspend a partially recorded EFB, bake an independently observable copy,
-      // then resume it before a possible capacity-boundary submission.
-      gfx::begin_offscreen(64, 64);
-      gfx::push_draw_command(gfx::clear::DrawData{
-          .pipeline = pipeline, .color = {1., 0., 1., 1.}, .depth = 0.25f});
-      if (capacityStress) for (unsigned draw = 0; draw < 24; ++draw) {
-        gfx::push_draw_command(gfx::clear::DrawData{
-            .pipeline = pipeline, .color = {1., 0., 1., 1.}, .depth = 0.25f,
-            .useScissor = true, .scissor = {0, 0, 4, 4}});
-      }
-      auto baked = gfx::new_render_texture(64, 64, GX_TF_RGBA8, "Aurora probe offscreen bake");
-      gfx::resolve_pass(baked, {0, 0, 64, 64}, false, false, false,
-                        {0.f, 0.f, 0.f, 1.f}, 1.f, GX_TF_RGBA8, nullptr, false,
-                        nullptr, false, 1.f, false, false, true);
-      gfx::efb_ram::schedule(guardedBake.data() + 16, 16, 16, GX_TF_RGBA8, baked);
-      gfx::end_offscreen();
-      if (capacityStress) {
-        require(gfx::efb_ram::prepare_downloads(), "Early bake readback preparation failed");
-        for (unsigned draw = 0; draw < 24; ++draw) {
-          gfx::push_draw_command(gfx::clear::DrawData{
-              .pipeline = pipeline, .color = {1., 0., 0., 1.}, .depth = 0.5f,
-              .useScissor = true, .scissor = {0, 0, 4, 4}});
-        }
-      }
-    }
-    if (splitEvery && band < 3 && (band + 1) % splitEvery == 0) submit(false);
-  }
-  auto texture = gfx::new_render_texture(64, 64, GX_TF_RGBA8, "Aurora probe persistent copy");
-  static std::array<uint8_t, 64 * 64 * 4> copyDestination;
-  if (copyCase) {
-    gx::fifo::drain();
-    GXSetTexCopySrc(0, 0, 64, 64);
-    GXSetTexCopyDst(64, 64, GX_TF_RGBA8, GX_FALSE);
-    GXCopyTex(copyDestination.data(), GX_FALSE);
-    texture = gx::g_gxState.copyTextures.at(copyDestination.data()).handle;
-  } else {
-  // A partial clear forces the real snapshot and clear-uniform paths after the copy.
-  gfx::resolve_pass(texture, {0, 0, 64, 64}, true, true, true, {0.f, 0.f, 0.f, 1.f},
-                    1.f, GX_TF_RGBA8, nullptr, false, nullptr, false, 1.f, false, false, true);
-  }
-  guarded.fill(0xa5);
-  const unsigned extent = async ? 4 : 16;
-  const unsigned bytes = extent * extent * 4;
-  gfx::efb_ram::schedule(guarded.data() + 16, extent, extent, GX_TF_RGBA8, texture);
-  const auto before = guestWrites.load(std::memory_order_acquire);
-  if (async) gfx::efb_ram::seal_async_downloads();
-  else require(gfx::efb_ram::prepare_downloads(), "Readback preparation failed");
-  if (frameWorker) {
-    require(!async && aurora_flush_efb_copies_to_ram(), "Worker-mode EFB readback failed");
-    aurora_end_frame();
-  } else submit(true, !async, async);
-  if (async) {
-    const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(5);
-    while (guestWrites.load(std::memory_order_acquire) == before) {
-      webgpu::g_instance.ProcessEvents();
-      require(std::chrono::steady_clock::now() < deadline, "Async readback did not complete");
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
-  }
-  require(std::all_of(guarded.begin(), guarded.begin() + 16, [](auto b) { return b == 0xa5; }) &&
-          std::all_of(guarded.begin() + 16 + bytes, guarded.end(), [](auto b) { return b == 0xa5; }),
-          "Readback wrote outside its destination");
-  if (offscreen) {
-    require(std::all_of(guardedBake.begin(), guardedBake.begin() + 16, [](auto b) { return b == 0xa5; }) &&
-            std::all_of(guardedBake.end() - 16, guardedBake.end(), [](auto b) { return b == 0xa5; }),
-            "Offscreen readback wrote outside its destination");
-    for (unsigned tile = 0; tile < 16; ++tile) for (unsigned pair = 0; pair < 16; ++pair) {
-      const auto offset = 16 + tile * 64 + pair * 2;
-      require(guardedBake[offset] == 255 && guardedBake[offset + 1] == 255 &&
-              guardedBake[offset + 32] == 0 && guardedBake[offset + 33] == 255,
-              "Offscreen bake did not preserve expected magenta pixels");
-    }
-  }
-  Pixels pixels(guarded.begin() + 16, guarded.begin() + 16 + bytes);
-  return pixels;
-}
-} // namespace
-
-int main(int argc, char** argv) {
-  if (argc != 2) return 2;
-  std::filesystem::create_directories(argv[1]);
-  AuroraConfig config{};
-  config.appName = "Aurora readback regression tests";
-  config.userPath = argv[1];
-  config.cachePath = argv[1];
-  config.resourcesPath = argv[1];
-  config.desiredBackend = BACKEND_AUTO;
-  config.windowWidth = 64;
-  config.windowHeight = 64;
-  config.msaa = 1;
-  config.maxTextureAnisotropy = 1;
-  config.logLevel = LOG_INFO;
-  config.logCallback = [](AuroraLogLevel level, const char* module, const char* message, unsigned size) {
-    if (level >= LOG_ERROR) ++errors;
-    std::fprintf(stderr, "[%s] %.*s\n", module, static_cast<int>(size), message);
-  };
-  const auto initialized = aurora_initialize(1, argv, &config);
-  if (initialized.initializationStatus != AURORA_INITIALIZATION_SUCCESS) return 3;
-  aurora_set_skip_unready_pipelines(true);
-  aurora_set_guest_write_hooks(nullptr, [](const void*, size_t) {
-    guestWrites.fetch_add(1, std::memory_order_release);
-  });
-  try {
-    const auto prewarmQueued = gfx::queued_pipeline_count();
-    const auto prewarmDeadline = std::chrono::steady_clock::now() + std::chrono::seconds(60);
-    while (gfx::queued_pipeline_count() != 0) {
-      require(std::chrono::steady_clock::now() < prewarmDeadline, "Seeded pipeline prewarm did not finish");
-      webgpu::g_instance.ProcessEvents();
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
-    std::printf("Actual Aurora completed seeded startup queue (%u observed pending)\n", prewarmQueued);
-    const auto control = run(0);
-    for (unsigned band = 0; band < 4; ++band) {
-      const auto tile = band * 4 * 64;
-      std::fprintf(stderr, "band=%u ARGB=%u,%u,%u,%u\n", band, control[tile],
-                   control[tile + 1], control[tile + 32], control[tile + 33]);
-    }
-    require(control == expected(16), "Unsplit pixels differ from independently expected GX data");
-    for (unsigned iteration = 0; iteration < 9; ++iteration) {
-      const auto splitEvery = iteration % 3 + 1;
-      require(run(splitEvery) == control, "Split pixels differ from unsplit control");
-      std::printf("Actual Aurora split=%u iteration=%u matched native tiled readback\n", splitEvery, iteration);
-    }
-    for (unsigned iteration = 0; iteration < 9; ++iteration) {
-      require(run(iteration % 3 + 1, true) == expected(4), "Async pixels differ from expected GX data");
-      std::printf("Actual Aurora async iteration=%u matched native tiled readback\n", iteration);
-    }
-    for (unsigned splitEvery = 0; splitEvery < 4; ++splitEvery) {
-      require(run(splitEvery, false, true) == expected(16), "Offscreen interlude changed the suspended EFB");
-      std::printf("Actual Aurora offscreen split=%u preserved bake and suspended EFB\n", splitEvery);
-    }
-    for (unsigned splitEvery = 0; splitEvery < 4; ++splitEvery) {
-      require(run(splitEvery, false, false, true) == expected(16), "GX FIFO quad pixels differ from expected output");
-      std::printf("Actual Aurora GX FIFO split=%u preserved direct vertices, indices and uniforms\n", splitEvery);
-    }
-    for (unsigned splitEvery = 0; splitEvery < 4; ++splitEvery) {
-      require(run(splitEvery, false, false, 2) == expected(16), "Invalidated GX array pixels differ from expected output");
-      std::printf("Actual Aurora GX invalidation split=%u refreshed the same array address\n", splitEvery);
-    }
-    const gfx::StagingSizes physical{gfx::VertexBufferSize, gfx::UniformBufferSize,
-                                      gfx::IndexBufferSize, gfx::StorageBufferSize};
-    const auto uniformTail = gx::MaxUniformSize + 32 * gfx::staging_uniform_bytes(48);
-    for (unsigned buffer = 0; buffer < 4; ++buffer) {
-      auto limits = physical;
-      limits[buffer] = buffer == 0 ? 128 : buffer == 1 ? uniformTail + 512 :
-                       buffer == 2 ? 24 : 2 * gfx::staging_storage_bytes(48);
-      gfx::set_staging_capacity_limits_for_testing(limits);
-      const auto before = gfx::staging_split_count();
-      require(run(0, false, false, buffer == 1 ? 0 : buffer == 3 ? 2 : 1) == expected(16),
-              "Automatic capacity split changed pixels");
-      require(gfx::staging_split_count() > before, "Forced capacity did not split");
-      const auto highWater = gfx::staging_high_water();
-      for (unsigned i = 0; i < limits.size(); ++i)
-        require(highWater[i] <= limits[i], "Actual staging usage exceeded admission budget");
-      std::printf("Actual staging high-water V/U/I/S=%llu/%llu/%llu/%llu bytes\n",
-          static_cast<unsigned long long>(highWater[0]), static_cast<unsigned long long>(highWater[1]),
-          static_cast<unsigned long long>(highWater[2]), static_cast<unsigned long long>(highWater[3]));
-      std::printf("Actual Aurora automatic capacity buffer=%u splits=%llu matched pixels\n", buffer,
-                  static_cast<unsigned long long>(gfx::staging_split_count() - before));
-    }
-    auto limits = physical;
-    limits[0] = 128;
-    gfx::set_staging_capacity_limits_for_testing(limits);
-    require(run(0, false, false, 3) == expected(16), "Raw bridge capacity split changed pixels");
-    std::puts("Actual Aurora raw bridge capacity split preserved direct quad pixels");
-    limits = physical;
-    limits[1] = uniformTail + 768;
-    gfx::set_staging_capacity_limits_for_testing(limits);
-    const auto beforeBake = gfx::staging_split_count();
-    require(run(0, false, true, 0, true) == expected(16),
-            "Automatic offscreen split changed bake or suspended EFB");
-    require(gfx::staging_split_count() - beforeBake >= 9, "Offscreen test did not reuse all staging slots");
-    std::printf("Actual Aurora automatic offscreen/readback splits=%llu preserved all pixels\n",
-                static_cast<unsigned long long>(gfx::staging_split_count() - beforeBake));
-    gfx::set_staging_capacity_limits_for_testing(physical);
-    aurora_set_frame_interpolation_fps(120);
-    for (unsigned frame = 0; frame < 3; ++frame)
-      require(run(0, false, false, 2, false, true) == expected(16), "Perspective warmup changed pixels");
-    AuroraFrameInterpolationDiagnostics interpolation{};
-    gx::get_frame_interpolation_diagnostics(interpolation);
-    require(interpolation.matchable > 0 && interpolation.activeSamples > 0,
-            "Interpolation probe did not establish matching perspective draws");
-    limits = physical;
-    limits[3] = 2 * gfx::staging_storage_bytes(48);
-    gfx::set_staging_capacity_limits_for_testing(limits);
-    require(run(0, false, false, 2, false, true) == expected(16), "Interpolated split changed native pixels");
-    gx::get_frame_interpolation_diagnostics(interpolation);
-    require(!interpolation.replaySafe, "Split frame incorrectly retained interpolation replay");
-    aurora_set_frame_interpolation_fps(0);
-    std::puts("Actual Aurora matched perspective interpolation survived capacity split and disabled replay");
-    limits = physical;
-    limits[0] = 32; // One quad needs 64 bytes: typed rejection before any draw allocation.
-    gfx::set_staging_capacity_limits_for_testing(limits);
-    bool oversized = false;
-    try { run(0, false, false, 1); }
-    catch (const gfx::StagingCapacityError&) { oversized = true; }
-    require(oversized, "Oversized primitive was not rejected");
-    require(gfx::staging_usage() == gfx::StagingSizes{}, "Oversized primitive partially allocated");
-    gx::fifo::clear_buffer();
-    gfx::abort_frame();
-    gfx::set_staging_capacity_limits_for_testing(physical);
-    std::puts("Actual Aurora oversized primitive rejected before staging mutation");
-    require(run(0, false, false, 1) == expected(16), "Renderer failed after rejected primitive cleanup");
-    limits = physical;
-    limits[3] = 2 * gfx::staging_storage_bytes(48);
-    gfx::set_staging_capacity_limits_for_testing(limits);
-    aurora_set_frame_interpolation_fps(120);
-    for (unsigned frame = 0; frame < 16; ++frame)
-      require(run(0, false, false, 2, false, true, true) == expected(16),
-              "Frame-worker capacity split changed pixels");
-    // Grant preparation of the next frame before joining DONE, exactly as the
-    // real producer does; leave no worker waiting for a future begin_frame.
-    require(aurora_begin_frame(), "Final worker frame preparation failed");
-    aurora::wait_for_frame_worker();
-    gfx::abort_frame();
-    aurora_set_frame_interpolation_fps(0);
-    gfx::set_staging_capacity_limits_for_testing(physical);
-    std::puts("Actual Aurora frame worker completed 16 capacity-split perspective frames");
-    require(errors == 0, "Renderer reported an error");
-  } catch (const std::exception& error) {
-    std::fprintf(stderr, "FAIL: %s\n", error.what());
-    aurora_shutdown();
-    return 4;
-  }
-  aurora_shutdown();
-  if (errors != 0) return 4;
-  std::puts("Actual Aurora clear/resolve/snapshot/downsample/readback batches passed");
-}
@@ -462,18 +462,8 @@ TEST(FrameInterpolationContract, IndexedPaletteHistoryKeepsAbsoluteVertexSlots)
  std::array<uint8_t, uniformSize> changedSource{};
  aurora::gx::begin_frame_interpolation();
  const auto changedRanges = recordFrame(changedTopology, 91.0f, 9.0f, changedSource);
-  // Staging may reserve a copy for sibling matching; the correctness contract
-  // is that an unmatched topology receives the current pose unchanged.
-  const auto expectedCurrent = changedSource;
+  EXPECT_EQ(changedRanges[0].size, 0u);
  aurora::gx::finalize_frame_interpolation();
-  EXPECT_EQ(changedSource, expectedCurrent);
-  if (changedRanges[0].size != 0) {
-    // No replacement range also correctly selects the original current uniform.
-    ASSERT_EQ(changedRanges[0].size, uniformSize);
-    const auto& duplicated = aurora::gfx::testing::uniform_allocation(changedRanges[0].offset);
-    ASSERT_EQ(duplicated.size(), expectedCurrent.size());
-    EXPECT_EQ(std::memcmp(duplicated.data(), expectedCurrent.data(), expectedCurrent.size()), 0);
-  }

  aurora::gx::set_frame_interpolation_fps(0);
  aurora::gx::begin_frame_interpolation();
@@ -656,34 +646,12 @@ TEST(TevRegisterLivenessContract, PacksOneUniformWhenBothHalvesNeedInitialValue)
  auto config = baseline;
  config.tevStages[0].colorPass.a = GX_CC_C0;
  config.tevStages[0].alphaPass.a = GX_CA_A0;
-  config.tevStages[0].colorPass.b = GX_CC_KONST;
-  config.tevStages[0].kcSel = GX_TEV_KCSEL_K0;

+  const auto baselineInfo = aurora::gx::build_shader_info(baseline);
  const auto info = aurora::gx::build_shader_info(config);
  EXPECT_TRUE(info.loadsTevRegRgb.test(GX_TEVREG0));
  EXPECT_TRUE(info.loadsTevRegAlpha.test(GX_TEVREG0));
-  // The final allocation is alignment-rounded, so adding one register need
-  // not increase it. Verify actual packing with a distinct following K color.
-  const auto savedReg = g_gxState.colorRegs[GX_TEVREG0];
-  const auto savedKColor = g_gxState.kcolors[GX_KCOLOR0];
-  g_gxState.colorRegs[GX_TEVREG0] = {11.f, 22.f, 33.f, 44.f};
-  g_gxState.kcolors[GX_KCOLOR0] = {55.f, 66.f, 77.f, 88.f};
-  EXPECT_TRUE(info.sampledKColors.test(GX_KCOLOR0));
-  aurora::gfx::testing::reset_uniform_allocations();
-  aurora::gx::build_uniform(info, 0, {}, {}, false);
-  const auto expectedReg = g_gxState.colorRegs[GX_TEVREG0];
-  const auto expectedKColor = g_gxState.kcolors[GX_KCOLOR0];
-  g_gxState.colorRegs[GX_TEVREG0] = savedReg;
-  g_gxState.kcolors[GX_KCOLOR0] = savedKColor;
-  const auto& bytes = aurora::gfx::testing::uniform_allocation(0);
-  const auto* reg = reinterpret_cast<const uint8_t*>(&expectedReg);
-  const auto found = std::search(bytes.begin(), bytes.end(), reg, reg + sizeof(aurora::Vec4<float>));
-  ASSERT_NE(found, bytes.end());
-  const size_t offset = static_cast<size_t>(found - bytes.begin());
-  ASSERT_LE(offset + 2 * sizeof(aurora::Vec4<float>), bytes.size());
-  EXPECT_EQ(std::memcmp(bytes.data() + offset + sizeof(aurora::Vec4<float>),
-                        &expectedKColor, sizeof(aurora::Vec4<float>)), 0);
-  aurora::gfx::testing::reset_uniform_allocations();
+  EXPECT_EQ(info.uniformSize, baselineInfo.uniformSize + sizeof(aurora::Vec4<float>));
 }

 // BP registers (direct FIFO writes, no dirty state flush needed)
@@ -740,52 +708,6 @@ TEST_F(GXFifoTest, BlendMode_Logic) {
  EXPECT_EQ(g_gxState.blendOp, GX_LO_XOR);
 }

-
-TEST_F(GXFifoTest, GenMode_FirstZeroWriteDecodesAndRepeatDeduplicates) {
-  reset_gx_state();
-  const auto before = g_gxState.pipelineStateGeneration;
-  decode_fifo(bp_cmd(0, 0));
-  EXPECT_EQ(g_gxState.numTevStages, 1u);
-  EXPECT_EQ(g_gxState.cullMode, GX_CULL_NONE);
-  EXPECT_EQ(g_gxState.numChans, 0u);
-  EXPECT_EQ(g_gxState.numTexGens, 0u);
-  EXPECT_EQ(g_gxState.numIndStages, 0u);
-  EXPECT_EQ(g_gxState.bpRegCache[0], 0u);
-  EXPECT_NE(g_gxState.pipelineStateGeneration, before);
-  const auto decoded = g_gxState.pipelineStateGeneration;
-  decode_fifo(bp_cmd(0, 0));
-  EXPECT_EQ(g_gxState.pipelineStateGeneration, decoded);
-}
-
-TEST_F(GXFifoTest, GenMode_FirstMaskedWritePreservesZeroResetBits) {
-  for (const u32 mask : {0u, 1u << 10}) {
-    reset_gx_state();
-    const auto before = g_gxState.pipelineStateGeneration;
-    decode_fifo(bp_cmd(0xFE, mask));
-    decode_fifo(bp_cmd(0, 0xFFFFFF));
-    EXPECT_EQ(g_gxState.bpRegCache[0], mask);
-    EXPECT_EQ(g_gxState.bpRegCache[0xFE], 0xFFFFFFu);
-    EXPECT_EQ(g_gxState.numTevStages, mask ? 2u : 1u);
-    EXPECT_EQ(g_gxState.cullMode, GX_CULL_NONE);
-    EXPECT_NE(g_gxState.pipelineStateGeneration, before);
-    decode_fifo(bp_cmd(0, 0));
-    EXPECT_EQ(g_gxState.numTevStages, 1u);
-    EXPECT_EQ(g_gxState.bpRegCache[0], 0u);
-  }
-}
-
-TEST_F(GXFifoTest, GenMode_ColdSingleStageApiSetupDecodes) {
-  reset_gx_state();
-  GXSetNumTevStages(1);
-  GXSetNumTexGens(0);
-  GXSetNumChans(0);
-  GXSetCullMode(GX_CULL_NONE);
-  const auto bytes = flush_and_capture();
-  decode_fifo(bytes);
-  EXPECT_EQ(g_gxState.numTevStages, 1u);
-  EXPECT_EQ(g_gxState.cullMode, GX_CULL_NONE);
-}
-
 TEST_F(GXFifoTest, BpMask_AppliesOnlyToNextWrite) {
  std::vector<u8> bytes;
  auto mask = bp_cmd(0xFE, 1u << 19);
@@ -2257,7 +2179,6 @@ TEST_F(GXFifoTest, DrawTopologyTemplatesPreserveExactGxIndexOrder) {
  const auto decodeAndReadIndices = [&](GXPrimitive primitive, u16 count) {
    std::vector<u8> fifo;
    append_test_draw(fifo, primitive, count);
-    aurora::gfx::testing::reset_vertex_push_record();
    decode_fifo(fifo);
    return aurora::gfx::testing::last_pushed_indices();
  };
@@ -2272,7 +2193,7 @@ TEST_F(GXFifoTest, DrawTopologyTemplatesPreserveExactGxIndexOrder) {
            (std::vector<u16>{0, 1, 2, 0, 2, 3, 0, 3, 4}));
  g_gxState.stateDirty = true;
  EXPECT_EQ(decodeAndReadIndices(GX_TRIANGLEFAN, 2),
-            (std::vector<u16>{}));
+            (std::vector<u16>{0, 1}));
  g_gxState.stateDirty = true;
  EXPECT_EQ(decodeAndReadIndices(GX_TRIANGLESTRIP, 6),
            (std::vector<u16>{0, 1, 2, 2, 1, 3, 2, 3, 4, 4, 3, 5}));
@@ -4245,9 +4166,7 @@ TEST_F(GXFifoTest, CopyTexClearTruePassesScratchRectAndUpdateMasksToResolve) {
  EXPECT_NEAR(resolve.clearColorValue.y(), 128.f / 255.f, 1.f / 255.f);
  EXPECT_NEAR(resolve.clearColorValue.z(), 192.f / 255.f, 1.f / 255.f);
  EXPECT_NEAR(resolve.clearColorValue.w(), 32.f / 255.f, 1.f / 255.f);
-  const float gxDepth = 0x123456 / 16777216.f;
-  EXPECT_NEAR(resolve.clearDepthValue, aurora::gx::UseReversedZ ? 1.f - gxDepth : gxDepth,
-              1.f / 16777216.f);
+  EXPECT_NEAR(resolve.clearDepthValue, 0x123456 / 16777216.f, 1.f / 16777216.f);
  EXPECT_EQ(resolve.resolveFormat, GX_TF_RGBA8);
  EXPECT_FALSE(resolve.halfScale);
  EXPECT_FALSE(resolve.forceOpaqueAlpha);
@@ -50,9 +50,6 @@ void reset_uniform_allocations() noexcept;
 const std::vector<uint8_t>& uniform_allocation(size_t index) noexcept;
 void use_draw_command_tracking(bool enabled) noexcept;
 void use_real_vertex_format_helpers(bool enabled) noexcept;
-// Admit this many draws, then refuse one as if the staging batch were full.
-void refuse_staging_admission_after(uint32_t admissions) noexcept;
-void reset_staging_capacity() noexcept;
 } // namespace aurora::gfx::testing

 class GXFifoTest : public ::testing::Test {
@@ -68,7 +65,6 @@ protected:
    aurora::gfx::testing::reset_resolve_pass_records();
    aurora::gfx::testing::reset_vertex_push_record();
    aurora::gfx::testing::use_real_vertex_format_helpers(false);
-    aurora::gfx::testing::reset_staging_capacity();
  }

  // Copy the internal FIFO buffer contents and clear it
@@ -34,9 +34,6 @@ std::optional<aurora::gx::DrawData> s_lastGxDraw;
 bool s_trackDrawCommands = false;
 bool s_useRealVertexFormatHelpers = false;
 std::deque<std::vector<uint8_t>> s_uniformAllocations;
-std::optional<uint32_t> s_stagingAdmissionsBeforeRefusal;
-bool s_stagingRefused = false;
-uint64_t s_stagingSplitCount = 0;
 } // namespace

 // --- aurora::g_config ---
@@ -302,25 +299,6 @@ std::pair<ByteBuffer, Range> copy_uniform(Range source) {
  return map_uniform(source.size);
 }
 uint32_t align_uniform(uint32_t value) { return (value + 255u) & ~255u; }
-uint64_t staging_uniform_bytes(uint64_t value) { return staging_padded(value, 256); }
-uint64_t staging_storage_bytes(uint64_t value) { return staging_padded(value, 256); }
-bool staging_has_space(const StagingSizes&) {
-  if (!s_stagingAdmissionsBeforeRefusal) return true;
-  if (*s_stagingAdmissionsBeforeRefusal > 0) {
-    --*s_stagingAdmissionsBeforeRefusal;
-    return true;
-  }
-  // Refuse once, as a full batch would; the split that follows makes room again.
-  s_stagingAdmissionsBeforeRefusal.reset();
-  s_stagingRefused = true;
-  return false;
-}
-void split_staging_batch() {
-  if (!s_stagingRefused) throw StagingCapacityError("Unexpected split in FIFO unit test");
-  s_stagingRefused = false;
-  ++s_stagingSplitCount;
-}
-uint64_t staging_split_count() noexcept { return s_stagingSplitCount; }

 Vec2<uint32_t> get_render_target_size() noexcept { return s_renderTargetSize; }
 Vec2<uint32_t> get_frame_buffer_size() noexcept { return s_renderTargetSize; }
@@ -363,15 +341,6 @@ void use_draw_command_tracking(bool enabled) noexcept {
 void use_real_vertex_format_helpers(bool enabled) noexcept {
  s_useRealVertexFormatHelpers = enabled;
 }
-void refuse_staging_admission_after(uint32_t admissions) noexcept {
-  s_stagingAdmissionsBeforeRefusal = admissions;
-  s_stagingRefused = false;
-}
-void reset_staging_capacity() noexcept {
-  s_stagingAdmissionsBeforeRefusal.reset();
-  s_stagingRefused = false;
-  s_stagingSplitCount = 0;
-}
 } // namespace aurora::gfx::testing

 // --- Pipeline/draw command stubs ---
@@ -552,7 +521,6 @@ std::optional<TextureHandle> find_replacement(const GXTexObj_&) noexcept { retur
 namespace aurora::window {
 AuroraWindowSize get_window_size() { return {640, 480, 640, 480, 640, 480, 1.0f}; }
 void set_frame_buffer_aspect_fit(bool) {}
-void set_force_aspect_16_9(bool) {}
 } // namespace aurora::window

 // --- WebGPU C API stubs (prevent linker errors from wgpu:: destructors) ---
@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.25)
-project(metalfx_interop LANGUAGES CXX)
-
-if(NOT APPLE)
-  message(FATAL_ERROR "The MetalFX interoperability probe requires macOS")
-endif()
-enable_language(OBJCXX)
-set(CMAKE_OBJCXX_STANDARD 20)
-set(CMAKE_OBJCXX_STANDARD_REQUIRED ON)
-set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
-
-# Use the same Dawn package as Aurora; no separate download or renderer build.
-find_package(Threads REQUIRED)
-find_package(Dawn CONFIG REQUIRED)
-add_executable(metalfx_interop main.mm ../../lib/webgpu/metalfx.mm)
-target_include_directories(metalfx_interop PRIVATE ../../lib)
-target_compile_options(metalfx_interop PRIVATE -fobjc-arc -Wall -Wextra)
-target_link_libraries(metalfx_interop PRIVATE dawn::webgpu_dawn
-  "-framework MetalFX" "-framework Metal" "-framework IOSurface" "-framework Foundation")
-enable_testing()
-add_test(NAME metalfx_interop COMMAND metalfx_interop)
-set_tests_properties(metalfx_interop PROPERTIES SKIP_RETURN_CODE 77 TIMEOUT 60)
-
-add_executable(metalfx_stub_test stub_test.cpp ../../lib/webgpu/metalfx_stub.cpp)
-target_include_directories(metalfx_stub_test PRIVATE ../../lib)
-target_compile_features(metalfx_stub_test PRIVATE cxx_std_20)
-target_link_libraries(metalfx_stub_test PRIVATE dawn::webgpu_dawn)
-add_test(NAME metalfx_stub COMMAND metalfx_stub_test)
--- a/Show More
+++ b/Show More