diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 39166a9849..092682004f 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -169,7 +169,7 @@ class MainActivity : ComponentActivity() { private var touchMode by mutableStateOf(SessionPrefs.TOUCH_AUTO) private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) - private var renderer by mutableStateOf("pixman") + private var renderer by mutableStateOf("vulkan") private var gameStorage by mutableStateOf("") private var storageOptions by mutableStateOf>>(emptyList()) private val pickGameStorage = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> 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 8efbe7156a..a2c1dbe772 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -330,15 +330,18 @@ object SessionPrefs { } /** - * What the desktop shell composites with: pixman (software, the default), or vulkan / gles2 on - * the GPU - those need the app's patched wlroots (tools/wlroots), since the Adreno stand-in is - * not a DRM device and stock wlroots cannot allocate on it. `Download/droiddeck-wlr-renderer` - * still overrides it. + * What the desktop shell composites with: vulkan (the default) or gles2 on the GPU, through the + * app's patched wlroots (tools/wlroots) - the Adreno stand-in is not a DRM device and stock + * wlroots cannot allocate on it - or pixman in software. A GPU renderer a device cannot start + * falls back to pixman by itself (droiddeck-desktop). `Download/droiddeck-wlr-renderer` still + * overrides it. */ - fun desktopRenderer(context: Context): String = prefs(context).getString("desktopRenderer", "pixman") ?: "pixman" + fun desktopRenderer(context: Context): String = prefs(context).getString("desktopRenderer", "vulkan") ?: "vulkan" fun setDesktopRenderer(context: Context, renderer: String) { prefs(context).edit().putString("desktopRenderer", renderer).apply() + // A choice made again is a retry: forget that a renderer failed to start here before. + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.droiddeck-renderer-failed").delete() } /** 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 9183c0781e..7460914bcc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -322,7 +322,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { if (!steam && s.renderer != null) SettingsGroup("Renderer") { ChoiceRow( host, "renderer", "Desktop renderer", "Composites the desktop.", - listOf("pixman" to "pixman - software", "vulkan" to "vulkan - GPU (experimental)", "gles2" to "gles2 - GPU (experimental)"), s.renderer, + listOf("vulkan" to "vulkan - GPU", "gles2" to "gles2 - GPU (experimental)", "pixman" to "pixman - software"), s.renderer, note = "On Vulkan, programs on the desktop draw with the GPU in their own windows; if it cannot start, " + "the desktop comes up on pixman. On pixman, games and emulators from the menu open full screen " + "on the GPU instead (right-click one for a desktop window).", diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 1f4c018b47..3f2ace30b6 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -19,7 +19,7 @@ export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 # stock wlroots allocates through gbm on a real DRM node and the KGSL stand-in is not one ("unable # to create allocator"): they need the app's patched wlroots (tools/wlroots), whose Vulkan # allocator exports the buffers instead. BL_WLR_RENDERER picks; see the fallback at the end. -export WLR_RENDERER=${BL_WLR_RENDERER:-pixman} +export WLR_RENDERER=${BL_WLR_RENDERER:-vulkan} WLROOTS_DIR=/usr/local/lib/droiddeck-wlroots BASE_LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-} use_renderer() { @@ -33,6 +33,18 @@ use_renderer() { fi } use_renderer "$WLR_RENDERER" +# A GPU renderer that failed to start here is not tried again on every desktop start (each try costs +# up to 20 s): the failure is kept with what it failed on - the renderer, the patched wlroots and the +# Linux driver - so an app update or a different driver retries, and so does picking a renderer +# again in the app's settings (which deletes the file). +FAILED_FILE=$HOME/.droiddeck-renderer-failed +renderer_key() { + echo "$WLR_RENDERER $(md5sum "$WLROOTS_DIR/libwlroots-0.20.so" 2>/dev/null | cut -d' ' -f1) ${BL_VK_DRIVER:-runtime}" +} +if [ "$WLR_RENDERER" != pixman ] && [ "$(cat "$FAILED_FILE" 2>/dev/null)" = "$(renderer_key)" ]; then + echo "== droiddeck-desktop: $WLR_RENDERER failed to start here before; using pixman (choose a renderer in the settings to retry)" + use_renderer pixman +fi # The desktop's own log, beside the session's, so labwc and the programs on it can be read apart # from the session that started them. The session log keeps the milestones either way. if [ -n "${BL_DEBUG_DIR:-}" ]; then @@ -175,6 +187,7 @@ else fi if [ "$rc" -ne 0 ] && [ $(( $(date +%s) - started )) -lt 40 ]; then echo "== droiddeck-desktop: labwc on $WLR_RENDERER failed at start (exit $rc); starting on pixman instead" + renderer_key > "$FAILED_FILE" use_renderer pixman DEBUG=; [ -f "$HOME/.droiddeck-desktop-debug" ] && DEBUG=-d find "$XDG_RUNTIME_DIR" -mindepth 1 -maxdepth 1 ! -name 'wayland-0*' ! -name 'keymap.xkb' -exec rm -rf {} + 2>/dev/null