mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
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
This commit is contained in:
1 parent
e4d4096342
commit
d74575ed7f
40 files changed
+231
-11
No files matched your search
@@ -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<String>()
|
||||
val plain = mutableListOf<String>()
|
||||
val auto = mutableListOf<String>()
|
||||
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<String>()
|
||||
val auto = mutableListOf<String>()
|
||||
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<String>()
|
||||
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}") }
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user