mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
fix: recognize SM8975 and mark Adreno 850 support experimental (#1249)
* fix: recognize SM8975 and mark Adreno 850 support experimental * fix: retain A850 experimental status with spoofed Vulkan names
This commit is contained in:
1 parent
0577a22459
commit
d2abaef2a3
15 files changed
+522
-41
No files matched your search
@@ -9,7 +9,7 @@ class GpuDetectionTest {
|
||||
private fun info(adreno: Boolean, model: Int) =
|
||||
GpuInfo(name = "x", model = model, family = GpuInfo.familyOf(adreno, model), soc = "", oneUi8Gen2 = false)
|
||||
|
||||
@Test fun modelIsTheFirstThreeDigitsOfWhateverTheKernelOrVulkanReports() {
|
||||
@Test fun modelIsParsedOnlyFromAnAdrenoName() {
|
||||
assertEquals(650, GpuInfo.threeDigits("Adreno650"))
|
||||
assertEquals(830, GpuInfo.threeDigits("Adreno (TM) 830"))
|
||||
assertEquals(740, GpuInfo.threeDigits("Adreno740v2"))
|
||||
@@ -19,6 +19,12 @@ class GpuDetectionTest {
|
||||
assertEquals(0, GpuInfo.threeDigits(" "))
|
||||
assertEquals(0, GpuInfo.threeDigits("Adreno"))
|
||||
assertEquals(0, GpuInfo.threeDigits("Adreno 65"))
|
||||
assertEquals(850, GpuInfo.threeDigits("Adreno850v2"))
|
||||
assertEquals(850, GpuInfo.threeDigits("Adreno (TM) 850"))
|
||||
assertEquals(0, GpuInfo.threeDigits("44051431"))
|
||||
assertEquals(0, GpuInfo.threeDigits("0x2a02be7"))
|
||||
assertEquals(0, GpuInfo.threeDigits("Adreno 8500"))
|
||||
assertEquals(0, GpuInfo.threeDigits("Mali-G850"))
|
||||
}
|
||||
|
||||
@Test fun nonAdrenoRenderersAreNeverAdrenoWhateverNumberTheyCarry() {
|
||||
@@ -53,12 +59,14 @@ class GpuDetectionTest {
|
||||
assertEquals(Support.TESTED, info(true, 740).support)
|
||||
assertEquals(Support.TESTED, info(true, 750).support)
|
||||
assertEquals(Support.TESTED, info(true, 830).support)
|
||||
assertEquals(Support.UNTESTED, info(true, 850).support)
|
||||
assertEquals(Support.UNSUPPORTED, info(false, 0).support)
|
||||
assertEquals(Support.UNSUPPORTED, info(false, 830).support)
|
||||
}
|
||||
|
||||
@Test fun userFacingTextPerTier() {
|
||||
assertEquals("Supported", info(true, 830).supportText)
|
||||
assertEquals("Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device", info(true, 850).supportText)
|
||||
assertEquals("Experimental: its drivers are test builds", info(true, 720).supportText)
|
||||
assertEquals("Outside tested hardware (Adreno 650, 725 and newer): it may not run", info(true, 618).supportText)
|
||||
assertEquals("Not supported: DroidDeck needs an Adreno (Snapdragon) GPU", info(false, 0).supportText)
|
||||
|
||||
@@ -11,4 +11,61 @@ class GpuModelFallbackTest {
|
||||
assertEquals(0, GpuInfo.platformModel("somethingelse"))
|
||||
assertEquals(GpuInfo.Family.A7XX, GpuInfo.familyOf(true, GpuInfo.platformModel("pineapple")))
|
||||
}
|
||||
@Test fun sm8975IsTheOnlyNewSocFallback() {
|
||||
assertEquals(850, GpuInfo.platformModel("unknown", "", "SM8975"))
|
||||
assertEquals(850, GpuInfo.platformModel("unknown", "", "QTI SM8975"))
|
||||
assertEquals(850, GpuInfo.platformModel("unknown", "QTI SM8975", ""))
|
||||
assertEquals(850, GpuInfo.platformModel("unknown", "", " qti sm8975 "))
|
||||
assertEquals(0, GpuInfo.platformModel("unknown", "", "SM89750"))
|
||||
assertEquals(0, GpuInfo.platformModel("unknown", "", "SM8975-PRO"))
|
||||
assertEquals(0, GpuInfo.platformModel("unknown", "", "Qualcomm SM8975"))
|
||||
assertEquals(0, GpuInfo.platformModel("unknown", "", "SM8850"))
|
||||
assertEquals(850, GpuInfo.platformModel("sun", "", "SM8975"))
|
||||
assertEquals(830, GpuInfo.platformModel("sun", "", "unknown"))
|
||||
}
|
||||
|
||||
@Test fun aKernelModelDoesNotNeedVulkanOrSocFallback() {
|
||||
assertEquals(850 to "kernel", GpuInfo.modelFromNames("Adreno850v2",
|
||||
{ error("Vulkan must not be queried when the kernel identifies the GPU") },
|
||||
{ error("SoC must not override the kernel model") }))
|
||||
}
|
||||
|
||||
@Test fun aMissingKernelModelUsesVulkanBeforeSocFallback() {
|
||||
assertEquals(830 to "vulkan", GpuInfo.modelFromNames("Adreno", { "Adreno (TM) 830" },
|
||||
{ error("SoC must not override the Vulkan model") }))
|
||||
assertEquals(850 to "vulkan", GpuInfo.modelFromNames(null, { "Adreno850v2" }, { 0 }))
|
||||
}
|
||||
|
||||
@Test fun numericChipIdsCannotHideTheSocFallback() {
|
||||
for (name in listOf(null, "", "Adreno", "44051431", "0x2a02be7")) {
|
||||
assertEquals(850 to "platform", GpuInfo.modelFromNames(name, { "Adreno" },
|
||||
{ GpuInfo.platformModel("unknown", "", "QTI SM8975") }))
|
||||
}
|
||||
assertEquals(0 to "", GpuInfo.modelFromNames(null, { null }, { 0 }))
|
||||
}
|
||||
|
||||
@Test fun sm8975StaysExperimentalWhenTheDriverReportsA840() {
|
||||
val fallback = GpuInfo.platformModel("sun", "", "SM8975")
|
||||
for (kernel in listOf("Adreno", "Adreno (TM) 840")) {
|
||||
val (model, source) = GpuInfo.modelFromNames(kernel, { "Adreno (TM) 840" }, { fallback })
|
||||
val gpu = GpuInfo("Adreno $model", model, GpuInfo.familyOf(true, model), "SM8975", false,
|
||||
modelSource = source, platformGpuModel = fallback)
|
||||
assertEquals(840, gpu.model)
|
||||
assertEquals(if (kernel == "Adreno") "vulkan" else "kernel", gpu.modelSource)
|
||||
assertEquals(GpuInfo.Support.UNTESTED, gpu.support)
|
||||
assertEquals("Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device", gpu.supportText)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun anA840WithoutSm8975KeepsItsExistingSupportStatus() {
|
||||
for (fallback in listOf(0, 830, 840)) {
|
||||
val gpu = GpuInfo("Adreno 840", 840, GpuInfo.Family.A8XX, "", false,
|
||||
platformGpuModel = fallback)
|
||||
assertEquals(GpuInfo.Support.TESTED, gpu.support)
|
||||
assertEquals("Supported", gpu.supportText)
|
||||
}
|
||||
val otherGpu = GpuInfo("Mali", 0, GpuInfo.Family.NOT_ADRENO, "", false,
|
||||
platformGpuModel = 850)
|
||||
assertEquals(GpuInfo.Support.UNSUPPORTED, otherGpu.support)
|
||||
}
|
||||
}
|
||||
@@ -21,4 +21,13 @@ class SocNamesTest {
|
||||
assertEquals("Snapdragon 8 Gen 3 family (SG8350P)", SocNames.label("SG8350P", "pineapple"))
|
||||
assertEquals("XYZ123", SocNames.label("XYZ123", ""))
|
||||
}
|
||||
@Test fun qtiPrefixIsNormalizedWithoutGuessingOtherModelVariants() {
|
||||
assertEquals("Snapdragon 8 Elite Extreme Gen 6", SocNames.name("SM8975", ""))
|
||||
assertEquals("Snapdragon 8 Elite Extreme Gen 6", SocNames.name("QTI SM8975", ""))
|
||||
assertEquals("Snapdragon 8 Elite Extreme Gen 6", SocNames.name(" qti sm8975 ", ""))
|
||||
assertEquals("Snapdragon 8 Elite Extreme Gen 6 (QTI SM8975)", SocNames.label("QTI SM8975", ""))
|
||||
assertNull(SocNames.name("SM89750", ""))
|
||||
assertNull(SocNames.name("SM8975-PRO", ""))
|
||||
assertNull(SocNames.name("Qualcomm SM8975", ""))
|
||||
}
|
||||
}
|
||||
@@ -30,4 +30,17 @@ class TurnipDriverAutoTest {
|
||||
@Test fun otherDevicesRetainTheGenericFallback() {
|
||||
assertEquals("turnip25.1.0", TurnipDriver(RuntimeEnvironment.getApplication()).autoId())
|
||||
}
|
||||
|
||||
@Test fun normalizedGpuModelsSelectExistingGenerationDrivers() {
|
||||
for (sdk in listOf(28, 36)) {
|
||||
assertEquals("turnip26.3.0-a6xx", TurnipDriver.chooseByModel(650, sdk))
|
||||
assertEquals("turnip25.1.0", TurnipDriver.chooseByModel(730, sdk))
|
||||
assertEquals("turnip-sdk36", TurnipDriver.chooseByModel(850, sdk))
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun unknownGpuModelsRetainTheSdkFallback() {
|
||||
assertEquals("turnip25.1.0", TurnipDriver.chooseByModel(0, 28))
|
||||
assertEquals("turnip-sdk36", TurnipDriver.chooseByModel(0, 36))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user