From 41615d2460b52e0b83fc051b8aad0af9f0fa672d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 30 Oct 2026 11:10:03 -0400 Subject: [PATCH] fix: Steam's UI runs at the panel's full refresh rate again (#1841) #1809 held Steam's own UI to an even share of the refresh near 60 fps whenever it had focus. On 120 Hz and faster screens Big Picture then felt locked at 60 while games ran at the full rate, and players reported it as a regression. The compositor now releases Steam UI buffers unpaced again, like a game's. The larger swapchain stays limited to games, so the client UI still uses gamescope's default image count. --- .../com/droiddeck/launcher/SessionActivity.kt | 25 ++----------------- .../launcher/session/SessionPrefs.kt | 9 ------- .../launcher/wayland/CompositorHost.kt | 11 ++++---- .../launcher/session/SteamUiPacingTest.kt | 22 ---------------- 4 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 523427d0d2..1ffc161b73 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -214,7 +214,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var touchscreenGestures: TouchscreenGestures private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null - private var steamUiFocused = false private var gestureSettingsOpen by mutableStateOf(false) private var steamImportAsk by mutableStateOf(null) private var steamImportAnswered: String? = null @@ -847,15 +846,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } - androidx.compose.runtime.LaunchedEffect(AgentGuest.focusRevision) { - val steamUi = SessionState.mode == SessionService.MODE_STEAM && kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { - AgentGuest.focus(this@SessionActivity)?.optLong("focusedApp")?.let { it <= 0 || it == 769L } ?: true - } - if (steamUi != steamUiFocused) { - steamUiFocused = steamUi - applySteamUiPacing() - } - } DroidDeckTheme { if (pipUi) { if (SessionState.suspended) androidx.compose.foundation.layout.Box( @@ -2094,7 +2084,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CompositorHost.startOrAttach( this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, - applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), steamUiLimit(refreshHz()), + applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), ) onOutputAttached(holder) if (SessionState.running && size != previous) { @@ -2234,23 +2224,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit(mirrorRefreshLimit(), if (noSteamSession()) SessionState.fpsLimit else 0) - private fun steamUiLimit(hz: Float): Int = - if (steamUiFocused && SessionPrefs.steamUiPacing(this)) SessionPrefs.steamUiFpsLimit(hz) else 0 - - private fun applySteamUiPacing() { - if (!CompositorHost.isStarted) return - val hz = refreshHz() - val limit = steamUiLimit(hz) - CompositorHost.updatePacing(hz, outputFpsLimit(), limit) - Log.i(TAG, "pacing: " + if (limit > 0) "Steam UI at $limit fps on a ${Math.round(hz)} Hz screen" else "uncapped") - } - private fun applyOutputPacing() { Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) if (CompositorHost.isStarted) { val hz = refreshHz() val changed = kotlin.math.abs(SessionState.refreshHz - hz) > 0.1f - CompositorHost.updatePacing(hz, outputFpsLimit(), steamUiLimit(hz)) + CompositorHost.updatePacing(hz, outputFpsLimit()) pushCardboard(activeCardboard) if (changed && ::surfaceView.isInitialized) applyFrameGen() } 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 05f81ce7eb..ec13849d93 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1103,15 +1103,6 @@ object SessionPrefs { else -> minOf(mirrorRefreshLimit, sessionLimit) } - private const val STEAM_UI_FPS = 60f - - fun steamUiPacing(context: Context): Boolean = prefs(context).getBoolean("steamUiPacing", true) - - fun steamUiFpsLimit(refreshHz: Float): Int { - val steps = ((refreshHz + 0.5f) / STEAM_UI_FPS).toInt() - return if (steps < 2) 0 else (refreshHz / steps + 0.01f).toInt() - } - val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 8 to "Snapdragon GSR (quality)", 7 to "NVIDIA NIS", 6 to "Sharpen only", diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index e1e54f7701..ea06879faf 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -51,11 +51,10 @@ object CompositorHost { outputHeight: Int, refreshHz: Float, fpsLimit: Int, - uiLimit: Int = 0, ): Boolean { ownVsyncThread = SessionPrefs.vsyncThread(context) WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) - pace(refreshHz, fpsLimit, uiLimit) + pace(refreshHz, fpsLimit) if (!SessionState.running) WaylandCompositor.nativeSetOutputSize(outputWidth, outputHeight) if (started) { attached = surface @@ -73,16 +72,16 @@ object CompositorHost { return true } - private fun pace(refreshHz: Float, fpsLimit: Int, uiLimit: Int = 0) { - WaylandCompositor.nativeSetFpsLimit(if (fpsLimit == SessionPrefs.FPS_UNPACED && uiLimit > 0) uiLimit else fpsLimit) + private fun pace(refreshHz: Float, fpsLimit: Int) { + WaylandCompositor.nativeSetFpsLimit(fpsLimit) WaylandCompositor.nativeSetLayerFrameRate(if (fpsLimit > 0) fpsLimit.toFloat() else refreshHz) WaylandCompositor.nativeSetOutputRefreshRate(refreshHz) SessionState.refreshHz = refreshHz } @Synchronized - fun updatePacing(refreshHz: Float, fpsLimit: Int, uiLimit: Int = 0) { - if (started) pace(refreshHz, fpsLimit, uiLimit) + fun updatePacing(refreshHz: Float, fpsLimit: Int) { + if (started) pace(refreshHz, fpsLimit) } @Synchronized diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt deleted file mode 100644 index 239d52e985..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.droiddeck.launcher.session - -import org.junit.Assert.assertEquals -import org.junit.Test - -class SteamUiPacingTest { - @Test fun aSixtyOrNinetyHertzScreenIsLeftUncapped() { - assertEquals(0, SessionPrefs.steamUiFpsLimit(60f)) - assertEquals(0, SessionPrefs.steamUiFpsLimit(59.94f)) - assertEquals(0, SessionPrefs.steamUiFpsLimit(90f)) - } - - @Test fun fasterScreensGetAnEvenDivisorOfTheirRefresh() { - assertEquals(60, SessionPrefs.steamUiFpsLimit(120f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(119.99f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(120.00001f)) - assertEquals(72, SessionPrefs.steamUiFpsLimit(144.00002f)) - assertEquals(82, SessionPrefs.steamUiFpsLimit(165f)) - assertEquals(61, SessionPrefs.steamUiFpsLimit(185.00002f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(240f)) - } -}