From d74575ed7faaa8b1fe8048826cb0bf3271e0277c Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 15:48:14 -0500 Subject: [PATCH] fix(components): DXVK Auto on Adreno 6xx keeps DroidDeck-Proton on DXVK-gplasync 2.7.1 (#2226) * fix(components): DXVK Auto on Adreno 6xx keeps DroidDeck-Proton on DXVK-gplasync 2.7.1 * fix(components): DXVK Auto says so when the pinned DXVK could not be installed * fix(components): a DXVK the player picked is shown as their choice, not a failed pinned install --- .../com/droiddeck/launcher/ComponentsMenu.kt | 2 +- .../launcher/session/ComponentUpdater.kt | 36 ++++++++- .../launcher/session/ComponentsManager.kt | 44 ++++++++-- .../droiddeck/launcher/ui/ComponentsPage.kt | 2 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/session/ForcedPackageTest.kt | 80 +++++++++++++++++++ .../launcher/session/PinnedDxvkStatusTest.kt | 37 +++++++++ docs/development/game-environment.md | 8 +- 40 files changed, 231 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/PinnedDxvkStatusTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt index db1d3eda5d..e5e74f791f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt @@ -39,7 +39,7 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat runCatching { ComponentUpdater.settle(activity) } val modes = ComponentsManager.COMPONENTS.associateWith { SessionPrefs.componentMode(activity, it) } val auto = ComponentsManager.COMPONENTS.associateWith { runCatching { ComponentUpdater.status(activity, it) }.getOrDefault(emptyList()) } - val held = if (runCatching { ComponentsManager.hardwareDxvk(activity) }.getOrDefault(false)) setOf("dxvk") else emptySet() + val held = if (runCatching { ComponentsManager.autoDxvkHeld(activity) }.getOrDefault(false)) setOf("dxvk") else emptySet() ui.post { compModes = modes compAuto = auto diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt index 05f89fce4a..2f7b3f17c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt @@ -5,15 +5,17 @@ import android.util.AtomicFile import android.util.Log import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.AutoComponents +import com.droiddeck.launcher.gpu.GpuInfo +import java.io.File import org.json.JSONArray import org.json.JSONObject -import java.io.File object ComponentUpdater { private const val TAG = "ComponentUpdater" private const val CHECK_EVERY_MS = 3_600_000L private const val BOOTED_KEPT = 200 private const val HANDED_BACK = "handedBack" + private const val PINNED_NOTE = "pinnedNote" internal const val HAND_BACK_FILES = "handBackFiles" private const val IMPORTED = "imported" private val lock = Any() @@ -103,6 +105,13 @@ object ComponentUpdater { val protons = found ?: emptyList() if (found != null) handBack(context, state, found) judge(context, state, protons, notes) + ComponentsManager.pinnedAutoDxvk(context)?.let { pinned -> + runCatching { ComponentsManager.ensureForcedPackages(context) } + .onSuccess { if (it != null) Log.i(TAG, it) }.onFailure { Log.w(TAG, "pinned DXVK", it) } + val followers = protons.filter { ComponentUpdates.follows(it) && ComponentsManager.supports(it, "dxvk") }.map { it.id to it.version } + if (pinnedHeld(pinned, followers, ComponentsManager.activeChoices(context), pinnedBase())) state.remove(PINNED_NOTE) + else state.put(PINNED_NOTE, context.getString(R.string.comp_auto_install_failed, pinned.removeSuffix(".wcp"))) + } val due = force || System.currentTimeMillis() - state.optLong("checkedAt") >= CHECK_EVERY_MS val wanted = ComponentsManager.COMPONENTS.filter { managed(context, it) } if (wanted.isEmpty() || protons.isEmpty()) { @@ -385,7 +394,32 @@ object ComponentUpdater { } } + internal fun pinnedHeld(pinned: String, followers: List>, choices: Map>, base: String?): Boolean = + followers.all { (id, version) -> + val choice = choices[id]?.get("dxvk") + ownChoice(choice, version, pinned, base) || choice?.let { it.file == ComponentsManager.safeName(pinned) && it.protonVersion == version } == true + } + + internal fun ownChoice(choice: ComponentsManager.Choice?, version: String, pinned: String, base: String?): Boolean = + choice != null && !choice.auto && choice.protonVersion == version && choice.file != ComponentsManager.safeName(pinned) && + (base == null || choice.file != ComponentsManager.safeName(base)) + + private fun pinnedBase(): String? = ComponentsManager.forcedDxvk(GpuInfo.detect())?.file + fun status(context: Context, comp: String): List { + val pinned = if (comp == "dxvk") ComponentsManager.pinnedAutoDxvk(context) else null + if (pinned != null) { + val on = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) + .filter { ComponentUpdates.follows(it) && ComponentsManager.supports(it, comp) } + if (on.isEmpty()) return emptyList() + val choices = ComponentsManager.activeChoices(context) + val base = pinnedBase() + val (own, auto) = on.partition { ownChoice(choices[it.id]?.get(comp), it.version, pinned, base) } + val held = pinnedHeld(pinned, auto.map { it.id to it.version }, choices, base) + val pinnedLine = if (auto.isEmpty()) emptyList() + else listOf(Status(comp, pinned, pinned, auto.map { it.name }, if (held) "" else load(context).optString(PINNED_NOTE))) + return pinnedLine + own.groupBy { choices.getValue(it.id).getValue(comp).file }.map { (file, ps) -> Status(comp, file, file, ps.map { it.name }, "") } + } val state = load(context) val lines = state.optJSONObject("lines") ?: JSONObject() val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) 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 3c1c92c0d1..e9409b74cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -1065,14 +1065,24 @@ object ComponentsManager { val file: String, val release: String, val models: Set = emptySet(), + val autoFile: String? = null, + val autoRelease: String? = null, ) { fun matches(gpu: GpuInfo) = gpu.family in families && (models.isEmpty() || gpu.model in models) + + fun autoRule(): ForcedPackage? = + if (autoFile != null && autoRelease != null) copy(file = autoFile, release = autoRelease, autoFile = null, autoRelease = null) else null } internal val FORCED_PACKAGES = listOf( - ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux"), + ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux", + autoFile = "dxvk-gplasync-2.7.1-1-linux.wcp", autoRelease = "Dxvk-gplasync-Linux"), ) + internal fun autoDxvk(gpu: GpuInfo): ForcedPackage? = forcedDxvk(gpu)?.autoRule() + + internal fun forcedDxvk(gpu: GpuInfo): ForcedPackage? = FORCED_PACKAGES.firstOrNull { it.comp == "dxvk" && it.matches(gpu) } + private val ARM64EC_PROBE = mapOf("dxvk" to "d3d11.dll", "vkd3d" to "d3d12.dll") fun arm64ec(context: Context, p: Proton, comp: String): Boolean? = stockProbe(context, p, comp)?.let(ComponentUpdates::arm64ec) @@ -1124,6 +1134,12 @@ object ComponentsManager { (com.droiddeck.launcher.core.DeviceSupport.vkBridge(context) && !SessionPrefs.bridgeProtonDxvk(context) && bridgeDxvk(AppVulkan.detect(context)) != null) + fun autoDxvkHeld(context: Context): Boolean = + hardwareDxvk(context) && (runtimeManaged(context, "dxvk") || autoDxvk(GpuInfo.detect()) == null) + + fun pinnedAutoDxvk(context: Context): String? = + if (SessionPrefs.componentMode(context, "dxvk") == ComponentUpdates.AUTO) autoDxvk(GpuInfo.detect())?.file else null + data class Choice(val file: String, val auto: Boolean, val protonVersion: String) fun activeChoices(context: Context): Map> = synchronized(lock) { @@ -1168,6 +1184,14 @@ 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" + private data class ForcedRule( + val pkg: ForcedPackage, + val auto: Boolean, + val covers: (Proton) -> Boolean, + val replaces: String? = null, + val label: String? = null, + ) + internal fun autoDxvkUndoWanted(bridgeSession: Boolean, keepProtonDxvk: Boolean, vulkan: AppVulkan?, bridgeRule: ForcedPackage?): Boolean = !bridgeSession || keepProtonDxvk || (vulkan != null && bridgeRule == null) @@ -1200,6 +1224,7 @@ object ComponentsManager { undoAuto = { id, comp -> undoAutoChoice(context, id, comp) }, keepProtonDxvk = SessionPrefs.bridgeProtonDxvk(context), autoPossible = !com.droiddeck.launcher.core.DeviceSupport.adreno(), + dxvkAuto = pinnedAutoDxvk(context) != null, ) } fun settleAutoDxvk(context: Context) { @@ -1239,10 +1264,16 @@ object ComponentsManager { undoAuto: (protonId: String, comp: String) -> String = { _, _ -> "" }, keepProtonDxvk: Boolean = false, autoPossible: Boolean = true, + dxvkAuto: Boolean = false, + follows: (Proton) -> Boolean = ComponentUpdates::follows, ): String? { 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 }) + val family = FORCED_PACKAGES.filter { it.matches(gpu) } + val pinned = if (dxvkAuto) family.mapNotNull { base -> base.autoRule()?.let { base to it } } else emptyList() + val rules = family.map { base -> ForcedRule(base, false, if (pinned.any { it.first == base }) { p -> !follows(p) } else { _ -> true }) } + + pinned.map { (base, rule) -> ForcedRule(rule, true, follows, replaces = base.file) } + + listOfNotNull(bridgeRule?.let { ForcedRule(it, true, { true }, label = "${vulkan?.label}: DXVK ${it.file}") }) if (rules.isEmpty() && !autoPossible) return null val installed = protons(context) val lines = mutableListOf() @@ -1256,12 +1287,13 @@ object ComponentsManager { if (autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") }) } } - for ((rule, auto) in rules) { + for ((rule, auto, covers, replaces, label) in rules) { val state = loadState(context) val targets = installed.filter { p -> val active = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(rule.comp) - forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) || - (auto && autoChoiceStale(active, rule.file)) + val current = active?.optString("protonVersion") == p.version + covers(p) && (forcedPackageWanted(active?.optString("file"), current) || + (auto && autoChoiceStale(active, rule.file)) || (replaces != null && current && active?.optString("file") == replaces)) } if (targets.isEmpty()) continue val missing = missingPackage(context, rule, lookup, fetch) @@ -1269,7 +1301,7 @@ object ComponentsManager { lines.add(missing) continue } - if (auto) lines.add("${vulkan?.label}: DXVK ${rule.file}") + if (label != null) lines.add(label) lines.add(targets.joinToString("; ") { p -> if (auto) each(p) { applyAuto(p.id, rule.file) } else apply(p.id, rule.file) }) } return lines.filter { it.isNotEmpty() }.joinToString("; ").ifEmpty { null } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index fcd2a05124..b00edeb98a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -1112,7 +1112,7 @@ private fun AutoComponentBody(label: String, lines: Listلا يستخدمه أي DroidDeck-Proton تنتظر تحديثات Auto اتصالًا. تعذّر البحث عن إصدارات جديدة. + تعذّر تثبيت %1$s. تنتظر الإصدارات الجديدة اتصالًا غير محدود، وإيقاف توفير البطارية، وجهازًا غير ساخن. تم تحديث %1$s إلى %2$s. أغلق %1$s %2$s لعبة خلال ثوانٍ مرتين، لذا عاد Auto إلى %3$s. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 94a3ba6e71..dff3e76b9b 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -568,6 +568,7 @@ Ningún DroidDeck-Proton lo usa Las actualizaciones Auto esperan una conexión. No se pudieron buscar nuevas versiones. + No se pudo instalar %1$s. Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. %1$s actualizado a %2$s. %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d74b4054a4..0a3e0baadc 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -566,6 +566,7 @@ Нито един DroidDeck-Proton не го използва Актуализациите Auto чакат връзка. Новите версии не можаха да бъдат проверени. + %1$s не можа да бъде инсталиран. Новите версии чакат неотчитана връзка, изключен режим за пестене на батерията и охладено устройство. %1$s е обновен до %2$s. %1$s %2$s два пъти затвори игра до секунди, затова Auto се върна към %3$s. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c42e8ae238..e1ddcfdb57 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -570,6 +570,7 @@ Žádný DroidDeck-Proton to nepoužívá Aktualizace Auto čekají na připojení. Nová sestavení nelze zkontrolovat. + %1$s nelze nainstalovat. Nová sestavení čekají na neměřené připojení, vypnutou úsporu baterie a nepřehřáté zařízení. %1$s aktualizováno na %2$s. %1$s %2$s dvakrát zavřelo hru během pár sekund, proto se Auto vrátilo k %3$s. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f40c83a8ef..a79078ea9e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -566,6 +566,7 @@ Ingen DroidDeck-Proton bruger dette Auto-opdateringer venter på en forbindelse. Kunne ikke søge efter nye builds. + Kunne ikke installere %1$s. Nye builds venter på en ubegrænset forbindelse, slået batterisparer fra og en kølig enhed. %1$s opdateret til %2$s. %1$s %2$s lukkede et spil inden for sekunder to gange, så Auto gik tilbage til %3$s. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 43b275439e..a4ce52946f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -566,6 +566,7 @@ Kein DroidDeck-Proton nutzt dies Auto-Updates warten auf eine Verbindung. Neue Builds konnten nicht geprüft werden. + %1$s konnte nicht installiert werden. Neue Builds warten auf eine nicht getaktete Verbindung, ausgeschalteten Energiesparmodus und ein kühles Gerät. %1$s auf %2$s aktualisiert. %1$s %2$s hat ein Spiel zweimal nach wenigen Sekunden beendet, daher ist Auto zu %3$s zurückgekehrt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f8f20b4470..2b27021163 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -566,6 +566,7 @@ Κανένα DroidDeck-Proton δεν το χρησιμοποιεί Οι ενημερώσεις Auto περιμένουν σύνδεση. Δεν ήταν δυνατός ο έλεγχος για νέες εκδόσεις. + Δεν ήταν δυνατή η εγκατάσταση του %1$s. Οι νέες εκδόσεις περιμένουν σύνδεση χωρίς όριο δεδομένων, απενεργοποιημένη εξοικονόμηση μπαταρίας και δροσερή συσκευή. Το %1$s ενημερώθηκε σε %2$s. Το %1$s %2$s έκλεισε ένα παιχνίδι μέσα σε δευτερόλεπτα δύο φορές, οπότε το Auto επέστρεψε στο %3$s. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 095845c81e..471e4fc017 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -568,6 +568,7 @@ Ningún DroidDeck-Proton lo usa Las actualizaciones Auto esperan una conexión. No se pudieron buscar nuevas versiones. + No se pudo instalar %1$s. Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. %1$s actualizado a %2$s. %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 27b2ebb82b..c749fe2526 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -566,6 +566,7 @@ Mikään DroidDeck-Proton ei käytä tätä Auto-päivitykset odottavat yhteyttä. Uusia versioita ei voitu tarkistaa. + Kohdetta %1$s ei voitu asentaa. Uudet versiot odottavat rajoittamatonta yhteyttä, virransäästön poistoa ja viileää laitetta. %1$s päivitetty versioon %2$s. %1$s %2$s sulki pelin sekunneissa kahdesti, joten Auto palasi versioon %3$s. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 50c583ee0f..f8728055aa 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -568,6 +568,7 @@ Aucun DroidDeck-Proton ne l\'utilise Les mises à jour Auto attendent une connexion. Impossible de vérifier les nouvelles versions. + Impossible d\'installer %1$s. Les nouvelles versions attendent une connexion non limitée, l\'économiseur de batterie désactivé et un appareil frais. %1$s mis à jour vers %2$s. %1$s %2$s a fermé un jeu en quelques secondes deux fois, Auto est donc revenu à %3$s. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 18bd25bdb3..e03cb36d23 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -566,6 +566,7 @@ कोई DroidDeck-Proton इसका उपयोग नहीं करता Auto अपडेट कनेक्शन का इंतज़ार कर रहे हैं। नए बिल्ड नहीं जाँचे जा सके। + %1$s इंस्टॉल नहीं हो सका। नए बिल्ड बिना सीमा वाले कनेक्शन, बंद बैटरी सेवर और ठंडे डिवाइस का इंतज़ार करते हैं। %1$s को %2$s पर अपडेट किया गया। %1$s %2$s ने दो बार कुछ सेकंड में गेम बंद कर दिया, इसलिए Auto %3$s पर लौट गया। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e4c1faa6a8..6f43ff687d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -566,6 +566,7 @@ Egyik DroidDeck-Proton sem használja Az Auto frissítések kapcsolatra várnak. Nem sikerült új buildeket keresni. + Nem sikerült telepíteni: %1$s. Az új buildek nem forgalomkorlátos kapcsolatra, kikapcsolt energiatakarékos módra és hűvös eszközre várnak. %1$s frissítve: %2$s. %1$s %2$s kétszer is másodperceken belül bezárt egy játékot, ezért az Auto visszaállt erre: %3$s. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 102aec408e..18b6463c8d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -564,6 +564,7 @@ Tidak ada DroidDeck-Proton yang memakainya Pembaruan Auto menunggu koneksi. Tidak dapat memeriksa build baru. + Tidak dapat memasang %1$s. Build baru menunggu koneksi tanpa kuota, penghemat baterai mati, dan perangkat yang dingin. %1$s diperbarui ke %2$s. %1$s %2$s menutup game dalam hitungan detik dua kali, jadi Auto kembali ke %3$s. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index cbb08eef65..fbb220a611 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -568,6 +568,7 @@ Nessun DroidDeck-Proton lo usa Gli aggiornamenti Auto attendono una connessione. Impossibile cercare nuove build. + Impossibile installare %1$s. Le nuove build attendono una connessione non a consumo, il risparmio batteria disattivato e un dispositivo fresco. %1$s aggiornato a %2$s. %1$s %2$s ha chiuso un gioco in pochi secondi per due volte, quindi Auto è tornato a %3$s. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 698dc16b16..0b0d02459c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -564,6 +564,7 @@ これを使う DroidDeck-Proton はありません Auto 更新は接続を待っています。 新しいビルドを確認できませんでした。 + %1$s をインストールできませんでした。 新しいビルドは従量制でない接続、バッテリーセーバーのオフ、端末が熱くない状態を待ちます。 %1$s を %2$s に更新しました。 %1$s %2$s でゲームが数秒で 2 回終了したため、Auto は %3$s に戻しました。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b5d27ea1f2..ec87fdf08b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -564,6 +564,7 @@ 이를 사용하는 DroidDeck-Proton이 없습니다 Auto 업데이트가 연결을 기다리는 중입니다. 새 빌드를 확인할 수 없습니다. + %1$s을(를) 설치할 수 없습니다. 새 빌드는 데이터 무제한 연결, 배터리 세이버 꺼짐, 기기가 뜨겁지 않은 상태를 기다립니다. %1$s을(를) %2$s(으)로 업데이트했습니다. %1$s %2$s(으)로 게임이 몇 초 만에 두 번 종료되어 Auto가 %3$s(으)로 되돌렸습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 40dfc450cd..c40b293a81 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -564,6 +564,7 @@ Tiada DroidDeck-Proton yang menggunakannya Kemas kini Auto menunggu sambungan. Tidak dapat menyemak binaan baharu. + Tidak dapat memasang %1$s. Binaan baharu menunggu sambungan tanpa meter, penjimat bateri dimatikan dan peranti yang sejuk. %1$s dikemas kini ke %2$s. %1$s %2$s menutup permainan dalam beberapa saat dua kali, jadi Auto kembali ke %3$s. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 36c0e4a4c6..bdb3934dca 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -566,6 +566,7 @@ Ingen DroidDeck-Proton bruker dette Auto-oppdateringer venter på en tilkobling. Kunne ikke se etter nye bygg. + Kunne ikke installere %1$s. Nye bygg venter på en ubegrenset tilkobling, avslått batterisparing og en kjølig enhet. %1$s oppdatert til %2$s. %1$s %2$s lukket et spill innen sekunder to ganger, så Auto gikk tilbake til %3$s. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8d33f1289a..a0f76cc25e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -566,6 +566,7 @@ Geen DroidDeck-Proton gebruikt dit Auto-updates wachten op een verbinding. Kon niet op nieuwe builds controleren. + Kon %1$s niet installeren. Nieuwe builds wachten op een onbeperkte verbinding, batterijbesparing uit en een koel apparaat. %1$s bijgewerkt naar %2$s. %1$s %2$s sloot een game twee keer binnen enkele seconden, dus Auto ging terug naar %3$s. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index acc362a637..569df0344b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -570,6 +570,7 @@ Żaden DroidDeck-Proton tego nie używa Aktualizacje Auto czekają na połączenie. Nie udało się sprawdzić nowych wersji. + Nie udało się zainstalować %1$s. Nowe wersje czekają na połączenie bez limitu, wyłączone oszczędzanie baterii i chłodne urządzenie. %1$s zaktualizowano do %2$s. %1$s %2$s dwa razy zamknął grę po kilku sekundach, więc Auto wróciło do %3$s. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ed66c58b5c..898a0b065f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -568,6 +568,7 @@ Nenhum DroidDeck-Proton usa isto As atualizações Auto aguardam uma ligação. Não foi possível procurar novas versões. + Não foi possível instalar %1$s. As novas versões aguardam uma ligação não limitada, a poupança de bateria desligada e o dispositivo fresco. %1$s atualizado para %2$s. %1$s %2$s fechou um jogo em segundos duas vezes, por isso Auto voltou a %3$s. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ad144a216a..d4b6b29f8f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -568,6 +568,7 @@ Nenhum DroidDeck-Proton usa isto As atualizações Auto aguardam uma conexão. Não foi possível procurar novas versões. + Não foi possível instalar %1$s. Novas versões aguardam uma conexão não limitada, a economia de bateria desligada e o aparelho frio. %1$s atualizado para %2$s. %1$s %2$s fechou um jogo em segundos duas vezes, então Auto voltou para %3$s. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 16d3414aa6..a27d196167 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -568,6 +568,7 @@ Niciun DroidDeck-Proton nu folosește asta Actualizările Auto așteaptă o conexiune. Nu s-au putut căuta versiuni noi. + Nu s-a putut instala %1$s. Versiunile noi așteaptă o conexiune fără limită de date, economisirea bateriei oprită și un dispozitiv răcit. %1$s actualizat la %2$s. %1$s %2$s a închis un joc în câteva secunde de două ori, așa că Auto a revenit la %3$s. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c1922c6b4c..97683ba73f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -589,6 +589,7 @@ Ни один DroidDeck-Proton это не использует Обновления Auto ждут подключения. Не удалось проверить новые сборки. + Не удалось установить %1$s. Новые сборки ждут безлимитного подключения, выключенной экономии заряда и остывшего устройства. %1$s обновлён до %2$s. %1$s %2$s дважды закрыл игру за несколько секунд, поэтому Auto вернулся к %3$s. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 644a570b16..3c3e8b9ddd 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -566,6 +566,7 @@ Ingen DroidDeck-Proton använder detta Auto-uppdateringar väntar på en anslutning. Kunde inte söka efter nya byggen. + Kunde inte installera %1$s. Nya byggen väntar på en obegränsad anslutning, avstängt batterisparläge och en sval enhet. %1$s uppdaterat till %2$s. %1$s %2$s stängde ett spel inom sekunder två gånger, så Auto gick tillbaka till %3$s. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 652e321faa..af54a2d03c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -564,6 +564,7 @@ ไม่มี DroidDeck-Proton ที่ใช้สิ่งนี้ การอัปเดต Auto กำลังรอการเชื่อมต่อ ตรวจหาบิลด์ใหม่ไม่ได้ + ติดตั้ง %1$s ไม่ได้ บิลด์ใหม่จะรอการเชื่อมต่อที่ไม่จำกัดปริมาณ ปิดโหมดประหยัดแบตเตอรี่ และอุปกรณ์ที่ไม่ร้อน อัปเดต %1$s เป็น %2$s แล้ว %1$s %2$s ทำให้เกมปิดภายในไม่กี่วินาทีสองครั้ง Auto จึงกลับไปใช้ %3$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 37366864a3..086a9f3372 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -566,6 +566,7 @@ Hiçbir DroidDeck-Proton bunu kullanmıyor Auto güncellemeleri bağlantı bekliyor. Yeni sürümler denetlenemedi. + %1$s yüklenemedi. Yeni sürümler sınırsız bir bağlantı, kapalı pil tasarrufu ve serin bir cihaz bekler. %1$s, %2$s sürümüne güncellendi. %1$s %2$s bir oyunu iki kez saniyeler içinde kapattı, bu yüzden Auto %3$s sürümüne döndü. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8ed74d7c39..b356c327f4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -570,6 +570,7 @@ Жоден DroidDeck-Proton цього не використовує Оновлення Auto чекають на з’єднання. Не вдалося перевірити нові збірки. + Не вдалося встановити %1$s. Нові збірки чекають на безлімітне з’єднання, вимкнену економію заряду та охолоджений пристрій. %1$s оновлено до %2$s. %1$s %2$s двічі закрив гру за кілька секунд, тому Auto повернувся до %3$s. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index efee5ef2dd..e343bab916 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -564,6 +564,7 @@ Không DroidDeck-Proton nào dùng thành phần này Cập nhật Auto đang chờ kết nối. Không thể kiểm tra bản dựng mới. + Không thể cài đặt %1$s. Bản dựng mới chờ kết nối không đo lưu lượng, tắt tiết kiệm pin và thiết bị đủ mát. Đã cập nhật %1$s lên %2$s. %1$s %2$s làm trò chơi đóng sau vài giây hai lần, nên Auto đã quay lại %3$s. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 58da44a9bd..c536c27309 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -564,6 +564,7 @@ 没有 DroidDeck-Proton 使用它 Auto 更新正在等待网络连接。 无法检查新版本。 + 无法安装 %1$s。 新版本将等待不按流量计费的网络、关闭省电模式且设备不过热时下载。 %1$s 已更新到 %2$s。 %1$s %2$s 两次在几秒内关闭了游戏,因此 Auto 已退回到 %3$s。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 9bae913141..e4e34b6aa4 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -564,6 +564,7 @@ 沒有 DroidDeck-Proton 使用它 Auto 更新正在等待網絡連線。 無法檢查新版本。 + 無法安裝 %1$s。 新版本將等待非按流量收費的網絡、關閉省電模式且裝置不過熱時下載。 %1$s 已更新至 %2$s。 %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e71d806aab..6568d97abd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -564,6 +564,7 @@ 沒有 DroidDeck-Proton 使用它 Auto 更新正在等待網路連線。 無法檢查新版本。 + 無法安裝 %1$s。 新版本將等待非計量網路、關閉省電模式且裝置不過熱時下載。 %1$s 已更新至 %2$s。 %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2daede434e..ac49f423af 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -614,6 +614,7 @@ No DroidDeck-Proton uses this Auto updates wait for a connection. Couldn\'t check for new builds. + Couldn\'t install %1$s. New builds wait for an unmetered connection, battery saver off and a cool device. %1$s updated to %2$s. %1$s %2$s closed a game within seconds twice, so Auto went back to %3$s. diff --git a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt index 966934ef04..52eaaa585f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt @@ -21,6 +21,7 @@ import java.io.File @Config(sdk = [28], manifest = Config.NONE) class ForcedPackageTest { private val dxvk2 = "dxvk-2.7.1-linux.wcp" + private val gplasync = "dxvk-gplasync-2.7.1-1-linux.wcp" private lateinit var context: Context @Before fun setUp() { @@ -54,6 +55,74 @@ class ForcedPackageTest { assertTrue(ComponentsManager.FORCED_PACKAGES.none { GpuInfo.Family.A7XX in it.families }) } + @Test fun onlyAdreno6xxPinsDxvkAutoToGplasync() { + val rule = ComponentsManager.autoDxvk(gpu(644, GpuInfo.Family.A6XX))!! + assertEquals(gplasync, rule.file) + assertEquals("Dxvk-gplasync-Linux", rule.release) + assertNull(rule.autoRule()) + assertNull(ComponentsManager.autoDxvk(gpu(740, GpuInfo.Family.A7XX))) + assertNull(ComponentsManager.autoDxvk(gpu(830, GpuInfo.Family.A8XX))) + } + + @Test fun dxvkAutoGivesDroidDeckProtonGplasyncAndOtherProtonsKeepDxvk2() { + proton("dd-proton") + proton("valve") + val fetched = mutableListOf() + val plain = mutableListOf() + val auto = mutableListOf() + installAuto( + gpu(644, GpuInfo.Family.A6XX), + fetch = { fetched += it.file }, + apply = { id, file -> plain += "$id $file"; "" }, + applyAuto = { id, file -> auto += "$id $file"; "" }, + ) + assertEquals(listOf("valve $dxvk2"), plain) + assertEquals(listOf("dd-proton $gplasync"), auto) + assertEquals(listOf(dxvk2, gplasync), fetched) + } + + @Test fun dxvkAutoReplacesTheForcedDxvk2ButKeepsAUserChoice() { + proton("dd-proton") + proton("dd-picked") + proton("valve") + writeState("dd-proton", dxvk2, "experimental-11") + writeState("dd-picked", "dxvk-3.1-linux.wcp", "experimental-11") + writeState("valve", dxvk2, "experimental-11") + val plain = mutableListOf() + val auto = mutableListOf() + installAuto( + gpu(644, GpuInfo.Family.A6XX), + apply = { id, file -> plain += "$id $file"; "" }, + applyAuto = { id, file -> auto += "$id $file"; "" }, + ) + assertTrue(plain.isEmpty()) + assertEquals(listOf("dd-proton $gplasync"), auto) + } + + @Test fun dxvkAutoLeavesGplasyncInPlace() { + proton("dd-proton") + writeState("dd-proton", gplasync, "experimental-11") + assertNull(installAuto(gpu(644, GpuInfo.Family.A6XX))) + } + + @Test fun dxvkManualKeepsDxvk2ForEveryProton() { + proton("dd-proton") + proton("valve") + val plain = mutableListOf() + installAuto( + gpu(644, GpuInfo.Family.A6XX), + apply = { id, file -> plain += "$id $file"; "" }, + dxvkAuto = false, + ) + assertEquals(listOf("dd-proton $dxvk2", "valve $dxvk2"), plain) + } + + @Test fun dxvkAutoLeavesAdreno7xxAnd8xxAlone() { + proton("dd-proton") + assertNull(installAuto(gpu(740, GpuInfo.Family.A7XX))) + assertNull(installAuto(gpu(830, GpuInfo.Family.A8XX))) + } + @Test fun aModelListOnlyMatchesThoseChips() { val rule = ComponentsManager.ForcedPackage( setOf(GpuInfo.Family.A7XX_LOW), "dxvk", dxvk2, "Dxvk-Linux", setOf(710), @@ -517,6 +586,17 @@ class ForcedPackageTest { apply: (String, String) -> String = ::refuseApply, ) = ComponentsManager.ensureForcedPackages(context, gpu, lookup, fetch, apply) + private fun installAuto( + gpu: GpuInfo, + fetch: (ComponentsManager.CatalogItem) -> Unit = {}, + apply: (String, String) -> String = ::refuseApply, + applyAuto: (String, String) -> String = ::refuseApply, + dxvkAuto: Boolean = true, + ) = ComponentsManager.ensureForcedPackages( + context, gpu, { file, release -> item(file, release) }, fetch, apply, + applyAuto = applyAuto, dxvkAuto = dxvkAuto, follows = { it.id.startsWith("dd-") }, + ) + private fun refuseLookup(file: String, release: String): ComponentsManager.CatalogItem? = error("catalog $file $release") private fun refuseFetch(item: ComponentsManager.CatalogItem) { error("fetch ${item.file}") } diff --git a/app/src/test/java/com/droiddeck/launcher/session/PinnedDxvkStatusTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PinnedDxvkStatusTest.kt new file mode 100644 index 0000000000..78e7aa61d3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/PinnedDxvkStatusTest.kt @@ -0,0 +1,37 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class PinnedDxvkStatusTest { + private val pinned = "dxvk-gplasync-2.7.1-1-linux.wcp" + private val base = "dxvk-2.7.1-linux.wcp" + private fun choice(file: String, version: String, auto: Boolean = true) = mapOf("dxvk" to ComponentsManager.Choice(file, auto, version)) + + @Test fun thePinIsHeldOnlyWhenEveryFollowingProtonRunsIt() { + val followers = listOf("a" to "10.0-1", "b" to "10.0-2") + assertTrue(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to choice(pinned, "10.0-2")), base)) + assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1")), base)) + assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2")), base)) + assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "9.0-1"), "b" to choice(pinned, "10.0-2")), base)) + } + + @Test fun noFollowingProtonMeansNothingToReport() { + assertTrue(ComponentUpdater.pinnedHeld(pinned, emptyList(), emptyMap(), base)) + } + + @Test fun aDxvkThePlayerPickedIsTheirChoiceNotAFailedInstall() { + val followers = listOf("a" to "10.0-1", "b" to "10.0-2") + val own = choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2", auto = false) + assertTrue(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to own), base)) + assertTrue(ComponentUpdater.ownChoice(own.getValue("dxvk"), "10.0-2", pinned, base)) + assertFalse(ComponentUpdater.ownChoice(own.getValue("dxvk"), "10.0-3", pinned, base)) + assertFalse(ComponentUpdater.ownChoice(choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2").getValue("dxvk"), "10.0-2", pinned, base)) + } + + @Test fun theForcedDxvkThePinReplacesStillCountsAsNotInstalled() { + val followers = listOf("a" to "10.0-1") + assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(base, "10.0-1", auto = false)), base)) + } +} diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index de215be39a..79206aa03a 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -55,8 +55,9 @@ profile are never removed. Steam's process log tells it how long each game ran. for at least a minute on the previous build and then exits within 30 seconds twice on the new one rolls back every component line that changed since that boot, and each failed build is skipped until a newer one is published. Games with their own component override are -not counted. DXVK stays on Manual while a GPU rule pins a DXVK version (Adreno 6xx and -the Vulkan bridge). Manual keeps the existing download, import and restore lists. +not counted. DXVK stays on Manual while the Vulkan bridge or the PowerVR runtime chooses DXVK. +On an Adreno 6xx, DXVK Auto keeps every DroidDeck-Proton build on DXVK-gplasync 2.7.1 instead of +following the nightlies (see below). Manual keeps the existing download, import and restore lists. Before publishing game component choices, DroidDeck preserves each Proton build's original components, including an explicitly empty bundle when a component is not @@ -225,6 +226,9 @@ On an Adreno 6xx, Turnip does not expose `storageBuffer8BitAccess`, which DXVK 3 requires. A Steam or desktop session installs DXVK 2.7.1 into any Proton whose DXVK is still the copy that Proton shipped, including after a Proton update put that copy back. A DXVK package chosen in Components stays for that Proton build. +With DXVK on Auto, DroidDeck-Proton builds get DXVK-gplasync 2.7.1 instead, replacing the +shipped copy, the forced DXVK 2.7.1 or an older Auto choice; other Proton builds keep DXVK 2.7.1. +Adreno 7xx and 8xx follow the DXVK nightlies as before. The variable-name picker offers 24 predefined variables and a Custom entry. Like WinNative, known variables use toggles, value dropdowns, multi-select lists, or