From 5b35ace098bfb76a30184d5ca0474dc53a25b6a5 Mon Sep 17 00:00:00 2001 From: Ahmad Sayed Alsayed Ebrahim Date: Thu, 15 Oct 2026 06:16:25 +0300 Subject: [PATCH] Mali bridge: Setup's "Safe mode" switch, on by default A second row under the GPU check, shown only when the bridge is on: "Safe mode" keeps the bridge's proven workarounds wherever its startup probe has not verified this GPU and driver; off is performance mode, native paths wherever the probe passed. It reaches the server as /mode ("safe" or "performance", written atomically before the server starts or is reused, so the in-app server's JNI start stays as it is) and the guest as VKBRIDGE_MODE, which /root/.vkbridge-env can still override. A server without modes ignores the file. --- .../com/droiddeck/launcher/FrontEndActivity.kt | 5 ++++- .../droiddeck/launcher/gpu/VkBridgeComponent.kt | 13 +++++++++++++ .../com/droiddeck/launcher/session/SessionPrefs.kt | 10 ++++++++++ .../droiddeck/launcher/session/SessionService.kt | 3 ++- .../com/droiddeck/launcher/ui/FrontEndScreen.kt | 2 ++ .../com/droiddeck/launcher/ui/FrontEndSetup.kt | 14 +++++++++++++- app/src/main/res/values/strings.xml | 5 +++++ 7 files changed, 49 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 2d027f267e..3fcf7dbd25 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -149,6 +149,7 @@ class FrontEndActivity : ComponentActivity() { private var tuSysmem by mutableStateOf(false) private var zinkLazy by mutableStateOf(false) private var vkBridge by mutableStateOf(false) + private var vkBridgeSafe by mutableStateOf(true) private val adrenoGpu by lazy { com.droiddeck.launcher.core.DeviceSupport.adreno() } private var noXalia by mutableStateOf(true) private var fastSync by mutableStateOf(false) @@ -811,7 +812,7 @@ class FrontEndActivity : ComponentActivity() { FrontEndScreen( FrontEndState( installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), - vkBridge = vkBridge, adreno = adrenoGpu, + vkBridge = vkBridge, vkBridgeSafe = vkBridgeSafe, adreno = adrenoGpu, shortcutPicker = shortcutPicker, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, @@ -953,6 +954,7 @@ class FrontEndActivity : ComponentActivity() { onRemovePackage = { id -> removePackage(id) }, onRuntime = { onRuntimeButton() }, onVkBridge = { on -> SessionPrefs.setVkBridge(this, on); vkBridge = on }, + onVkBridgeSafe = { on -> SessionPrefs.setVkBridgeSafe(this, on); vkBridgeSafe = on }, onFrameGenPick = { mode -> FrameGen.set(this, mode) frameGenLabel = FrameGen.label(this) @@ -2077,6 +2079,7 @@ class FrontEndActivity : ComponentActivity() { tuSysmem = SessionPrefs.tuSysmem(this) zinkLazy = SessionPrefs.zinkLazy(this) vkBridge = SessionPrefs.vkBridge(this) + vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) noXalia = SessionPrefs.noXalia(this) fastSync = SessionPrefs.fastSync(this) syncFallback = SessionPrefs.syncFallback(this) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt index 8033d8effe..d606348ffa 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt @@ -20,6 +20,7 @@ class VkBridgeComponent(private val socket: File, private val logFile: File) : S } socket.parentFile?.mkdirs() val cacheDir = cacheDir(app()) + writeMode(cacheDir, com.droiddeck.launcher.session.SessionPrefs.vkBridgeMode(app())) if (VkBridgeNative.start(app(), socket, logFile, cacheDir)) { Log.i(TAG, "server ready in the app's process at $socket") return @@ -56,6 +57,7 @@ class VkBridgeComponent(private val socket: File, private val logFile: File) : S companion object { private const val TAG = "VkBridge" private const val CACHE_DIR = "vkbridge-pipelines" + private const val MODE_FILE = "mode" fun cacheDir(context: Context): File { val dir = File(context.filesDir, CACHE_DIR) @@ -65,6 +67,17 @@ class VkBridgeComponent(private val socket: File, private val logFile: File) : S return dir } + fun writeMode(dir: File, mode: String) { + val file = File(dir, MODE_FILE) + if (runCatching { file.readText().trim() }.getOrNull() == mode) return + val tmp = File(dir, "$MODE_FILE.tmp") + runCatching { + tmp.writeText(mode + "\n") + if (!tmp.renameTo(file)) error("rename failed") + Log.i(TAG, "bridge mode: $mode") + }.onFailure { Log.w(TAG, "could not write $file: $it"); tmp.delete() } + } + private fun migrate(old: File, dir: File) { val moved = if (!dir.exists()) old.renameTo(dir) else false if (!moved) { 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 104c3572d8..34ae951494 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -603,6 +603,16 @@ object SessionPrefs { prefs(context).edit().putBoolean("vkBridge", on).apply() } + @JvmStatic + fun vkBridgeSafe(context: Context): Boolean = prefs(context).getBoolean("vkBridgeSafe", true) + + fun setVkBridgeSafe(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("vkBridgeSafe", on).apply() + } + + @JvmStatic + fun vkBridgeMode(context: Context): String = if (vkBridgeSafe(context)) "safe" else "performance" + fun setZinkLazy(context: Context, on: Boolean) { prefs(context).edit().putBoolean("zinkLazy", on).apply() } 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 7dcf5a3616..4dfdca431b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -828,11 +828,12 @@ class SessionService : Service() { guest.add("BL_VKBRIDGE=1") guest.add("VKBRIDGE_SOCKET=" + socket.path) guest.add("VKBRIDGE_CLIENT_LOG=" + File(sessionDir, "vkbridge-client.log").path) + guest.add("VKBRIDGE_MODE=" + SessionPrefs.vkBridgeMode(this)) LinuxRuntime.gpuStandIn(this)?.let { node -> guest.add("BL_DRM_STANDIN=$node") LinuxRuntime.deviceNumbers(node)?.let { guest.add("VKBRIDGE_DRM_RENDER=$it") } } - Log.i(TAG, "vkbridge: on (${com.droiddeck.launcher.core.DeviceSupport.gpuName(this)}), socket $socket") + Log.i(TAG, "vkbridge: on (${com.droiddeck.launcher.core.DeviceSupport.gpuName(this)}, ${SessionPrefs.vkBridgeMode(this)} mode), socket $socket") } private fun startAudio(guest: MutableList, sessionDir: File, directAudioPack: Boolean): PulseAudioComponent { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 2391044fa3..d9ee666329 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -139,6 +139,7 @@ class FrontEndState( val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val adreno: Boolean = true, val vkBridge: Boolean = false, + val vkBridgeSafe: Boolean = true, val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, @@ -196,6 +197,7 @@ class FrontEndActions( val onRemovePackage: (String) -> Unit, val onRuntime: () -> Unit, val onVkBridge: (Boolean) -> Unit = {}, + val onVkBridgeSafe: (Boolean) -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, val onImportLossless: () -> Unit, val onProtons: () -> Unit, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 5db7900c66..e93832a7ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -238,7 +238,7 @@ internal fun SetupPanel( else -> if (s.vkBridge) stringResource(R.string.setup_gpu_bridge_detail, gpuName) else stringResource(R.string.setup_gpu_unsupported_detail, gpuName) }, - divider = divider, + divider = divider || (!s.adreno && s.vkBridge), action = if (s.adreno) null else { { SecondaryButton( stringResource(if (s.vkBridge) R.string.setup_gpu_bridge_on else R.string.setup_gpu_bridge_off), @@ -246,6 +246,18 @@ internal fun SetupPanel( ) } }, ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_safe), + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on_detail else R.string.setup_bridge_safe_off_detail), + divider = divider, + action = { + SecondaryButton( + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on else R.string.setup_bridge_safe_off), + enabled = !s.sessionRunning, compact = true, onClick = { a.onVkBridgeSafe(!s.vkBridgeSafe) }, + ) + }, + ) } val runtimeCheck: @Composable (Boolean) -> Unit = { divider -> CheckRow( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebf2ff2bf3..7995209fe0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3228,5 +3228,10 @@ Game Pass Mali bridge: off Mali bridge: on + Safe mode + Safe mode: on + Safe mode: off + Most compatible. Recommended for a new device. + Faster where this GPU passed its checks. %1$s is not an Adreno. The experimental Vulkan bridge is on: the session draws through the phone\'s own driver. Expect bugs; send the session logs.