diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6d82526e79..a1f0618410 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1372,6 +1372,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde WaylandCompositor.nativeSetUpscaler(m) WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name) }, + onPresetUpscaler = { m -> + val target = effectsEditorTarget ?: screenEffectsTarget + val profileId = screenEffectsProfileIdForTarget(target) + SessionPrefs.setScreenEffectsUpscaler(this@SessionActivity, profileId, m) + if (target == screenEffectsTarget && screenEffectsTargetAppliesToLiveOutput(target)) { + upscaler = m + WaylandCompositor.nativeSetUpscaler(m) + WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name) + } + }, onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct WaylandCompositor.nativeSetUpscaleSharpness(pct) @@ -1407,11 +1417,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onScreenEffectsTarget = ::selectScreenEffectsTarget, onScreenEffectsReset = { val target = effectsEditorTarget ?: screenEffectsTarget - if (target == screenEffectsTarget) resetScreenEffectsTarget(target) + val profileStillMatches = target != SCREEN_EFFECTS_TARGET_AUTO || + SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) == effectsEditorProfileId + if (target == screenEffectsTarget && profileStillMatches) { + resetScreenEffectsTarget(target) + } }, onScreenEffectsDelete = { val target = effectsEditorTarget ?: screenEffectsTarget - if (target == screenEffectsTarget) deleteScreenEffectsTarget(target) + val profileStillMatches = target != SCREEN_EFFECTS_TARGET_AUTO || + SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) == effectsEditorProfileId + if (target == screenEffectsTarget && profileStillMatches) { + deleteScreenEffectsTarget(target) + } }, onScreenEffectsProfilesRefresh = { drawerGameInventoryRevision++ @@ -2042,8 +2060,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val profileId = SessionPrefs.activeScreenEffectsProfileId(this) observedScreenEffectsProfileId = profileId val activeEffects = SessionPrefs.screenEffects(this, profileId) - if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) effects = activeEffects - activeEffects.push(upscaler) + val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, profileId) + if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { + effects = activeEffects + upscaler = activeUpscaler + WaylandCompositor.nativeSetUpscaler(activeUpscaler) + WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(activeEffects, activeUpscaler)?.name) + } + activeEffects.push(activeUpscaler) } private fun screenEffectsProfileIdForTarget(target: String): String? = when (target) { @@ -2053,16 +2077,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun screenEffectsTargetOptions(): List> { - val installed = drawerGameProfileRefresh.data?.profiles.orEmpty().associate { it.first.toString() to it.second } + val installed = drawerGameProfileRefresh.data?.profiles.orEmpty() + .associate { it.first.toULong().toString() to it.second } val ids = linkedSetOf() ids.addAll(installed.keys) SessionPrefs.screenEffectsProfileIds(this).forEach { saved -> if (saved.startsWith("game:")) { - saved.removePrefix("game:").toLongOrNull()?.let { ids.add(it.toString()) } + saved.removePrefix("game:").toULongOrNull()?.let { ids.add(it.toString()) } } } currentScreenEffectsProfileId()?.takeIf { it.startsWith("game:") } - ?.removePrefix("game:")?.toLongOrNull()?.let { ids.add(it.toString()) } + ?.removePrefix("game:")?.toULongOrNull()?.let { ids.add(it.toString()) } return buildList { add(SCREEN_EFFECTS_TARGET_AUTO to getString(R.string.screen_effects_target_auto)) @@ -2087,8 +2112,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde syncActiveScreenEffectsProfile() return } - effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(target)) - if (screenEffectsTargetAppliesToLiveOutput(target)) effects.push(upscaler) + val profileId = screenEffectsProfileIdForTarget(target) + val targetEffects = SessionPrefs.screenEffects(this, profileId) + val targetUpscaler = SessionPrefs.screenEffectsUpscaler(this, profileId) + effects = targetEffects + upscaler = targetUpscaler + if (screenEffectsTargetAppliesToLiveOutput(target)) { + WaylandCompositor.nativeSetUpscaler(targetUpscaler) + WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(targetEffects, targetUpscaler)?.name) + targetEffects.push(targetUpscaler) + } } private fun selectScreenEffectsTarget(target: String) { @@ -2226,7 +2259,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) hudOpacity = SessionPrefs.hudOpacity(this) - upscaler = SessionPrefs.upscaler(this) + upscaler = SessionPrefs.screenEffectsUpscaler(this, screenEffectsProfileIdForTarget(screenEffectsTarget)) upscaleSharpness = SessionPrefs.upscaleSharpness(this) effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget)) applyCardboard(SessionPrefs.cardboard(this)) @@ -5203,8 +5236,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) readPrefs() observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) - effects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId) - if (CompositorHost.isStarted) effects.push(upscaler) + val activeEffects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId) + if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { + effects = activeEffects + } else { + effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget)) + } + if (CompositorHost.isStarted) activeEffects.push(upscaler) refreshInputProfile() refreshControls() if (::pip.isInitialized) pip.resumed() 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 233b0c49af..8366c6cfce 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -13,6 +13,8 @@ import com.droiddeck.launcher.gpu.TurnipDriver import org.json.JSONObject import java.io.File +private const val SCREEN_EFFECTS_PROFILE_UPSCALER_KEY = "upscaler" + object SessionPrefs { data class GameTextureFiltering(val anisotropy: Int? = null, val lodBias: String? = null) @@ -1485,7 +1487,44 @@ object SessionPrefs { val profiles = runCatching { JSONObject(sessionPrefs.getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}") }.getOrDefault(JSONObject()) - profiles.put(profileId, effects.encode()) + val encoded = effects.encode() + profiles.optJSONObject(profileId)?.let { savedProfile -> + if (savedProfile.has(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY)) { + encoded.put( + SCREEN_EFFECTS_PROFILE_UPSCALER_KEY, + savedProfile.optInt(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY), + ) + } + } + profiles.put(profileId, encoded) + sessionPrefs.edit().putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString()).apply() + } + + fun screenEffectsUpscaler(context: Context, profileId: String?): Int { + if (profileId.isNullOrBlank()) return upscaler(context) + val stored = runCatching { + val profiles = JSONObject(prefs(context).getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}") + val profile = profiles.optJSONObject(profileId) + if (profile?.has(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY) == true) { + profile.optInt(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY, -1) + } else -1 + }.getOrDefault(-1) + return if (stored >= 0) canonicalUpscaler(stored) else upscaler(context) + } + + fun setScreenEffectsUpscaler(context: Context, profileId: String?, mode: Int) { + if (profileId.isNullOrBlank()) { + setUpscaler(context, mode) + return + } + val sessionPrefs = prefs(context) + val profiles = runCatching { + JSONObject(sessionPrefs.getString(SCREEN_EFFECTS_PROFILES_KEY, null) ?: "{}") + }.getOrDefault(JSONObject()) + val profile = profiles.optJSONObject(profileId) + ?: screenEffects(context, profileId).encode() + profile.put(SCREEN_EFFECTS_PROFILE_UPSCALER_KEY, canonicalUpscaler(mode)) + profiles.put(profileId, profile) sessionPrefs.edit().putString(SCREEN_EFFECTS_PROFILES_KEY, profiles.toString()).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 135275ab26..5708b1cdf5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -305,6 +305,7 @@ class DrawerActions( val onDirectHoldBehavior: (String) -> Unit = {}, val onFexPreset: (String) -> Unit, val onUpscaler: (Int) -> Unit = {}, + val onPresetUpscaler: (Int) -> Unit = onUpscaler, val onUpscaleSharpness: (Int) -> Unit = {}, val onEffects: (ScreenEffects) -> Unit = {}, val onScreenEffectsTarget: (String) -> Unit = {}, @@ -1097,7 +1098,7 @@ private fun ScreenEffectsGroup( if (preset == null) listOf(LOOK_CUSTOM to stringResource(R.string.drawer_look_custom)) + presets else presets, preset?.name ?: LOOK_CUSTOM, chipModifier = track("look")) { name -> ScreenEffectLooks.LOOKS.firstOrNull { it.name == name }?.let { picked -> - picked.scalingMode?.let(a.onUpscaler) + picked.scalingMode?.let(a.onPresetUpscaler) a.onEffects(picked.effects) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a3d238250..ae79132e56 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -767,7 +767,7 @@ Scaling sharpness Edit profile Choose which profile to change screen effects for. - Current game (automatic) + Current session (automatic) Reset effects Restore the default-off effect values for this profile. Delete saved override