diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 126165ce60..6d94b3f0d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -258,6 +258,7 @@ class MainActivity : ComponentActivity() { private var customResolution by mutableStateOf?>(null) private var fexPreset by mutableStateOf("") private var steamChannel by mutableStateOf("publicbeta") + private var steamClientArch by mutableStateOf("arm64") private var runSteamAtStartup by mutableStateOf(false) private var theme by mutableStateOf("graphite") private var shapeMode by mutableStateOf(SessionPrefs.SHAPE_AUTO) @@ -964,6 +965,7 @@ class MainActivity : ComponentActivity() { storageOptions = storageOptions, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, steamChannel = if (mode == SessionService.MODE_STEAM) steamChannel else null, + steamClientArch = if (mode == SessionService.MODE_STEAM) steamClientArch else null, steamDeckMode = mode == SessionService.MODE_STEAM && steamDeckMode, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, @@ -1010,6 +1012,7 @@ class MainActivity : ComponentActivity() { }, onFexPreset = { id -> SessionPrefs.setFexPreset(this, id); fexPreset = id }, onSteamChannel = { id -> SessionPrefs.setSteamChannel(this, id); steamChannel = id }, + onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id }, onSteamDeckMode = { on -> SessionPrefs.setSteamDeckMode(this, on) steamDeckMode = on @@ -1113,6 +1116,7 @@ class MainActivity : ComponentActivity() { customResolution = SessionPrefs.customResolution(this, mode) fexPreset = SessionPrefs.fexPreset(this) steamChannel = SessionPrefs.steamChannel(this) + steamClientArch = SessionPrefs.steamClientArch(this) steamDeckMode = SessionPrefs.steamDeckMode(this) mangoapp = SessionPrefs.mangoapp(this) steamController = SessionPrefs.steamController(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 308f8b58e4..c3cccfb7fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -485,6 +485,17 @@ object SessionPrefs { prefs(context).edit().putString("steamChannel", id).apply() } + /** + * Which Steam client a Steam session runs: "arm64" (Valve's native ARM64 client, the default) or + * "x86_64" (Valve's x86-64 client under FEX, bannerlator-steam-x64 - experimental, for what the + * arm64 client cannot do: it never runs VAC). Each has its own sign-in and library. + */ + fun steamClientArch(context: Context): String = prefs(context).getString("steamClientArch", null) ?: "arm64" + + fun setSteamClientArch(context: Context, id: String) { + prefs(context).edit().putString("steamClientArch", id).apply() + } + /** Whether opening DroidDeck starts a Steam session instead of showing the front end. */ fun runSteamAtStartup(context: Context): Boolean = prefs(context).getBoolean("runSteamAtStartup", false) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 5777b86e5c..57ca911c60 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -560,6 +560,7 @@ class SessionService : Service() { if (SessionState.mode == MODE_STEAM) guest.add("BL_STEAMDECK=" + (if (SessionPrefs.steamDeckMode(this)) "1" else "0")) if (SessionState.mode == MODE_STEAM) guest.add("BL_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0")) if (steamHere) guest.add("BL_STEAM_CHANNEL=" + SessionPrefs.steamChannel(this)) + if (steamHere) guest.add("BL_STEAM_CLIENT_ARCH=" + SessionPrefs.steamClientArch(this)) if (SessionState.mode == MODE_STEAM) { guest.add("BL_GAMESCOPE_FORCE_FULLSCREEN=" + (if (SessionPrefs.forceFullscreen(this)) "1" else "0")) guest.add("BL_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0")) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 61f1e2fc0e..db7dfb9879 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -72,6 +72,7 @@ class ModeSettings( val stretch16x9: Boolean? = null, /** Steam only: the client branch forced on the command line. */ val steamChannel: String? = null, + val steamClientArch: String? = null, /** Steam only: enable the SteamOS client interface and its performance controls. */ val steamDeckMode: Boolean = false, /** Steam, Deck mode: the QAM's performance overlay (mangoapp) is started. */ @@ -121,6 +122,7 @@ class ModeSettingsActions( val onForceFullscreen: (Boolean) -> Unit = {}, val onStretch16x9: (Boolean) -> Unit = {}, val onSteamChannel: (String) -> Unit = {}, + val onSteamClientArch: (String) -> Unit = {}, val onSteamDeckMode: (Boolean) -> Unit = {}, val onMangoapp: (Boolean) -> Unit = {}, val onSteamController: (String) -> Unit = {}, @@ -325,6 +327,11 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { note = stringResource(R.string.mode_branch_note), onPick = a.onSteamChannel, ) + if (s.steamClientArch != null) ChoiceRow( + host, "clientArch", stringResource(R.string.mode_client_arch), stringResource(R.string.mode_client_arch_hint), + listOf("arm64" to stringResource(R.string.mode_client_arch_arm64), "x86_64" to stringResource(R.string.mode_client_arch_x64)), s.steamClientArch, + onPick = a.onSteamClientArch, + ) } if (steam && s.addedGamesDirs != null) SettingsGroup(stringResource(R.string.mode_added_games)) { for (dir in s.addedGamesDirs) { diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 60506c2256..cefec482db 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -256,6 +256,10 @@ Beta pública Beta pública de Steam Deck El modo Deck siempre usa la beta pública de Steam Deck. + Cliente de Steam + Se aplica en la próxima sesión. El cliente x86-64 se ejecuta con FEX, con su propio inicio de sesión y biblioteca, y dibuja su interfaz sin la GPU. + ARM64 (recomendado) + x86-64 (FEX, experimental) Juegos añadidos no hay carpetas de juegos con un .exe Carpeta de juegos diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3aba203d28..13d8c8f599 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -269,6 +269,10 @@ Public beta Steam Deck public beta Deck mode always uses Steam Deck public beta. + Steam client + Applies next session. The x86-64 client runs under FEX with its own sign-in and library, and draws its interface without the GPU. + ARM64 (recommended) + x86-64 (FEX, experimental) Added games no game folders with a .exe found Games folder diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session index 1f99fea5a7..710a38e1d5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session @@ -246,10 +246,29 @@ case $mode in esac ;; steam) - step "checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)" - bannerlator-steam-install || exit $? - step "Steam client ready" - steam_root=$XDG_DATA_HOME/Steam + # BL_STEAM_CLIENT_ARCH=x86_64 (the Steam page's Client setting): Valve's x86-64 client under FEX + # instead of the arm64 one, in a home of its own (bannerlator-steam-x64), for what the arm64 + # client cannot do - VAC. Everything this session does around the client applies to it; what is + # only for the arm64 client (its ARM64 Proton, the library mapping, the probes that load its + # steamclient.so) is skipped. + steam_x64=0 + [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ] && steam_x64=1 + if [ "$steam_x64" = 1 ]; then + step "checking the x86-64 Steam client (FEX, experimental; the first run downloads ~2 GB)" + bannerlator-steam-x64 --prepare || exit $? + step "x86-64 Steam client ready" + steam_root=${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam + steam_client=(bannerlator-steam-x64 --exec) + # No x86 GPU driver: the interface renders in software. + steam_cef=(-cef-disable-gpu) + else + step "checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)" + bannerlator-steam-install || exit $? + step "Steam client ready" + steam_root=$XDG_DATA_HOME/Steam + steam_client=("$steam_root/steamrtarm64/steam") + steam_cef=(-cef-force-gpu -cef-ozone-platform=x11 -cef-use-gl=angle -cef-use-angle=vulkan) + fi # Register the card library (bound at /mnt/droiddeck-sd) with the client - internal storage is # its main library already - and the ARM64 Proton that lets it launch the Windows ones. # A request left in ~/.bl-proton-extra installs a third-party Proton before the client starts, @@ -257,7 +276,7 @@ case $mode in # arguments to bannerlator-proton-extra: "ge", "cachyos", "ge --tag GE-Proton11-7", or a URL. # Hundreds of megabytes each, so it is only ever done on request, and the line is dropped once # it has succeeded - a failed download stays and is retried next session. - if [ -s "$HOME/.bl-proton-extra" ]; then + if [ "$steam_x64" = 0 ] && [ -s "$HOME/.bl-proton-extra" ]; then _bl_left=$HOME/.bl-proton-extra.left : > "$_bl_left" while read -r _bl_extra || [ -n "$_bl_extra" ]; do @@ -301,7 +320,7 @@ case $mode in for ((_i = 0; _i < 720; _i++)); do for _d in /proc/[0-9]*; do IFS= read -r -d '' _c < "$_d/cmdline" 2>/dev/null || continue - case $_c in *steamwebhelper*|*steamrtarm64/steam|*gamescope*) ;; *) continue ;; esac + case $_c in *steamwebhelper*|*steamrtarm64/steam|*steamrt64/steam|*gamescope*) ;; *) continue ;; esac _t=("$_d"/task/*) _p=${_d#/proc/} [ "${_bl_pinned[$_p]:-}" = "${#_t[@]}" ] && continue @@ -313,6 +332,7 @@ case $mode in ) & fi + if [ "$steam_x64" = 0 ]; then step "registering the app's game library with Steam" bannerlator-steam-library "$steam_root" || true step "setting up the ARM64 Proton compatibility tool" @@ -326,9 +346,10 @@ case $mode in # Steam runs a game's shared redistributables inside its prefix on first launch; marking # them as already run keeps those x86 installers from starting under emulation at all. bannerlator-seed-redists "$steam_root" || true + fi # The compatibility tool runs Valve's arm64 Proton, which the client fetches like any depot. # Asked for on the command line the first time, so a Windows title has it before it is needed. - if [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then + if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton" set -- "$@" steam://install/4427310 # Ported from Bannerlator (bannerlator-session, device-proven 2026-09-22). The client decides @@ -348,7 +369,7 @@ case $mode in bannerlator-steam-compat "$steam_root" >/dev/null 2>&1 || true step "compatibility layer installed: restarting the Steam client once" : > "$HOME/.bl-restart-once" - "$steam_root/steamrtarm64/steam" -shutdown >/dev/null 2>&1 || true + "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true exit 0 fi done @@ -383,7 +404,7 @@ case $mode in sleep 10 [ -f "$_bl_acf" ] && exit 0 step "signed in: asking the client again for the ARM64 Proton (try $_bl_try of 3)" - "$steam_root/steamrtarm64/steam" steam://install/4427310 >/dev/null 2>&1 || true + "${steam_client[@]}" steam://install/4427310 >/dev/null 2>&1 || true sleep 50 done exit 0 @@ -485,7 +506,7 @@ case $mode in # reads from has changed since its last run - a new manifest, a new depot or tool, the client # rewriting config.vdf - which [ -nt ] answers without starting anything, and once a minute # regardless. - ( + [ "$steam_x64" = 0 ] && ( beat=0 compat_stamp=$HOME/.bl-compat-beat rm -f "$compat_stamp" @@ -540,7 +561,7 @@ case $mode in printf '%s\n' $_bl_new >> "$compat_restarted" step "newly installed title(s) $(echo $_bl_new) set to the ARM64 Proton: restarting the Steam client once so it takes effect" : > "$HOME/.bl-restart-once" - "$steam_root/steamrtarm64/steam" -shutdown >/dev/null 2>&1 || true + "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true fi done ) & @@ -613,7 +634,7 @@ BUSCONF # reaped with the client session. Native ARM64 runs directly. A legacy x86_64 asset is used # only when its recorded architecture and this guest's existing FEX installation agree. decky_loader=$HOME/homebrew/services/PluginLoader - if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ -x "$decky_loader" ]; then + if [ "$steam_x64" = 0 ] && [ -f "$HOME/.droiddeck-decky-enabled" ] && [ -x "$decky_loader" ]; then decky_arch=$(cat "$HOME/homebrew/services/.droiddeck-decky-arch" 2>/dev/null || echo unknown) if [ "$decky_arch" = arm64 ] || { [ "$decky_arch" = x86_64 ] && [ -x /usr/bin/FEX ] && [ -n "${FEX_ROOTFS:-}" ]; }; then ( @@ -668,7 +689,7 @@ BUSCONF # low-memory killer), and the client then finds .crash - opening its update UI on the spinner - # and the web helper's Singleton* locks in htmlcache, owned by a process that is gone, which can # leave the Gamepad UI blank. No client or helper is running at this point in a session. - if ! pgrep -f 'steamwebhelper|steamrtarm64/steam' >/dev/null 2>&1; then + if ! pgrep -f 'steamwebhelper|steamrtarm64/steam|steamrt64/steam' >/dev/null 2>&1; then _stale="" for _f in "$steam_root/.crash" "$steam_root/steam.pid" \ "$steam_root/config/htmlcache/SingletonLock" "$steam_root/config/htmlcache/SingletonCookie" \ @@ -687,14 +708,14 @@ BUSCONF # again on the branch it just wrote. steam_channel=${BL_STEAM_CHANNEL:-publicbeta} steam_beta=$steam_root/package/beta - if [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then + if [ "$steam_x64" = 0 ] && [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then bannerlator-steam-games watch "$steam_root" "$BL_ADDED_GAMES" & games_watcher=$! fi # Lossless Scaling (Steam app 993090): whether this account owns it, asked of the signed-in # client once a session until the answer is yes. From then on the app offers importing # Lossless.dll and passes BL_LOSSLESS_OWNED=1, so the question is never asked again. - if [ "${BL_LOSSLESS_OWNED:-0}" != 1 ]; then + if [ "$steam_x64" = 0 ] && [ "${BL_LOSSLESS_OWNED:-0}" != 1 ]; then ( owned=$HOME/.config/droiddeck/lossless-owned for ((_i = 0; _i < 60; _i++)); do @@ -709,7 +730,7 @@ BUSCONF done ) & fi - echo "== steam args: ${_bl_ui[*]} -clientbeta $steam_channel -no-cef-sandbox -cef-force-gpu -cef-ozone-platform=x11 -cef-use-gl=angle -cef-use-angle=vulkan $*" + echo "== steam args: ${_bl_ui[*]} -clientbeta $steam_channel -no-cef-sandbox ${steam_cef[*]} $*$([ "$steam_x64" = 1 ] && echo ' (x86-64 client under FEX)')" # An update that cannot install asks for a restart (rc=42) every time; the count is capped so a # session can never again loop in silence, which reads as a menu opening and closing by itself. steam_updates=0 @@ -722,7 +743,7 @@ BUSCONF rm -f "$BL_LAUNCH_DIR/steam-stop" : > "$HOME/.bl-stop-requested" echo "== steam: the app asked for a clean exit" - "$steam_root/steamrtarm64/steam" -shutdown >/dev/null 2>&1 || true + "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true exit 0 fi nap 0.5 @@ -737,13 +758,12 @@ BUSCONF echo "$steam_channel" > "$steam_beta" fi step "starting the Steam client${BL_STEAM_UI:+ ($BL_STEAM_UI UI)}" - "$steam_root/steamrtarm64/steam" "${_bl_ui[@]}" -clientbeta "$steam_channel" \ - -no-cef-sandbox -cef-force-gpu -cef-ozone-platform=x11 \ - -cef-use-gl=angle -cef-use-angle=vulkan "$@" + "${steam_client[@]}" "${_bl_ui[@]}" -clientbeta "$steam_channel" \ + -no-cef-sandbox "${steam_cef[@]}" "$@" rc=$? echo "== steam exited rc=$rc" collect_steam_logs - if [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then + if [ "$steam_x64" = 0 ] && [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then bannerlator-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi if [ -f "$HOME/.bl-stop-requested" ]; then diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 index 680b6b7532..5d261e1952 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 @@ -1,15 +1,18 @@ #!/bin/bash # EXPERIMENT, opt-in: Valve's x86-64 Linux Steam client under FEX, beside the default arm64 one. -# bannerlator-steam-x64 [steam:// URL or client arguments] +# bannerlator-steam-x64 [steam:// URL or client arguments] run it (the desktop menu entry) +# bannerlator-steam-x64 --prepare install and set up, then exit +# bannerlator-steam-x64 --exec ARGS... run the client binary with ARGS in +# its environment (bannerlator-session +# with BL_STEAM_CLIENT_ARCH=x86_64) # # Why: the arm64 Linux client never runs VAC (TF2, L4D2: "Connection Blocked ... VAC secured # server", no VAC line in any client log) - VAC modules are x86 code. The x86-64 client under FEX # has a module it can run, the way SteamLite does in Wine. This runs Valve's client unchanged. # # Everything lives in its own home ($X64_HOME): the x86 client gets its own ~/.steam links, its -# own login and its own config, and never touches the arm64 client's. Games are shared: its -# steamapps is the arm64 client's. Only one client runs at a time (same account), so the arm64 -# one is shut down first. +# own login, config and library, and never touches the arm64 client's. Only one client runs at a +# time (same account), so the arm64 one is shut down first. # # First run downloads FEX (this repo's release), FEX's Ubuntu 24.04 x86 rootfs (~525 MB, unpacked # ~1.5 GB) and the x86 client (~600 MB). Log: $X64_HOME/steam-x64.log. @@ -30,6 +33,7 @@ LOG=$X64_HOME/steam-x64.log mkdir -p "$X64_HOME" step() { echo "== $(date -u +%H:%M:%S) $*" | tee -a "$LOG"; } +x64_prepare() { # --- FEX ------------------------------------------------------------------------------------- if [ ! -x /usr/local/bin/FEX ] || [ "$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null)" != "$FEX_TAG" ]; then step "downloading FEX ($FEX_TAG)" @@ -77,7 +81,6 @@ else step "warning: no x86-64 session shim (/usr/local/lib/x86_64-linux-gnu/libblsession.so); the client will stop on semget" : > "$ROOTFS/etc/ld.so.preload" fi - # --- the x86-64 client ------------------------------------------------------------------------- if [ ! -x "$STEAM_X64/steamrt64/steam" ] || [ ! -f "$STEAM_X64/package/droiddeck-installed" ]; then step "downloading the x86-64 Steam client ($MANIFEST)" @@ -108,59 +111,14 @@ if [ ! -x "$STEAM_X64/steamrt64/steam" ] || [ ! -f "$STEAM_X64/package/droiddeck echo "$version" > "$STEAM_X64/package/droiddeck-installed" chmod +x "$STEAM_X64/steam.sh" "$STEAM_X64/steamrt64/steam" "$STEAM_X64/ubuntu12_32/steam" 2>/dev/null || true fi -# Shared games: the arm64 client's library, as long as it is not running at the same time. -if [ -d "$ARM_STEAM/steamapps" ] && [ ! -e "$STEAM_X64/steamapps" ]; then - ln -s "$ARM_STEAM/steamapps" "$STEAM_X64/steamapps" -fi - -# --- one client at a time ---------------------------------------------------------------------- -if pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1; then - step "shutting down the arm64 client first" - "$ARM_STEAM/steamrtarm64/steam" -shutdown >/dev/null 2>&1 || true - for _ in $(seq 1 30); do pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 || break; sleep 1; done -fi - -# --- run --------------------------------------------------------------------------------------- -# The arm64 session's library paths and preloads are aarch64 and mean nothing to x86 processes. -unset LD_LIBRARY_PATH LD_PRELOAD STEAM_RUNTIME STEAM_RUNTIME_PREFER_HOST_LIBRARIES -# So are the desktop's GPU settings: zink over the arm64 Turnip ICD. x86 Mesa has no driver for -# this GPU, so software: llvmpipe for GL (the client's own window needs GLX), and the rootfs's -# own Vulkan ICDs (lavapipe) found by the x86 loader instead of the arm64 one. -unset GALLIUM_DRIVER MESA_LOADER_DRIVER_OVERRIDE VK_ICD_FILENAMES VK_DRIVER_FILES LIBGL_KOPPER_DRI2 \ - ZINK_DEBUG ZINK_DESCRIPTORS TU_DEBUG MESA_NO_ERROR -export LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe +# Its own library: the arm64 client's Windows installs are not what this client runs (it would +# switch a shared install to the Linux build and the arm64 client would download it again). +[ -L "$STEAM_X64/steamapps" ] && rm -f "$STEAM_X64/steamapps" +mkdir -p "$STEAM_X64/steamapps" # They still enumerate /dev/dri, find the session's KGSL node there, and spin on it (x86 Turnip # "failed to query kernel driver version", KMS dumb-buffer ioctls in a loop) - the webhelper never # got a browser up. FEX looks in the rootfs first: an empty /dev/dri there hides the node. mkdir -p "$ROOTFS/dev/dri" -# The X server hands out that node too (DRI3 open), and Mesa's software path then tries KMS dumb -# buffers on it in a loop: present through plain X instead. -export LIBGL_DRI3_DISABLE=1 -# The proot fast path (libblfastpath, preloaded into every guest process, FEX included) breaks -# FEX's 32-bit mode: every i386 program dies with SIGILL at start (FEX's own fatal trap), so -# Steam's 32-bit check reports libc.so.6 missing. 64-bit runs either way; proot then answers -# FEX's path calls itself. -export PROOT_FP_OFF=1 -# FEX tuning: the app's default preset for games (core/FexPreset.kt PERFORMANCE_TSO, WinNative's -# default) - FEX's own defaults keep half-barrier TSO and full-precision x87, which cost every x86 -# program time. A value already in the environment wins. -export FEX_TSOENABLED=${FEX_TSOENABLED:-1} FEX_VECTORTSOENABLED=${FEX_VECTORTSOENABLED:-0} \ - FEX_MEMCPYSETTSOENABLED=${FEX_MEMCPYSETTSOENABLED:-0} FEX_HALFBARRIERTSOENABLED=${FEX_HALFBARRIERTSOENABLED:-0} \ - FEX_X87REDUCEDPRECISION=${FEX_X87REDUCEDPRECISION:-1} FEX_MULTIBLOCK=${FEX_MULTIBLOCK:-1} -export HOME=$X64_HOME -export FEX_ROOTFS=$ROOTFS -# A FEX process takes its rootfs from FEXServer, not from its own environment, and a server -# started earlier without FEX_ROOTFS (any FEX run in this guest) answers with no rootfs at all: -# every x86 library lookup then falls through to the arm64 guest. Stop it, so the next FEX -# starts one with this rootfs. -/usr/local/bin/FEXServer -k >/dev/null 2>&1 || true -# BL_FEXSERVER_LOG: a FEXServer of our own in the foreground, logging there - every FEX process that -# logs to "server" (FEX_OUTPUTLOG, or an AppConfig) then has its lines tagged with its pid. -if [ -n "${BL_FEXSERVER_LOG:-}" ]; then - "$(dirname "${BL_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$BL_FEXSERVER_LOG" 2>&1 & - sleep 1 -fi -export STEAM_EXTRA_COMPAT_TOOLS_PATHS= # What steam.sh sets up before it runs the client, for the x86 tree. mkdir -p "$X64_HOME/.steam" ln -sfn "$STEAM_X64" "$X64_HOME/.steam/root" @@ -169,11 +127,6 @@ ln -sfn "$STEAM_X64/ubuntu12_32" "$X64_HOME/.steam/bin32" ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" -# Valve's 64-bit SteamRT3 client (steamrt64/steam), the x86 twin of the arm64 one, started the way -# the session starts that one (bannerlator-session): directly, STEAM_RUNTIME=1, its own library -# folders first. Through steam.sh it would first run steam-runtime-check-requirements, whose -# bwrap probe needs user namespaces - proot has none. Software rendering: no x86 GPU driver. -export STEAM_RUNTIME=1 # Unlike the arm64 client, this one carries pressure-vessel (steamrt64/pv-runtime) and refuses to # start when steam-runtime-check-requirements' bwrap probe cannot make a user namespace, which no # Android app can. proot is the container here, as it is for the arm64 client, which has no such @@ -195,9 +148,7 @@ if [ -d "$srt_real" ]; then exit 0 ' > "$srt_shim/bin/steam-runtime-check-requirements" chmod 755 "$srt_shim/bin/steam-runtime-check-requirements" - export STEAM_RUNTIME_STEAMRT=$srt_shim fi -export LD_LIBRARY_PATH=$STEAM_X64/steamrt64:$STEAM_X64/steamrt64/panorama # The libraries the SteamRT container would give the client and the rootfs lacks (GTK 2 for # steamui.so, ...): Valve's own platform runtime files, for what the rootfs does not have. # They ship without their soname links (pressure-vessel makes those when it builds the container), @@ -210,14 +161,58 @@ for d in "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platf [ -d "$d" ] || continue for f in "$d"/*.so*; do [ -e "$srt_libs/$(basename "$f")" ] || ln -s "$f" "$srt_libs/"; done done -/usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" +FEX_ROOTFS=$ROOTFS /usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" # LD_LIBRARY_PATH beats the system folders whatever its order, so only what the rootfs lacks stays: # the platform's own (older) glibc and the rest must not shadow the rootfs's. for f in "$srt_libs"/*; do n=$(basename "$f") if [ -e "$ROOTFS/usr/lib/x86_64-linux-gnu/$n" ] || [ -e "$ROOTFS/lib/x86_64-linux-gnu/$n" ]; then rm -f "$f"; fi done -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srt_libs + # A FEX process takes its rootfs from FEXServer, not from its own environment, and a server + # started earlier without FEX_ROOTFS (any FEX run in this guest) answers with no rootfs at all: + # every x86 library lookup then falls through to the arm64 guest. Stop it while no x86 client + # runs, so the next FEX starts one with this rootfs. + if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then + FEX_ROOTFS=$ROOTFS /usr/local/bin/FEXServer -k >/dev/null 2>&1 || true + fi +} + +# The environment the client and everything it starts run in. +x64_env() { +# The arm64 session's library paths and preloads are aarch64 and mean nothing to x86 processes. +unset LD_LIBRARY_PATH LD_PRELOAD STEAM_RUNTIME STEAM_RUNTIME_PREFER_HOST_LIBRARIES +# So are the desktop's GPU settings: zink over the arm64 Turnip ICD. x86 Mesa has no driver for +# this GPU, so software: llvmpipe for GL (the client's own window needs GLX), and the rootfs's +# own Vulkan ICDs (lavapipe) found by the x86 loader instead of the arm64 one. +unset GALLIUM_DRIVER MESA_LOADER_DRIVER_OVERRIDE VK_ICD_FILENAMES VK_DRIVER_FILES LIBGL_KOPPER_DRI2 \ + ZINK_DEBUG ZINK_DESCRIPTORS TU_DEBUG MESA_NO_ERROR +export LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe +# The X server hands out that node too (DRI3 open), and Mesa's software path then tries KMS dumb +# buffers on it in a loop: present through plain X instead. +export LIBGL_DRI3_DISABLE=1 +# The proot fast path (libblfastpath, preloaded into every guest process, FEX included) breaks +# FEX's 32-bit mode: every i386 program dies with SIGILL at start (FEX's own fatal trap), so +# Steam's 32-bit check reports libc.so.6 missing. 64-bit runs either way; proot then answers +# FEX's path calls itself. +export PROOT_FP_OFF=1 +# FEX tuning: the app's default preset for games (core/FexPreset.kt PERFORMANCE_TSO, WinNative's +# default) - FEX's own defaults keep half-barrier TSO and full-precision x87, which cost every x86 +# program time. A value already in the environment wins. +export FEX_TSOENABLED=${FEX_TSOENABLED:-1} FEX_VECTORTSOENABLED=${FEX_VECTORTSOENABLED:-0} \ + FEX_MEMCPYSETTSOENABLED=${FEX_MEMCPYSETTSOENABLED:-0} FEX_HALFBARRIERTSOENABLED=${FEX_HALFBARRIERTSOENABLED:-0} \ + FEX_X87REDUCEDPRECISION=${FEX_X87REDUCEDPRECISION:-1} FEX_MULTIBLOCK=${FEX_MULTIBLOCK:-1} +export HOME=$X64_HOME +# The session points these at the arm64 client's home; this client has its own. +export XDG_DATA_HOME=$X64_HOME/.local/share XDG_CONFIG_HOME=$X64_HOME/.config XDG_CACHE_HOME=$X64_HOME/.cache +export FEX_ROOTFS=$ROOTFS +export STEAM_EXTRA_COMPAT_TOOLS_PATHS= +# Valve's 64-bit SteamRT3 client (steamrt64/steam), the x86 twin of the arm64 one, started the way +# the session starts that one (bannerlator-session): directly, STEAM_RUNTIME=1, its own library +# folders first. Through steam.sh it would first run steam-runtime-check-requirements, whose +# bwrap probe needs user namespaces - proot has none. Software rendering: no x86 GPU driver. +export STEAM_RUNTIME=1 +[ -d "$X64_HOME/steamrt-shim" ] && export STEAM_RUNTIME_STEAMRT=$X64_HOME/steamrt-shim +export LD_LIBRARY_PATH=$STEAM_X64/steamrt64:$STEAM_X64/steamrt64/panorama:$X64_HOME/steamrt-libs # After an update the client re-executes itself inside the SteamRT container through # pressure-vessel-wrap, which needs bwrap. The FEX rootfs with the client's own steamrt64 libraries # is that container here; the client's recursion guard says it is already inside one. @@ -226,11 +221,36 @@ export STEAM_STEAMRT_RECURSION_GUARD=1 # first failed assertion: the web helper died of SIGTRAP a second after every start. The session # shim hides the tracer from the x86 web helper too (preload/tracer.c). export BL_WEBHELPER_HIDE_TRACER=1 -cd "$STEAM_X64" -# The webhelper on Wayland: on X11, Chromium sets up GBM on the render node the X server hands out -# over DRI3 even with the GPU off, loops on KMS dumb-buffer ioctls against the KGSL device and never -# brings a browser up (the client restarts it every 10 s). On Wayland without a GPU it draws to -# shared-memory buffers. +} + +# The client binary under FEX, for the session: the starting arguments, or -shutdown / a steam:// +# URL handed to the running instance. +x64_exec() { + x64_env + cd "$STEAM_X64" + exec "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" +} + +case "${1:-}" in + --prepare) x64_prepare; exit 0 ;; + --exec) shift; x64_exec "$@" ;; +esac + +# --- standalone (the desktop menu entry) ------------------------------------------------------ +# --- one client at a time ---------------------------------------------------------------------- +if pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1; then + step "shutting down the arm64 client first" + "$ARM_STEAM/steamrtarm64/steam" -shutdown >/dev/null 2>&1 || true + for _ in $(seq 1 30); do pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 || break; sleep 1; done +fi +x64_prepare +step "FEX, rootfs and client ready" +# BL_FEXSERVER_LOG: a FEXServer of our own in the foreground, logging there - every FEX process that +# logs to "server" (FEX_OUTPUTLOG, or an AppConfig) then has its lines tagged with its pid. +if [ -n "${BL_FEXSERVER_LOG:-}" ]; then + FEX_ROOTFS=$ROOTFS "$(dirname "${BL_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$BL_FEXSERVER_LOG" 2>&1 & + sleep 1 +fi # --- what bannerlator-session gives the arm64 client --------------------------------------- # The client's connection header and Settings > Internet come from NetworkManager on the SYSTEM # bus; without them it shows no connection while downloads run. Same bus config and stand-in as the @@ -300,9 +320,7 @@ for attempt in 1 2 3 4 5; do echo publicbeta > "$STEAM_X64/package/beta" step "starting the x86-64 SteamRT3 client under FEX (attempt $attempt): $*" rc=0 - "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" -clientbeta publicbeta -no-cef-sandbox \ - -cef-ozone-platform=wayland -cef-disable-gpu "$@" >>"$LOG" 2>&1 || rc=$? + ( x64_exec -clientbeta publicbeta -no-cef-sandbox -cef-disable-gpu "$@" ) >>"$LOG" 2>&1 || rc=$? step "client exited rc=$rc" [ "$rc" = 42 ] || break -done -exit "$rc" +done \ No newline at end of file