13 conflicts, resolved as:
- build.yml: both checkout steps keep the MaliBridge submodule and take main's sparse checkout.
- SessionActivity: main moved the session drawer into SessionMenu(); its DrawerActions get the
test branch's systemPowerVr line, the only test-branch change in that call.
- TurnipDriver: the Mali check stays first, then main's injected detector (non-Adreno: system driver).
- BwrapSpawner: the bridge ICD check stays first, then main's runtimeLib() lookup (Ubuntu 26.04 paths).
- SessionArtifacts.finishAbandoned: main's beforeGuestStart flow and recovery markers, plus the test
branch's Android exit reasons in the recovery note and the low-memory notice (returns Boolean);
main's in-loop return becomes break so the notice is still left.
- SessionService: pruneSystemVulkanRuntime() kept before main's finishSessionStop(..., collectEnded).
- strings.xml, test_game_environment.py: both sides' additions.
- build_local.sh, test_local.sh: main's docker_platform.sh; local-cross.Dockerfile: main's
arm64-aware layout plus libvulkan-dev, image tag 24.04-v4.
- gamescope/release.env: the p23-nonadreno pin stays until this round's gamescope build.
- check_session_assets.py: the test branch's pattern (any usr/ target) covers main's.
Workflow step names checked: none lost from either side.
* feat: art-first library cards with a display menu for size, title and storage
* build: use native arm64 docker on Apple Silicon and add a fast deploy loop
* fix: address review feedback on library cards and local build scripts
Detect Samsung's Vulkan HAL (vulkan.samsung.so) and its sgpu render node
alongside PowerVR, and run Xclipse through the same libhybris bridge:
- VK_LAYER_DROIDDECK_xclipse (tools/linuxfs/xclipse-layer), built with the
glibc preloads and enabled only on Xclipse: sets bionic's environ for the
driver's shader compiler, avoids immutable YCbCr samplers in compute
layouts, forwards the KHR calibrated-timestamp entry points to the EXT
ones, and reports textureCompressionBC and BC4/BC5 filtering over the
compat layer's BC emulation.
- Upstream DXVK 2.6.2, pinned as a tar.gz component and selected on Xclipse:
the driver has 128 bytes of push constants, DXVK 3 needs 256.
- android_wlegl accepts a zero stride and passes it through unchanged:
Samsung's gralloc records none for GPU-only buffers.
Tested on a Galaxy A56 (Xclipse 540, driver 24.0.560): Steam Big Picture
and PICO PARK (D3D9).