Revert "A quick experiment on frame rate target"

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt

@@ -21,7 +21,6 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     RENDERER_RESOLUTION("resolution_setup"),
     RENDERER_FRAME_GEN_MULTIPLIER("frame_gen_multiplier"),
     RENDERER_FRAME_GEN_QUEUE_TARGET("frame_gen_queue_target"),
-    RENDERER_FRAME_GEN_TARGET_RATE("frame_gen_target_rate"),
     RENDERER_FRAME_GEN_FLOW_SCALE("frame_gen_flow_scale"),
     RENDERER_VSYNC("use_vsync"),
     RENDERER_SCALING_FILTER("scaling_filter"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -100,7 +100,6 @@ abstract class SettingsItem(
             BooleanSetting.RENDERER_FRAME_GEN.key,
             IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key,
             IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET.key,
-            IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key,
             BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.key,
             IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE.key,
             BooleanSetting.RENDERER_FRAME_GEN_FP16.key,
@@ -641,15 +640,6 @@ abstract class SettingsItem(
                     valuesId = R.array.frameGenMultiplierValues
                 )
             )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_TARGET_RATE,
-                    titleId = R.string.frame_gen_target_rate,
-                    descriptionId = R.string.frame_gen_target_rate_description,
-                    choicesId = R.array.frameGenTargetRateNames,
-                    valuesId = R.array.frameGenTargetRateValues
-                )
-            )
             put(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -125,13 +125,7 @@ class SettingsFragmentPresenter(
             add(HeaderSetting(R.string.frame_gen))
 
             add(BooleanSetting.RENDERER_FRAME_GEN.key)
-            add(IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key)
-            if (IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.getInt(
-                    getNeedsGlobalForKey(IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key)
-                ) == 0
-            ) {
-                add(IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key)
-            }
+            add(IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key)
             add(IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET.key)
             add(BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.key)
             if (!BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.getBoolean(

src/android/app/src/main/res/values/arrays.xml

@@ -174,24 +174,6 @@
         <item>4</item>
     </integer-array>
 
-    <string-array name="frameGenTargetRateNames">
-        <item>@string/frame_gen_target_rate_off</item>
-        <item>@string/frame_gen_target_rate_60</item>
-        <item>@string/frame_gen_target_rate_90</item>
-        <item>@string/frame_gen_target_rate_120</item>
-        <item>@string/frame_gen_target_rate_144</item>
-        <item>@string/frame_gen_target_rate_165</item>
-    </string-array>
-
-    <integer-array name="frameGenTargetRateValues">
-        <item>0</item>
-        <item>60</item>
-        <item>90</item>
-        <item>120</item>
-        <item>144</item>
-        <item>165</item>
-    </integer-array>
-
     <string-array name="frameGenQueueTargetNames">
         <item>@string/frame_gen_queue_target_0</item>
         <item>@string/frame_gen_queue_target_1</item>

src/android/app/src/main/res/values/strings.xml

@@ -301,14 +301,6 @@
     <string name="frame_gen">Frame generation</string>
     <string name="frame_gen_submenu_description">Manage and configure frame generation</string>
     <string name="frame_gen_description">Insert interpolated frames between rendered ones using Lossless Scaling. Forces FIFO presentation while enabled.</string>
-    <string name="frame_gen_target_rate">Target frame rate</string>
-    <string name="frame_gen_target_rate_description">Aim for a fixed output rate by adjusting the multiplier as the game\'s own frame rate moves. Pick a rate your display can actually present.</string>
-    <string name="frame_gen_target_rate_off">Off (use fixed multiplier)</string>
-    <string name="frame_gen_target_rate_60">60 fps</string>
-    <string name="frame_gen_target_rate_90">90 fps</string>
-    <string name="frame_gen_target_rate_120">120 fps</string>
-    <string name="frame_gen_target_rate_144">144 fps</string>
-    <string name="frame_gen_target_rate_165">165 fps</string>
     <string name="frame_gen_multiplier">Frame multiplier</string>
     <string name="frame_gen_multiplier_description">How many frames to display for each rendered frame. Higher values cost proportionally more GPU time. Asking for more than your display can present will slow emulation down.</string>
     <string name="frame_gen_multiplier_2x">2x</string>