Merge branch 'stuffmadeforfun' of https://git.eden-emu.dev/eden-emu/eden into stuffmadeforfun

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

@@ -30,6 +30,8 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     BUFFER_REORDER_DISABLE("disable_buffer_reorder"),
     RENDERER_DEBUG("debug"),
     RENDERER_VERTEX_INPUT_DYNAMIC_STATE("vertex_input_dynamic_state"),
+    FORCE_IDENTITY_SWIZZLE("force_identity_swizzle"),
+    FORCE_LDR_TO_SRGB("force_ldr_to_srgb"),
     RENDERER_PROVOKING_VERTEX("provoking_vertex"),
     RENDERER_DESCRIPTOR_INDEXING("descriptor_indexing"),
     RENDERER_SAMPLE_SHADING("sample_shading"),

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

@@ -153,6 +153,20 @@ abstract class SettingsItem(
                     descriptionId = R.string.vertex_input_dynamic_state_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.FORCE_IDENTITY_SWIZZLE,
+                    titleId = R.string.force_identity_swizzle,
+                    descriptionId = R.string.force_identity_swizzle_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.FORCE_LDR_TO_SRGB,
+                    titleId = R.string.force_ldr_to_srgb,
+                    descriptionId = R.string.force_ldr_to_srgb_description
+                )
+            )
             put(
                 SwitchSetting(
                     BooleanSetting.RENDERER_DESCRIPTOR_INDEXING,

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

@@ -471,6 +471,8 @@ class SettingsFragmentPresenter(
             add(IntSetting.RENDERER_ASTC_RECOMPRESSION.key)
             add(IntSetting.RENDERER_FORMAT_REINTERPRETATION.key)
             add(BooleanSetting.RENDERER_VERTEX_INPUT_DYNAMIC_STATE.key)
+            add(BooleanSetting.FORCE_IDENTITY_SWIZZLE.key)
+            add(BooleanSetting.FORCE_LDR_TO_SRGB.key)
             add(IntSetting.RENDERER_VRAM_USAGE_MODE.key)
             add(IntSetting.RENDERER_OPTIMIZE_SPIRV_OUTPUT.key)