From ea0a61ca2b94003e365913cad825237cafe21b6f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 15 Oct 2026 09:46:26 -0400 Subject: [PATCH] fix: keep Quest-patched Turnip as the auto default (#853) --- .../com/droiddeck/launcher/DriverMenus.kt | 11 +++- .../droiddeck/launcher/gpu/TurnipDriver.java | 3 + .../launcher/session/QuestExperimental.kt | 16 ++++++ app/src/main/res/values/strings.xml | 2 + .../droiddeck/launcher/DriverMenusAutoTest.kt | 56 +++++++++++++++++++ .../launcher/gpu/TurnipDriverAutoTest.kt | 33 +++++++++++ .../launcher/session/QuestExperimentalTest.kt | 29 ++++++++++ docs/quest.md | 7 +++ 8 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 09c195201f..5e5b956940 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -20,6 +20,7 @@ import com.droiddeck.launcher.gpu.TurnipDriver import com.droiddeck.launcher.gpu.TurnipReleases import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.ui.DriverRow import com.droiddeck.launcher.ui.GpuDriversState import com.droiddeck.launcher.ui.PairRow @@ -103,7 +104,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val lm = LinuxVulkanDriverManager(activity) val td = TurnipDriver(activity) val pairs = DriverPairs.from(TurnipReleases.cached(activity)) - val recommended = DriverPairs.recommendedKey(gpu, pairs) + val recommended = if (QuestExperimental.isSupported()) null else DriverPairs.recommendedKey(gpu, pairs) pairRows = pairs.map { p -> val bundle = p.bundle?.let { installedBundle(it) } val displayId = if (p.bundle != null) bundle?.androidId else p.display?.let { TurnipReleases.installedId(activity, it, td::isInstalled) } @@ -132,6 +133,14 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl if (mode != SessionPrefs.GPU_DRIVERS_AUTO || pairBusy != null || releaseChecking) return if (!force && autoCheckedThisProcess) return autoCheckedThisProcess = true + val displayChanged = SessionPrefs.androidDriver(activity) != QuestExperimental.defaultAndroidDriver() + if (QuestExperimental.applyAutoDrivers(activity)) { + autoStatus = activity.getString( + if (displayChanged && CompositorHost.isStarted) R.string.drivers_using_quest_restart else R.string.drivers_using_quest, + ) + refreshDrivers() + return + } if (DriverPairs.recommendedKey(gpu, emptyList()) == null) { autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity).lowercase()) return diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 700ec81c39..6fb7360f3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -8,6 +8,7 @@ import android.util.Log; import com.droiddeck.launcher.R; import com.droiddeck.launcher.core.FileUtils; import com.droiddeck.launcher.core.TarZst; +import com.droiddeck.launcher.session.QuestExperimental; import com.droiddeck.launcher.session.SessionPrefs; import org.json.JSONObject; @@ -281,6 +282,8 @@ public final class TurnipDriver { if (forced.startsWith("a7")) return DRIVER_A7XX; if (forced.startsWith("a6")) return DRIVER_A6XX; } + String quest = QuestExperimental.INSTANCE.defaultAndroidDriver(); + if (quest != null) return quest; String model = gpuModel(); Log.i(TAG, "gpu model: " + (model == null ? "unknown" : model)); if (model != null) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt index f12550419c..dc992c5bfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt @@ -24,6 +24,22 @@ object QuestExperimental { fun isSupported(): Boolean = supported(Build.MODEL, Build.DEVICE, Build.MANUFACTURER) fun isQuest2(): Boolean = quest2(Build.MODEL, Build.DEVICE, Build.MANUFACTURER) + fun defaultAndroidDriver(): String? = when { + !isSupported() -> null + isQuest2() -> DRIVER_A6XX + else -> DRIVER + } + + fun applyAutoDrivers(context: Context): Boolean { + if (SessionPrefs.gpuDriverMode(context) != SessionPrefs.GPU_DRIVERS_AUTO) return false + val driver = defaultAndroidDriver() ?: return false + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .putString("androidDriver", driver) + .putString("linuxDriver", "") + .apply() + return true + } + fun initialize(context: Context) { if (!isSupported()) return val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e831a3971..9d6ff4de93 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1289,6 +1289,8 @@ Switched to %1$s %2$s. The display driver applies after DroidDeck restarts. Using %1$s %2$s. Using %1$s %2$s. The display driver applies after DroidDeck restarts. + Using the bundled Quest display driver and runtime default. + Using the bundled Quest display driver and runtime default. The display driver applies after DroidDeck restarts. Not a driver zip: neither an AdrenoTools driver, a -Linux Turnip nor an Android + Linux bundle Import failed: %1$s Imported driver diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt new file mode 100644 index 0000000000..afcb0d4b5d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher + +import android.app.Activity +import android.content.Context +import android.os.Handler +import android.os.Looper +import com.droiddeck.launcher.session.QuestExperimental +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.shadows.ShadowBuild + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class DriverMenusAutoTest { + @Before fun reset() { + RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE) + .edit().clear().commit() + ShadowBuild.setModel("Quest 3") + ShadowBuild.setDevice("eureka") + } + + @Test fun selectingAutoUsesTheQuestPairWithoutStartingADownload() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MANUAL) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.setMode(true) + assertEquals(QuestExperimental.DRIVER, SessionPrefs.androidDriver(activity)) + assertEquals("", SessionPrefs.linuxDriver(activity)) + assertEquals(activity.getString(R.string.drivers_using_quest), menus.autoStatus) + assertFalse(menus.releaseChecking) + assertNull(menus.pairBusy) + menus.ensureAuto(force = true) + assertFalse(menus.releaseChecking) + } + + @Test fun openingManualDriverSettingsRetainsTheSelectedPair() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MANUAL) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + DriverMenus(activity, Handler(Looper.getMainLooper())).ensureAuto(force = true) + assertEquals("chosen-display", SessionPrefs.androidDriver(activity)) + assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt new file mode 100644 index 0000000000..b15e19630c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt @@ -0,0 +1,33 @@ +package com.droiddeck.launcher.gpu + +import com.droiddeck.launcher.session.QuestExperimental +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.shadows.ShadowBuild + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TurnipDriverAutoTest { + @Before fun reset() { + ShadowBuild.setModel("Phone") + ShadowBuild.setDevice("phone") + } + + @Test fun questModelsUseTheirPatchedDriverAsTheFallback() { + val driver = TurnipDriver(RuntimeEnvironment.getApplication()) + for (model in listOf("Quest 3", "Quest 3S", "Quest 2")) { + ShadowBuild.setModel(model) + assertEquals(if (model == "Quest 2") QuestExperimental.DRIVER_A6XX else QuestExperimental.DRIVER, + driver.autoId()) + } + } + + @Test fun otherDevicesRetainTheGenericFallback() { + assertEquals("turnip25.1.0", TurnipDriver(RuntimeEnvironment.getApplication()).autoId()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt index add6755390..8c0f6896a6 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt @@ -76,6 +76,35 @@ class QuestExperimentalTest { assertFalse(QuestExperimental.supported("Pixel 7", "panther", "Google")) } + @Test fun autoUsesTheQuestPairWithoutChangingOtherSettings() { + for (model in listOf("Quest 3", "Quest 3S", "Quest 2")) { + ShadowBuild.setModel(model) + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setAndroidDriver(context, "downloaded-display") + SessionPrefs.setLinuxDriver(context, "downloaded-linux") + SessionPrefs.setHdr(context, "steam", false) + assertTrue(QuestExperimental.applyAutoDrivers(context)) + assertEquals(if (model == "Quest 2") QuestExperimental.DRIVER_A6XX else QuestExperimental.DRIVER, + SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(context)) + assertFalse(SessionPrefs.hdr(context, "steam")) + } + } + + @Test fun autoLeavesManualQuestChoicesAndOtherDevicesAlone() { + for ((model, mode) in listOf("Quest 3" to SessionPrefs.GPU_DRIVERS_MANUAL, + "Phone" to SessionPrefs.GPU_DRIVERS_AUTO)) { + ShadowBuild.setModel(model) + SessionPrefs.setGpuDriverMode(context, mode) + SessionPrefs.setAndroidDriver(context, "chosen-display") + SessionPrefs.setLinuxDriver(context, "chosen-linux") + assertFalse(QuestExperimental.applyAutoDrivers(context)) + assertEquals("chosen-display", SessionPrefs.androidDriver(context)) + assertEquals("chosen-linux", SessionPrefs.linuxDriver(context)) + } + } + @Test fun installedPackagesUseSeparateSandboxSockets() { val packages = listOf("com.droiddeck.launcher", "com.tencent.ig", "com.antutu.benchmark.full", "com.ludashi.benchmark") diff --git a/docs/quest.md b/docs/quest.md index 307d5f84ba..8a05fd19d9 100644 --- a/docs/quest.md +++ b/docs/quest.md @@ -27,6 +27,13 @@ first launch selects manual drivers, the bundled These defaults apply once; subsequent user changes are retained. Colour accuracy and headset performance still need testing. +Selecting driver Auto also uses the bundled Quest display driver and runtime +default, without downloading a generic Adreno driver pair. Manual selections +remain available and are not replaced on startup. Android's Auto-by-GPU fallback +uses the Quest bundle too; the external `Download/droiddeck-driver` override +still takes precedence. Fully close and restart DroidDeck after changing the +display driver, since the compositor loads it once per app process. + Both the Android driver wrapper and the Linux session preload use `tools/quest/kgsl_compat.c`. Successful legacy allocation/free calls are unchanged. Only `EACCES`/`EPERM` failures retry through `GPUOBJ_ALLOC`,