mirror of
https://github.com/ARMSX2/ARMSX2.git
synced 2026-08-24 16:50:16 -07:00
SGSR: name the sharpness slider after the upscaler it is driving
The slider is shared, and that is deliberate -- the two upscalers want the same thing from the user and a second control would only let them disagree. But the NUMBER means different things to each: RCAS stops for FSR1, a 0..2 edge-sharpness factor for SGSR. Labelling it "FSR Sharpness" while SGSR is selected says the setting belongs to something that is not running. It now names whichever is selected, in both pickers.
This commit is contained in:
@@ -1269,6 +1269,11 @@ private val BASE_EN: Map<String, String> = mapOf(
|
||||
"renderer.fsr1.description" to "AMD FidelityFX Super Resolution 1 — upscales the frame to the screen with edge-adaptive sharpening instead of a plain stretch. Replaces CAS.",
|
||||
"renderer.fsr1.label" to "FSR 1 Upscaling",
|
||||
"renderer.fsr1.sharpness.label" to "FSR Sharpness",
|
||||
// The slider is shared between the upscalers, but the number means a different thing to
|
||||
// each -- RCAS stops for FSR1, a 0..2 edge-sharpness factor for SGSR -- so it says which one
|
||||
// it is currently driving rather than naming whichever came first.
|
||||
"renderer.sgsr.sharpness.label" to "SGSR Sharpness",
|
||||
"renderer.sgsr.description" to "Qualcomm Snapdragon Game Super Resolution 1 — a single-pass edge-directed upscale built for mobile GPUs. Cheaper than FSR 1. Replaces CAS.",
|
||||
"renderer.fxaa.description" to "Fast post-process anti-aliasing — smooths jagged edges with a light blur.",
|
||||
"renderer.fxaa.label" to "FXAA",
|
||||
"renderer.deinterlacing.description" to "Changes how interlaced video is displayed. Auto is safest.",
|
||||
|
||||
@@ -878,7 +878,11 @@ private fun GraphicsPane(state: EmulationMenuUiState, viewModel: EmulationMenuVi
|
||||
)
|
||||
if (fsr1On) {
|
||||
com.armsx2.ui.settings.IntSliderRow(
|
||||
label = str("renderer.fsr1.sharpness.label"),
|
||||
label = str(
|
||||
if (settings.upscaler == com.armsx2.config.Settings.UPSCALER_SGSR)
|
||||
"renderer.sgsr.sharpness.label"
|
||||
else "renderer.fsr1.sharpness.label",
|
||||
),
|
||||
value = settings.fsrSharpness.coerceIn(0, 100),
|
||||
min = 0,
|
||||
max = 100,
|
||||
|
||||
@@ -417,7 +417,10 @@ fun RendererTab(state: MutableState<Settings>) {
|
||||
// sharpness, so the number means different things, but it is the same intent and
|
||||
// a second slider would only invite disagreement between them.
|
||||
IntSliderRow(
|
||||
label = str("renderer.fsr1.sharpness.label"),
|
||||
label = str(
|
||||
if (s.upscaler == Settings.UPSCALER_SGSR) "renderer.sgsr.sharpness.label"
|
||||
else "renderer.fsr1.sharpness.label",
|
||||
),
|
||||
value = s.fsrSharpness.coerceIn(0, 100),
|
||||
min = 0,
|
||||
max = 100,
|
||||
|
||||
Reference in New Issue
Block a user