From 7aeb194d6e369fddabb6f6efde6172c2dd8822e7 Mon Sep 17 00:00:00 2001 From: ASEbrahim <264076441+ASEbrahim@users.noreply.github.com> Date: Tue, 20 Oct 2026 17:13:52 +0300 Subject: [PATCH] Mali old DXVK: a setting to keep Proton's own, and Proton's own back when the bridge is off Setup has a "DXVK" row under the bridge's safe mode: automatic (the default, as before) or Proton's own (SessionPrefs.bridgeProtonDxvk). With Proton's own, nothing is chosen and an earlier automatic choice goes back to the Proton's copy. Automatic choices also go back when the session is not a bridge session (the bridge turned off), even when nothing is known of the Vulkan; a queued automatic swap is dropped with them, the player's own queued swaps stay. Turning the bridge off, or choosing Proton's own, does it right away in the background instead of at the next session. A failed detection in a bridge session still keeps the last choice. --- .../droiddeck/launcher/FrontEndActivity.kt | 14 ++++- .../launcher/session/ComponentsManager.kt | 42 ++++++++++++-- .../launcher/session/SessionPrefs.kt | 6 ++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 + .../droiddeck/launcher/ui/FrontEndSetup.kt | 12 ++++ app/src/main/res/values-zh-rCN/strings.xml | 5 ++ app/src/main/res/values-zh-rHK/strings.xml | 5 ++ app/src/main/res/values-zh-rTW/strings.xml | 5 ++ app/src/main/res/values/strings.xml | 5 ++ .../launcher/session/BridgeDxvkTest.kt | 55 ++++++++++++++++++- 10 files changed, 142 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a592b0c5e8..9b16a48864 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -150,6 +150,7 @@ class FrontEndActivity : ComponentActivity() { private var zinkLazy by mutableStateOf(false) private var vkBridge by mutableStateOf(false) private var vkBridgeSafe by mutableStateOf(true) + private var bridgeProtonDxvk by mutableStateOf(false) private val adrenoGpu by lazy { com.droiddeck.launcher.core.DeviceSupport.adreno() } private var noXalia by mutableStateOf(true) private var fastSync by mutableStateOf(false) @@ -812,7 +813,7 @@ class FrontEndActivity : ComponentActivity() { FrontEndScreen( FrontEndState( installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), - vkBridge = vkBridge, vkBridgeSafe = vkBridgeSafe, adreno = adrenoGpu, + vkBridge = vkBridge, vkBridgeSafe = vkBridgeSafe, bridgeProtonDxvk = bridgeProtonDxvk, adreno = adrenoGpu, shortcutPicker = shortcutPicker, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, @@ -953,8 +954,15 @@ class FrontEndActivity : ComponentActivity() { onInstallPackage = { id -> installPackage(id) }, onRemovePackage = { id -> removePackage(id) }, onRuntime = { onRuntimeButton() }, - onVkBridge = { on -> SessionPrefs.setVkBridge(this, on); vkBridge = on }, + onVkBridge = { on -> + SessionPrefs.setVkBridge(this, on); vkBridge = on + if (!on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, onVkBridgeSafe = { on -> SessionPrefs.setVkBridgeSafe(this, on); vkBridgeSafe = on }, + onBridgeProtonDxvk = { on -> + SessionPrefs.setBridgeProtonDxvk(this, on); bridgeProtonDxvk = on + if (on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, onFrameGenPick = { mode -> FrameGen.set(this, mode) frameGenLabel = FrameGen.label(this) @@ -2080,6 +2088,7 @@ class FrontEndActivity : ComponentActivity() { zinkLazy = SessionPrefs.zinkLazy(this) vkBridge = SessionPrefs.vkBridge(this) vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) noXalia = SessionPrefs.noXalia(this) fastSync = SessionPrefs.fastSync(this) syncFallback = SessionPrefs.syncFallback(this) @@ -2115,6 +2124,7 @@ class FrontEndActivity : ComponentActivity() { ready = LinuxRuntime.isInstalled(this) vkBridge = SessionPrefs.vkBridge(this) vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) removalPending = LinuxRuntimeInstaller.hasRemovalPending(this) frameGenLabel = FrameGen.label(this) romsDir = SessionPrefs.romsDir(this).takeIf { it.isNotEmpty() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index 17f3d93da2..0505bcea1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -1020,13 +1020,28 @@ object ComponentsManager { internal const val DXVK_FOR_VULKAN_1_1 = "dxvk-1.10.3-linux.wcp" internal const val DXVK_FOR_VULKAN_1_3_NO_INT64 = "dxvk-2.6.2-linux.wcp" + internal fun autoDxvkUndoWanted(bridgeSession: Boolean, keepProtonDxvk: Boolean, vulkan: AppVulkan?, bridgeRule: ForcedPackage?): Boolean = + !bridgeSession || keepProtonDxvk || (vulkan != null && bridgeRule == null) + + private fun dropQueuedAuto(context: Context, installed: List) = synchronized(lock) { + val state = loadState(context) + var changed = false + for (p in installed) { + val q = state.optJSONObject("queued")?.optJSONObject(p.id) ?: continue + if (q.optJSONObject("dxvk")?.optBoolean("auto") == true) { q.remove("dxvk"); changed = true } + } + if (changed) saveState(context, state) + } + internal fun autoChoiceStale(entry: JSONObject?, wantedFile: String?): Boolean = entry != null && entry.optBoolean("auto") && entry.optString("file") != wantedFile internal fun catalogMatch(items: List, file: String, release: String): CatalogItem? = items.firstOrNull { it.file == file && it.release == release } - fun ensureForcedPackages(context: Context): String? = ensureForcedPackages( + private val forcedLock = Any() + + fun ensureForcedPackages(context: Context): String? = synchronized(forcedLock) { ensureForcedPackages( context, GpuInfo.detect(), { file, release -> catalogItem(context, file, release) }, { download(context, it) {} }, @@ -1035,7 +1050,18 @@ object ComponentsManager { bridgeSession = com.droiddeck.launcher.core.DeviceSupport.vkBridge(context), applyAuto = { id, file -> swap(context, id, file, auto = true) }, undoAuto = { id, comp -> undoAutoChoice(context, id, comp) }, - ) + keepProtonDxvk = SessionPrefs.bridgeProtonDxvk(context), + autoPossible = !com.droiddeck.launcher.core.DeviceSupport.adreno(), + ) } + + fun settleAutoDxvk(context: Context) { + val app = context.applicationContext + Thread({ + runCatching { ensureForcedPackages(app) } + .onSuccess { if (it != null) Log.i(TAG, it) } + .onFailure { Log.w(TAG, "automatic DXVK", it) } + }, "auto-dxvk").start() + } internal fun undoAutoChoice(context: Context, protonId: String, comp: String): String = synchronized(lock) { val p = proton(context, protonId) @@ -1063,19 +1089,23 @@ object ComponentsManager { bridgeSession: Boolean = false, applyAuto: (protonId: String, file: String) -> String = apply, undoAuto: (protonId: String, comp: String) -> String = { _, _ -> "" }, + keepProtonDxvk: Boolean = false, + autoPossible: Boolean = true, ): String? { - val bridgeRule = if (bridgeSession) bridgeDxvk(vulkan) else null + val chooseDxvk = bridgeSession && !keepProtonDxvk + val bridgeRule = if (chooseDxvk) bridgeDxvk(vulkan) else null val rules = FORCED_PACKAGES.filter { it.matches(gpu) }.map { it to false } + listOfNotNull(bridgeRule?.let { it to true }) - if (rules.isEmpty() && !bridgeSession) return null + if (rules.isEmpty() && !autoPossible) return null val installed = protons(context) val lines = mutableListOf() fun each(p: Proton, what: () -> String): String = runCatching(what).getOrElse { e -> Log.w(TAG, "${p.name}: ${e.message}", e); "${p.name}: ${e.message ?: e.javaClass.simpleName}" } - if (bridgeSession && vulkan != null) { + if (autoPossible && autoDxvkUndoWanted(bridgeSession, keepProtonDxvk, vulkan, bridgeRule)) { + dropQueuedAuto(context, installed) val state = loadState(context) for (p in installed) { val entry = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject("dxvk") - if (bridgeRule == null && autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") }) + if (autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") }) } } for ((rule, auto) in rules) { 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 34ae951494..45f746721e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -604,6 +604,12 @@ object SessionPrefs { } @JvmStatic + fun bridgeProtonDxvk(context: Context): Boolean = prefs(context).getBoolean("bridgeProtonDxvk", false) + + fun setBridgeProtonDxvk(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bridgeProtonDxvk", on).apply() + } + fun vkBridgeSafe(context: Context): Boolean = prefs(context).getBoolean("vkBridgeSafe", true) fun setVkBridgeSafe(context: Context, on: Boolean) { 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 d9ee666329..f15dbe3ccf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -140,6 +140,7 @@ class FrontEndState( val adreno: Boolean = true, val vkBridge: Boolean = false, val vkBridgeSafe: Boolean = true, + val bridgeProtonDxvk: Boolean = false, 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, @@ -198,6 +199,7 @@ class FrontEndActions( val onRuntime: () -> Unit, val onVkBridge: (Boolean) -> Unit = {}, val onVkBridgeSafe: (Boolean) -> Unit = {}, + val onBridgeProtonDxvk: (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 e93832a7ee..297f3534e4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -258,6 +258,18 @@ internal fun SetupPanel( ) }, ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_dxvk), + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton_detail else R.string.setup_bridge_dxvk_auto_detail), + divider = divider, + action = { + SecondaryButton( + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton else R.string.setup_bridge_dxvk_auto), + enabled = !s.sessionRunning, compact = true, onClick = { a.onBridgeProtonDxvk(!s.bridgeProtonDxvk) }, + ) + }, + ) } val runtimeCheck: @Composable (Boolean) -> Unit = { divider -> CheckRow( diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2b5f4083a2..3b54cb4806 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3064,4 +3064,9 @@ 显示 云 云设置 + DXVK + DXVK:自动 + DXVK:Proton 自带 + 此 GPU 的 Vulkan 版本对 Proton 自带的 DXVK 来说太旧时,改用较旧的 DXVK。 + 每个 Proton 都使用自带的 DXVK,即使此 GPU 的 Vulkan 版本可能太旧。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 54058fe19b..3d8b8eff9b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3063,4 +3063,9 @@ 顯示 雲端 雲端設定 + DXVK + DXVK:自動 + DXVK:Proton 內建 + 此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。 + 每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 88adc508f4..31dd744637 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3063,4 +3063,9 @@ 顯示 雲端 雲端設定 + DXVK + DXVK:自動 + DXVK:Proton 內建 + 此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。 + 每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7995209fe0..545bf2abb3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3233,5 +3233,10 @@ Safe mode: off Most compatible. Recommended for a new device. Faster where this GPU passed its checks. + DXVK + DXVK: automatic + DXVK: Proton\'s own + Uses an older DXVK where this GPU\'s Vulkan is too old for Proton\'s. + Every Proton keeps its own DXVK, even where this GPU\'s Vulkan may be too old for it. %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. diff --git a/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt index 5f621a23a4..45afb7785c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt @@ -163,9 +163,62 @@ class BridgeDxvkTest { assertEquals("bundled DXVK experimental-12", File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll").readText()) } + @Test fun thePlayerCanKeepProtonsOwnDxvk() { + proton("proton-exp") + assertNull("nothing chosen when declined", run(g710, keep = true)) + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + val undone = mutableListOf() + run(g710, keep = true, undoAuto = { id, comp -> undone += "$id $comp"; "undone" }) + assertEquals("an earlier automatic choice goes back", listOf("proton-exp dxvk"), undone) + } + + @Test fun turningTheBridgeOffRestoresProtonsOwn() { + proton("proton-exp") + val d3d11 = File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll") + writePackage(old, "DXVK 1.10.3") + val auto: (String, String) -> String = { id, file -> ComponentsManager.swap(context, id, file, auto = true) } + val undo: (String, String) -> String = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) } + run(g710, applyAuto = auto, undoAuto = undo) + assertEquals("DXVK 1.10.3", d3d11.readText()) + run(null, bridge = false, applyAuto = auto, undoAuto = undo) + assertEquals("bundled DXVK experimental-11", d3d11.readText()) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + } + + @Test fun turningTheBridgeOffKeepsThePlayersOwnChoice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", "dxvk-3.1-linux.wcp").put("protonVersion", "experimental-11")) + assertNull(run(g710, bridge = false)) + assertNull(run(g710, keep = true)) + } + + @Test fun aQueuedAutomaticSwapIsDroppedWhenTheBridgeIsOff() { + proton("proton-exp") + val f = File(context.filesDir, "components/state.json") + f.parentFile!!.mkdirs() + f.writeText(JSONObject().put("active", JSONObject()) + .put("queued", JSONObject().put("proton-exp", JSONObject() + .put("dxvk", JSONObject().put("kind", "package").put("file", old).put("auto", true)) + .put("vkd3d", JSONObject().put("kind", "package").put("file", "vkd3d-x.wcp")))).toString()) + assertNull(run(null, bridge = false)) + val q = state().getJSONObject("queued").getJSONObject("proton-exp") + assertFalse(q.has("dxvk")) + assertTrue("the player's own queued swap stays", q.has("vkd3d")) + } + + @Test fun whenAutomaticChoicesAreUndone() { + val rule = ComponentsManager.bridgeDxvk(g710) + assertTrue(ComponentsManager.autoDxvkUndoWanted(false, false, null, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, true, g710, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, false, full, null)) + assertFalse("failed detection keeps it", ComponentsManager.autoDxvkUndoWanted(true, false, null, null)) + assertFalse(ComponentsManager.autoDxvkUndoWanted(true, false, g710, rule)) + } + private fun run( vk: AppVulkan?, bridge: Boolean = true, + keep: Boolean = false, applyAuto: (String, String) -> String = { id, file -> error("apply $id $file") }, undoAuto: (String, String) -> String = { id, comp -> error("undo $id $comp") }, ) = ComponentsManager.ensureForcedPackages( @@ -173,7 +226,7 @@ class BridgeDxvkTest { lookup = { file, release -> ComponentsManager.CatalogItem(file, "dxvk", release, "https://example.invalid/$file", 4, "sha256:" + "ab".repeat(32)) }, fetch = {}, apply = { id, file -> error("non-automatic apply $id $file") }, - vulkan = vk, bridgeSession = bridge, applyAuto = applyAuto, undoAuto = undoAuto, + vulkan = vk, bridgeSession = bridge, applyAuto = applyAuto, undoAuto = undoAuto, keepProtonDxvk = keep, ) private fun protonDir(name: String) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/common/$name")