summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar t8952024-02-13 10:04:59 -0500
committerGravatar t8952024-02-13 10:04:59 -0500
commita0513bc45b08af67d9b5240daf937bd9a0f0ffe8 (patch)
tree00df30051e65a74924ef8d1883444a84099f0583 /src
parentMerge pull request #12974 from german77/ldn-interface (diff)
downloadyuzu-a0513bc45b08af67d9b5240daf937bd9a0f0ffe8.tar.gz
yuzu-a0513bc45b08af67d9b5240daf937bd9a0f0ffe8.tar.xz
yuzu-a0513bc45b08af67d9b5240daf937bd9a0f0ffe8.zip
android: Expose FSR sharpness slider
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt3
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt10
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt1
-rw-r--r--src/android/app/src/main/res/values/strings.xml2
4 files changed, 15 insertions, 1 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
index 71be2d0b2..0712f60f5 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
@@ -24,7 +24,8 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
24 THEME_MODE("theme_mode"), 24 THEME_MODE("theme_mode"),
25 OVERLAY_SCALE("control_scale"), 25 OVERLAY_SCALE("control_scale"),
26 OVERLAY_OPACITY("control_opacity"), 26 OVERLAY_OPACITY("control_opacity"),
27 LOCK_DRAWER("lock_drawer"); 27 LOCK_DRAWER("lock_drawer"),
28 FSR_SHARPENING_SLIDER("fsr_sharpening_slider");
28 29
29 override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal) 30 override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)
30 31
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index 12f7aa1ab..3f8194658 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -189,6 +189,16 @@ abstract class SettingsItem(
189 ) 189 )
190 ) 190 )
191 put( 191 put(
192 SliderSetting(
193 IntSetting.FSR_SHARPENING_SLIDER,
194 R.string.fsr_sharpness,
195 R.string.fsr_sharpness_description,
196 0,
197 100,
198 "%"
199 )
200 )
201 put(
192 SingleChoiceSetting( 202 SingleChoiceSetting(
193 IntSetting.RENDERER_ANTI_ALIASING, 203 IntSetting.RENDERER_ANTI_ALIASING,
194 R.string.renderer_anti_aliasing, 204 R.string.renderer_anti_aliasing,
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
index 2ad2f4966..19d3de6e2 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -143,6 +143,7 @@ class SettingsFragmentPresenter(
143 add(IntSetting.RENDERER_RESOLUTION.key) 143 add(IntSetting.RENDERER_RESOLUTION.key)
144 add(IntSetting.RENDERER_VSYNC.key) 144 add(IntSetting.RENDERER_VSYNC.key)
145 add(IntSetting.RENDERER_SCALING_FILTER.key) 145 add(IntSetting.RENDERER_SCALING_FILTER.key)
146 add(IntSetting.FSR_SHARPENING_SLIDER.key)
146 add(IntSetting.RENDERER_ANTI_ALIASING.key) 147 add(IntSetting.RENDERER_ANTI_ALIASING.key)
147 add(IntSetting.MAX_ANISOTROPY.key) 148 add(IntSetting.MAX_ANISOTROPY.key)
148 add(IntSetting.RENDERER_SCREEN_LAYOUT.key) 149 add(IntSetting.RENDERER_SCREEN_LAYOUT.key)
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 489e00107..ee89fe4ee 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -226,6 +226,8 @@
226 <string name="renderer_screen_layout">Orientation</string> 226 <string name="renderer_screen_layout">Orientation</string>
227 <string name="renderer_aspect_ratio">Aspect ratio</string> 227 <string name="renderer_aspect_ratio">Aspect ratio</string>
228 <string name="renderer_scaling_filter">Window adapting filter</string> 228 <string name="renderer_scaling_filter">Window adapting filter</string>
229 <string name="fsr_sharpness">FSR sharpness</string>
230 <string name="fsr_sharpness_description">Determines how sharpened the image will look while using FSR\'s dynamic contrast</string>
229 <string name="renderer_anti_aliasing">Anti-aliasing method</string> 231 <string name="renderer_anti_aliasing">Anti-aliasing method</string>
230 <string name="renderer_force_max_clock">Force maximum clocks (Adreno only)</string> 232 <string name="renderer_force_max_clock">Force maximum clocks (Adreno only)</string>
231 <string name="renderer_force_max_clock_description">Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).</string> 233 <string name="renderer_force_max_clock_description">Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).</string>