diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b271ad9c93..df6445bbb9 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1119,7 +1119,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde id to name } if (target.first != frameGenActiveGameId) { + val previousActiveGameId = frameGenActiveGameId frameGenActiveGameId = target.first + if (target.first != null || previousActiveGameId != null) { + val activeEffectsProfileId = target.first?.let { + SessionPrefs.screenEffectsProfileId( + SessionService.MODE_STEAM, it.toString(), null, + ) + } + SessionPrefs.setActiveScreenEffectsProfile( + this@SessionActivity, activeEffectsProfileId, + ) + observedScreenEffectsProfileId = activeEffectsProfileId + syncActiveScreenEffectsProfile() + } if (drawerGameProfileFollowState.followsSteam) { loadFrameGenFor(target.first) } @@ -2066,9 +2079,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { effects = activeEffects upscaler = activeUpscaler - WaylandCompositor.nativeSetUpscaler(activeUpscaler) - WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(activeEffects, activeUpscaler)?.name) } + WaylandCompositor.nativeSetUpscaler(activeUpscaler) activeEffects.push(activeUpscaler) } @@ -5241,14 +5253,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) readPrefs() observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) - val activeEffects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId) - val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, observedScreenEffectsProfileId) + val activeProfileId = SessionPrefs.activeScreenEffectsProfileId(this) + observedScreenEffectsProfileId = activeProfileId + val activeEffects = SessionPrefs.screenEffects(this, activeProfileId) + val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, activeProfileId) if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { effects = activeEffects + upscaler = activeUpscaler } else { effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget)) } - if (CompositorHost.isStarted) activeEffects.push(activeUpscaler) + if (CompositorHost.isStarted) { + WaylandCompositor.nativeSetUpscaler(activeUpscaler) + activeEffects.push(activeUpscaler) + } refreshInputProfile() refreshControls() if (::pip.isInitialized) pip.resumed() 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 99e4d06f48..d5deacd1b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1522,7 +1522,8 @@ class SessionService : Service() { SessionState.gameId = accepted val effectsProfileId = SessionPrefs.screenEffectsProfileId(MODE_STEAM, accepted, null) SessionPrefs.setActiveScreenEffectsProfile(this, effectsProfileId) - SessionPrefs.screenEffects(this, effectsProfileId).push(SessionPrefs.upscaler(this)) + SessionPrefs.screenEffects(this, effectsProfileId) + .push(SessionPrefs.screenEffectsUpscaler(this, effectsProfileId)) pendingSteamGameId = accepted pendingSteamGameGeneration = sessionGen if (SessionState.suspended) resumeSession() @@ -1554,7 +1555,7 @@ class SessionService : Service() { SessionPrefs.screenEffectsProfileId(MODE_STEAM, previousGameId, null) SessionPrefs.setActiveScreenEffectsProfile(this, previousProfileId) SessionPrefs.screenEffects(this, previousProfileId) - .push(SessionPrefs.upscaler(this)) + .push(SessionPrefs.screenEffectsUpscaler(this, previousProfileId)) } return } @@ -1628,7 +1629,7 @@ class SessionService : Service() { val gameProfileId = SessionPrefs.screenEffectsProfileId(MODE_STEAM, gameId, null) if (SessionPrefs.activeScreenEffectsProfileId(this) != gameProfileId) return SessionPrefs.setActiveScreenEffectsProfile(this, null) - SessionPrefs.screenEffects(this, null).push(SessionPrefs.upscaler(this)) + SessionPrefs.screenEffects(this, null).push(SessionPrefs.screenEffectsUpscaler(this, null)) } private fun returnAfterGame(gameId: String, gen: Int, token: Int) {