diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 5fa92865fb..35a043c1ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -340,6 +340,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl runCatching { com.droiddeck.launcher.gpu.VulkanInfo.query() } ui.post { releaseChecking = false + if (gpu.family == GpuInfo.Family.POWERVR) gpu = GpuInfo.detect() refreshReleaseRows() refreshPairs() val pairs = DriverPairs.from(TurnipReleases.cached(activity)) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt index 367a747b3c..ce7572bba4 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt @@ -17,6 +17,7 @@ object DriverPairs { const val NAD_RADV_XCLIPSE = "nad:radv-xclipse" /** RADV-Xclipse rebased on JimVulkan's upstream: a manual choice, never Auto. */ const val NAD_RADV_XCLIPSE_UPSTREAM = "nad:radv-xclipse-upstream" + private val XCLIPSE_MODEL = Regex("""(?i)xclipse\s*(\d{3})\b""") const val NAD_MALI_JM = "nad:panvk-mali-jm" const val NAD_MALI_G710 = "nad:panvk-mali-g710" const val NAD_MALI_G615 = "nad:panvk-mali-g615" @@ -111,13 +112,21 @@ object DriverPairs { } } + /** 950 and 960 panic on the older build; a name without a model number is treated the same way. */ + private fun xclipseNeedsUpstream(name: String): Boolean = + XCLIPSE_MODEL.find(name)?.groupValues?.get(1).let { it == null || it == "950" || it == "960" } + fun recommendedKey( gpu: GpuInfo, pairs: List, rules: List = AutoPicks.BUILT_IN, bad: Set = emptySet(), sdk: Int = android.os.Build.VERSION.SDK_INT, blob: Int? = null, ): String? { when (gpu.family) { - Family.POWERVR -> return NAD_RADV_XCLIPSE.takeIf { gpu.name.contains("Xclipse", ignoreCase = true) } + Family.POWERVR -> return when { + !gpu.name.contains("Xclipse", ignoreCase = true) -> null + xclipseNeedsUpstream(gpu.name) && pairs.any { it.key == NAD_RADV_XCLIPSE_UPSTREAM } -> NAD_RADV_XCLIPSE_UPSTREAM + else -> NAD_RADV_XCLIPSE + } Family.MALI_OTHER, Family.NOT_ADRENO -> return null Family.MALI_JM, Family.MALI_G610_G710, Family.MALI_G615, Family.MALI_G720, Family.MALI_LATEST -> return maliKey(gpu, pairs, sdk) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt index 514afac36d..d1c048b61b 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt @@ -217,7 +217,14 @@ class DriverPairsTest { assertFalse(upstream.suits(GpuInfo("PowerVR", 0, Family.POWERVR, "", false))) assertEquals("RADV upstream ยท Samsung Xclipse", upstream.name) assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(xclipse, pairs)) + for (name in listOf("Samsung Xclipse 530", "Samsung Xclipse 540", "Samsung Xclipse 920")) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(GpuInfo(name, 0, Family.POWERVR, "", false), pairs)) assertTrue(DriverPairs.isNonAdreno("RADV-Xclipse-upstream")) + for (name in listOf("Samsung Xclipse 950", "Samsung Xclipse 960", "Xclipse")) { + val newer = GpuInfo(name, 0, Family.POWERVR, "", false) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM, DriverPairs.recommendedKey(newer, pairs)) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(newer, pairs.filter { it.key != DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM })) + } } @Test