Sync upstream (248) + Direct Composition on VulkanRenderer (PR #380 + #584)

.gitattributes

@@ -1,3 +1,5 @@
 *.txz filter=lfs diff=lfs merge=lfs -text
+app/src/main/assets/imagefs.tzst filter=lfs diff=lfs merge=lfs -text
+app/src/main/assets/imagefs.part*.tzst filter=lfs diff=lfs merge=lfs -text
 reference/tooling/jadx.zip filter=lfs diff=lfs merge=lfs -text
 reference/tooling/jadx/lib/jadx-1.5.3-all.jar filter=lfs diff=lfs merge=lfs -text

.github/workflows/pr-ci.yml

@@ -38,6 +38,10 @@ jobs:
             artifactName: apk-pubg
             gradleTask: assemblePubgDebug
             apkPath: app/build/outputs/apk/pubg/debug/pubg.apk
+          - name: Antutu
+            artifactName: apk-antutu
+            gradleTask: assembleAntutuDebug
+            apkPath: app/build/outputs/apk/antutu/debug/antutu.apk
 
     steps:
     - name: Clone repository
@@ -63,22 +67,37 @@ jobs:
         path: |
           app/.cxx
           app/build/intermediates/cxx
-        key: ndk-${{ matrix.flavor.name }}-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
+        key: ndk-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
         restore-keys: |
-          ndk-${{ matrix.flavor.name }}-
           ndk-
 
+    # Cargo target dir + registry sit outside the NDK cache paths; a cold Rust build dominates job time.
+    - name: Cache Rust Steam client
+      uses: actions/cache@v5
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          app/src/main/cpp/wn-steam-client/rust/target
+        key: cargo-${{ hashFiles('app/src/main/cpp/wn-steam-client/rust/Cargo.lock') }}
+        restore-keys: cargo-
+
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'
 
+    - name: Install Rust Android target
+      run: rustup target add aarch64-linux-android
+
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v6
       with:
         validate-wrappers: true
         cache-cleanup: 'on-success'
+        # PRs restore the Gradle cache read-only; only main pushes write it.
+        cache-read-only: ${{ github.event_name == 'pull_request' }}
 
     - name: Decode keystore and build
       timeout-minutes: 15
@@ -141,6 +160,8 @@ jobs:
         path: artifacts/${{ matrix.flavor.artifactName }}/*.apk
         retention-days: 7
         if-no-files-found: error
+        # APK contents are already compressed; deflating ~560MB again wastes CPU.
+        compression-level: 0
 
   cleanup-caches:
     needs: build
@@ -155,7 +176,8 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gh cache list --repo "$GITHUB_REPOSITORY" --json id,key,createdAt --limit 100 |
+        # Dedupe only main-scope caches so a newer PR-scoped twin can't get main's copy deleted.
+        gh cache list --repo "$GITHUB_REPOSITORY" --ref refs/heads/main --json id,key,createdAt --limit 100 |
           jq -r '
             group_by(.key | sub("-[a-f0-9]{20,}$"; ""))
             | .[]

.github/workflows/pr-release-publish.yml

@@ -8,7 +8,8 @@ on:
       - completed
 
 concurrency:
-  group: pr-release-${{ github.event.workflow_run.id }}
+  # Serialize publishes of the same PR branch; per-run-id groups let them race each other.
+  group: pr-release-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: false
 
 jobs:
@@ -84,9 +85,11 @@ jobs:
             echo "standard=WinNative-Debug-Standard-${label}.apk"
             echo "ludashi=WinNative-Debug-Ludashi-${label}.apk"
             echo "pubg=WinNative-Debug-Pubg-${label}.apk"
+            echo "antutu=WinNative-Debug-Antutu-${label}.apk"
             echo "release_standard=WinNative-Debug-Standard-${release_label}.apk"
             echo "release_ludashi=WinNative-Debug-Ludashi-${release_label}.apk"
             echo "release_pubg=WinNative-Debug-Pubg-${release_label}.apk"
+            echo "release_antutu=WinNative-Debug-Antutu-${release_label}.apk"
           } >> "$GITHUB_OUTPUT"
 
       - name: Download PR build artifacts
@@ -95,9 +98,15 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir -p artifacts
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-standard --dir artifacts/standard
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-ludashi --dir artifacts/ludashi
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-pubg --dir artifacts/pubg
+          # Download all flavors in parallel; the sequential form left the runner's network idle per transfer.
+          pids=()
+          for flavor in standard ludashi pubg antutu; do
+            gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name "apk-$flavor" --dir "artifacts/$flavor" &
+            pids+=($!)
+          done
+          for pid in "${pids[@]}"; do
+            wait "$pid"
+          done
 
       - name: Build release notes from PR metadata
         if: ${{ steps.scope.outputs.allowed == 'true' }}
@@ -127,6 +136,7 @@ jobs:
           {
             printf '# PR #%s\n\n' "$PR_NUMBER"
             printf 'Title: %s\n\n' "$safe_title"
+            printf 'Author: @%s\n\n' "$pr_author"
             printf 'Source PR: %s\n' "$pr_url"
             printf 'Source branch: %s\n' "$head_ref"
             printf 'Source commit: `%s`\n' "$HEAD_SHA"
@@ -141,6 +151,7 @@ jobs:
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_standard }}"
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_ludashi }}"
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_pubg }}"
+            printf -- '%s\n' "- ${{ steps.apk.outputs.release_antutu }}"
             printf '\nBuilt from source commit `%s`.\n' "$short_sha"
           } > release-notes.md
 
@@ -158,9 +169,20 @@ jobs:
           discord_marker='<!-- discord-posted -->'
           discord_posted=false
 
-          if gh release view "$tag" --repo "$TARGET_REPO" >/dev/null 2>&1; then
+          # A transient API error must not be read as "release doesn't exist" — that ends in
+          # a create over an existing tag (HTTP 422).
+          if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then
+            release_exists=true
+          elif printf '%s' "$view_out" | grep -qi 'Not Found'; then
+            release_exists=false
+          else
+            printf '%s\n' "$view_out"
+            exit 1
+          fi
+
+          if [ "$release_exists" = true ]; then
             created=false
-            existing_body=$(gh release view "$tag" --repo "$TARGET_REPO" --json body --jq '.body // ""')
+            existing_body=$(printf '%s' "$view_out" | jq -r '.body // ""')
             if printf '%s' "$existing_body" | grep -Fq "$discord_marker"; then
               discord_posted=true
               if ! grep -Fq "$discord_marker" release-notes.md; then
@@ -174,26 +196,38 @@ jobs:
               --prerelease
           else
             created=true
-            gh release create "$tag" \
+            if ! gh release create "$tag" \
               --repo "$TARGET_REPO" \
               --title "$title" \
               --notes-file release-notes.md \
-              --prerelease
+              --prerelease; then
+              # Another publish run created it between our check and the create — update instead.
+              created=false
+              gh release edit "$tag" \
+                --repo "$TARGET_REPO" \
+                --title "$title" \
+                --notes-file release-notes.md \
+                --prerelease
+            fi
           fi
 
           standard_path="artifacts/standard/${{ steps.apk.outputs.standard }}"
           ludashi_path="artifacts/ludashi/${{ steps.apk.outputs.ludashi }}"
           pubg_path="artifacts/pubg/${{ steps.apk.outputs.pubg }}"
+          antutu_path="artifacts/antutu/${{ steps.apk.outputs.antutu }}"
           release_standard_path="release-assets/${{ steps.apk.outputs.release_standard }}"
           release_ludashi_path="release-assets/${{ steps.apk.outputs.release_ludashi }}"
           release_pubg_path="release-assets/${{ steps.apk.outputs.release_pubg }}"
+          release_antutu_path="release-assets/${{ steps.apk.outputs.release_antutu }}"
           test -f "$standard_path"
           test -f "$ludashi_path"
           test -f "$pubg_path"
+          test -f "$antutu_path"
           mkdir -p release-assets
           cp "$standard_path" "$release_standard_path"
           cp "$ludashi_path" "$release_ludashi_path"
           cp "$pubg_path" "$release_pubg_path"
+          cp "$antutu_path" "$release_antutu_path"
 
           release_json=$(gh api "repos/$TARGET_REPO/releases/tags/$tag")
           existing_apk_assets=$(
@@ -231,6 +265,7 @@ jobs:
           upload_asset "$release_standard_path"
           upload_asset "$release_ludashi_path"
           upload_asset "$release_pubg_path"
+          upload_asset "$release_antutu_path"
 
           release_url=$(gh release view "$tag" --repo "$TARGET_REPO" --json url --jq '.url')
           {

.github/workflows/tag-apk-artifacts.yml

@@ -31,6 +31,10 @@ jobs:
             variant: Pubg
             gradleTask: assemblePubgDebug
             apkPath: app/build/outputs/apk/pubg/debug/pubg.apk
+          - name: Antutu
+            variant: Antutu
+            gradleTask: assembleAntutuDebug
+            apkPath: app/build/outputs/apk/antutu/debug/antutu.apk
 
     steps:
       - name: Clone repository
@@ -56,18 +60,30 @@ jobs:
           path: |
             app/.cxx
             app/build/intermediates/cxx
-          key: tag-ndk-${{ matrix.flavor.name }}-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
+          key: tag-ndk-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: |
-            tag-ndk-${{ matrix.flavor.name }}-
             tag-ndk-
             ndk-
 
+      - name: Cache Rust Steam client
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            app/src/main/cpp/wn-steam-client/rust/target
+          key: cargo-${{ hashFiles('app/src/main/cpp/wn-steam-client/rust/Cargo.lock') }}
+          restore-keys: cargo-
+
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Install Rust Android target
+        run: rustup target add aarch64-linux-android
+
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v6
         with:
@@ -121,3 +137,4 @@ jobs:
           path: artifacts/apk/*.apk
           retention-days: 30
           if-no-files-found: error
+          compression-level: 0

.gitignore

@@ -17,16 +17,16 @@ app/src/main/assets/proton-9.0-x86_64.txz
 *.log
 **/*.log
 
-# Kotlin/Gradle artifacts
-.kotlin/
-.tmp/
-.gradle/
-.gradle-user/
-.gradle-user-fresh/
-build/
-app/build/
-app/.cxx/
-app/release/
+# Kotlin/Gradle artifacts
+.kotlin/
+.tmp/
+.gradle/
+.gradle-user/
+.gradle-user-fresh/
+build/
+app/build/
+app/.cxx/
+app/release/
 
 # Python artifacts
 __pycache__/
@@ -47,3 +47,18 @@ app/schemas/
 *.jks
 *.keystore
 signing.properties
+
+# Local-only dev artifacts (never check in)
+.claude/
+References/
+*.hprof
+android_sysvshm/build64/
+
+# local build artifacts (FEX/Proton wcp)
+dist/
+
+/cores/*/
+!/cores/patches/
+
+/armsx2/emucore-src/
+/armsx2/emucore-out/

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "app/src/main/cpp/adrenotools"]
 	path = app/src/main/cpp/adrenotools
 	url = https://github.com/Pipetto-crypto/libadrenotools.git
+[submodule "app/src/main/cpp/vkbasalt"]
+	path = app/src/main/cpp/vkbasalt
+	url = https://github.com/WinNative-Emu/vkBasalt.git
+	branch = Test

EMULATOR_CREDITS.md

@@ -0,0 +1,74 @@
+# Emulator & Library Credits
+
+WinNative's retro-console features are built on open-source emulators and libraries.
+This project is distributed under the **GNU General Public License v3.0** (see [LICENSE](LICENSE)).
+In compliance with the GPL and the other licenses below, the corresponding source code
+for every GPL/copyleft component is available from the upstream projects linked here,
+and their copyright and license notices are preserved.
+
+## PlayStation 2
+
+PS2 games are recognized and imported into the library. PS2 emulation is built on
+**ARMSX2** (a GPL-3.0 fork of PCSX2) and is in active development.
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| ARMSX2 | PS2 emulation + RetroAchievements | GPL-3.0 | https://github.com/ARMSX2/ARMSX2 |
+| PCSX2 | Upstream project ARMSX2 is derived from | GPL-3.0 | https://github.com/pcsx2/pcsx2 |
+
+## GameCube / Wii
+
+GameCube and Wii games are recognized and imported into the library. GC/Wii emulation is
+built on an embedded build of **Dolphin**, rendered on Vulkan and driven entirely by
+WinNative (Dolphin's own UI is stripped). Local and online multiplayer use Dolphin's own
+native NetPlay engine.
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| Dolphin | GameCube/Wii emulation + NetPlay | GPL-2.0-or-later | https://github.com/dolphin-emu/dolphin |
+
+## Bundled libretro cores
+
+Each core is shipped as an unmodified `arm64-v8a` build and loaded through LibretroDroid.
+
+| System | Core | License | Source |
+| --- | --- | --- | --- |
+| Game Boy / Color | Gambatte | GPL-2.0 | https://github.com/libretro/gambatte-libretro |
+| Game Boy Advance | mGBA | MPL-2.0 | https://github.com/libretro/mgba |
+| Genesis / Master System / Game Gear | Genesis Plus GX | Genesis Plus GX License (non-commercial) | https://github.com/libretro/Genesis-Plus-GX |
+| NES | FCEUmm | GPL-2.0 | https://github.com/libretro/libretro-fceumm |
+| Nintendo 64 | ParaLLEl N64 | GPL-2.0 | https://github.com/libretro/parallel-n64 |
+| Nintendo 64 | Mupen64Plus-Next | GPL-2.0 | https://github.com/libretro/mupen64plus-libretro-nx |
+| PlayStation | Beetle PSX (mednafen_psx) | GPL-2.0 | https://github.com/libretro/beetle-psx-libretro |
+| SNES | Snes9x | Snes9x License (non-commercial) | https://github.com/libretro/snes9x |
+
+### Also evaluated for PlayStation
+
+| Component | License | Source |
+| --- | --- | --- |
+| SwanStation | GPL-3.0 | https://github.com/libretro/swanstation |
+
+## Frontend, achievements, and supporting libraries
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| LibretroDroid | libretro frontend the retro backend is built on | GPL-3.0 | https://github.com/Swordfish90/LibretroDroid |
+| LibretroDroid (WinNative fork) | the build WinNative ships, carrying the RetroAchievements, netplay and SGSR changes | GPL-3.0 | https://github.com/WinNative-Emu/LibretroDroid/tree/winnative |
+| Oboe | Audio output | Apache-2.0 | https://github.com/google/oboe |
+| rcheevos | RetroAchievements client library | MIT | https://github.com/RetroAchievements/rcheevos |
+| Snapdragon Game Super Resolution (SGSR) | Upscaling shader | BSD-3-Clause | https://github.com/quic/snapdragon-gsr |
+| Winlator | Windows-on-Android base this project forks | GPL-3.0 | https://github.com/brunodev85/winlator |
+
+## Source availability
+
+WinNative is released under the GPL-3.0. As required by that license and by the GPL-2.0
+cores above, the complete corresponding source for every copyleft component is obtainable
+from the repositories linked in this document, and the bundled license texts are retained
+in the source tree of the repository that builds each component.
+
+The libretro frontend is no longer built from source in this repository. WinNative links
+against `libretrodroid.aar`, published from the `winnative` branch of
+https://github.com/WinNative-Emu/LibretroDroid, which is where its GPL-3.0 source, the
+rcheevos `LICENSE` and `SGSR_LICENSE` texts now live. The exact build WinNative ships is
+pinned by release tag and SHA-256 in `tools/libretrodroid.version`, so the corresponding
+source for any given APK is the commit that tag was built from.