From b76f13f7acc0af0cc00369dde61fb88e40529e6d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 11:33:43 -0400 Subject: [PATCH] fix: keep the shader pre-caching choice until a session confirms it, and read it from its own VDF section --- .../droiddeck/launcher/FrontEndActivity.kt | 7 ++++- .../launcher/session/SessionPrefs.kt | 26 +++++++++++++------ .../launcher/session/SessionService.kt | 2 +- .../launcher/storage/SteamStorage.kt | 25 ++++++++++++++++-- .../launcher/storage/SteamStorageTest.kt | 8 ++++++ .../overlay/usr/local/bin/droiddeck-session | 3 ++- 6 files changed, 58 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 8ff9a1a487..0180539df3 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1722,7 +1722,12 @@ class FrontEndActivity : ComponentActivity() { syncFallback = SessionPrefs.syncFallback(this) }, onSteamRepair = { steamRepairQueued = SteamRepair.queue(this) }, - onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id; refresh() }, + onSteamClientArch = { id -> + SessionPrefs.setSteamClientArch(this, id) + steamClientArch = id + shaderPrecache = SessionPrefs.shaderPrecache(this) + refresh() + }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 057f870708..0b8ef2824e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -304,19 +304,29 @@ object SessionPrefs { prefs(context).edit().putBoolean("returnAfterGame", on).apply() } + private fun shaderPrecacheApplied(context: Context) = + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.bl-shader-precache-applied") + /** - * Shader pre-caching as the launcher last set it, until the next session writes it into the + * Shader pre-caching as the launcher last set it, until a session reports it written into the * client's config.vdf; after that the client's own toggle is the user's again. */ - fun pendingShaderPrecache(context: Context): Boolean? = - prefs(context).takeIf { it.contains("shaderPrecache") }?.getBoolean("shaderPrecache", true) - - fun setShaderPrecache(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("shaderPrecache", on).apply() + fun pendingShaderPrecache(context: Context): Boolean? { + val prefs = prefs(context) + if (!prefs.contains("shaderPrecache")) return null + val on = prefs.getBoolean("shaderPrecache", true) + val applied = shaderPrecacheApplied(context) + val written = runCatching { applied.readText().trim() }.getOrNull() ?: return on + applied.delete() + if (written != if (on) "1" else "0") return on + prefs.edit().remove("shaderPrecache").apply() + return null } - fun takeShaderPrecache(context: Context): Boolean? = - pendingShaderPrecache(context)?.also { prefs(context).edit().remove("shaderPrecache").apply() } + fun setShaderPrecache(context: Context, on: Boolean) { + shaderPrecacheApplied(context).delete() + prefs(context).edit().putBoolean("shaderPrecache", on).apply() + } fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context) ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache( diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 253b0fa301..f014207e9b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -673,7 +673,7 @@ class SessionService : Service() { com.droiddeck.launcher.core.AppLanguage.system(this).country, )) guest.add("TZ=" + java.util.TimeZone.getDefault().id) - if (SessionState.mode == MODE_STEAM) SessionPrefs.takeShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } + if (SessionState.mode == MODE_STEAM) SessionPrefs.pendingShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR) guest.add("XDG_SESSION_TYPE=wayland") guest.add("WAYLAND_DISPLAY=wayland-0") diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index 7fecd5aba1..9697addd64 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -28,7 +28,8 @@ object SteamStorage { private val LAST_PLAYED = Regex("^\\s*\"LastPlayed\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) private val MAPPING = Regex("\"(\\d+)\"\\s*\\{\\s*\"name\"\\s*\"([^\"]*)\"") private val COMPAT_NAME = Regex("\"compat_tools\"\\s*\\{\\s*\"([^\"]+)\"") - private val SHADER_CACHE_OFF = Regex("\"DisableShaderCache\"\\s*\"1\"", RegexOption.IGNORE_CASE) + private val VDF_TOKEN = Regex("\"((?:\\\\.|[^\"\\\\])*)\"|[{}]|//[^\n]*") + private val SHADER_CACHE_OFF = listOf("InstallConfigStore", "Software", "Valve", "Steam", "ShaderCacheManager", "DisableShaderCache") data class Manifest( val file: File, val appId: Int, val name: String, val installDir: String?, @@ -119,7 +120,27 @@ object SteamStorage { return MAPPING.findAll(configVdf.substring(open, end)).associate { it.groupValues[1] to it.groupValues[2] } } - fun shaderPrecache(configVdf: String): Boolean = !SHADER_CACHE_OFF.containsMatchIn(configVdf) + fun shaderPrecache(configVdf: String): Boolean = vdfValue(configVdf, SHADER_CACHE_OFF) != "1" + + private fun vdfValue(text: String, path: List): String? { + val blocks = ArrayList() + var key: String? = null + for (token in VDF_TOKEN.findAll(text)) { + val name = key + when { + token.value.startsWith("//") -> {} + token.value == "{" -> { blocks.add(name.orEmpty()); key = null } + token.value == "}" -> { blocks.removeLastOrNull(); key = null } + name == null -> key = token.groupValues[1] + else -> { + val at = blocks + name + if (at.size == path.size && at.zip(path).all { (a, b) -> a.equals(b, ignoreCase = true) }) return token.groupValues[1] + key = null + } + } + } + return null + } fun compatToolName(compatibilityToolVdf: String): String? = COMPAT_NAME.find(compatibilityToolVdf)?.groupValues?.get(1) diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 6041c7591f..0cfbf2e054 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -106,6 +106,14 @@ class SteamStorageTest { assertEquals(false, SteamStorage.shaderPrecache(vdf)) assertEquals(true, SteamStorage.shaderPrecache(vdf.replace("\"DisableShaderCache\"\t\t\"1\"", "\"DisableShaderCache\"\t\t\"0\""))) assertEquals(true, SteamStorage.shaderPrecache("\"InstallConfigStore\" {}")) + assertEquals(true, SteamStorage.shaderPrecache(""" + "InstallConfigStore" + { + // "DisableShaderCache" "1" + "Other" { "DisableShaderCache" "1" } + "Software" { "Valve" { "Steam" { "ShaderCacheManager" { "DisableShaderCache" "0" } } } } + } + """.trimIndent())) } @Test fun readsCustomToolName() { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 809b5d4da2..3badd65ec9 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -533,7 +533,8 @@ case $mode in fi if [ -n "${BL_SHADER_PRECACHE:-}" ]; then droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ - "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" || true + "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" && + echo "$BL_SHADER_PRECACHE" > "$HOME/.bl-shader-precache-applied" || true fi if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton"