[android] fix discrepancy of MAXTEXTURE v. TEXTURE in setting string set (#3360)

Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3360
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: DraVee <dravee@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -46,9 +46,9 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     FAST_CPU_TIME("fast_cpu_time"),
     CPU_TICKS("cpu_ticks"),
     FAST_GPU_TIME("fast_gpu_time"),
-    GPU_UNZWIZZLE_MAXTEXTURE_SIZE("gpu_unzwizzle_maxtexture_size"),
-    GPU_UNZWIZZLE_STREAM_SIZE("gpu_unzwizzle_stream_size"),
-    GPU_UNZWIZZLE_CHUNK_SIZE("gpu_unzwizzle_chunk_size"),
+    GPU_UNSWIZZLE_TEXTURE_SIZE("gpu_unswizzle_texture_size"),
+    GPU_UNSWIZZLE_STREAM_SIZE("gpu_unswizzle_stream_size"),
+    GPU_UNSWIZZLE_CHUNK_SIZE("gpu_unswizzle_chunk_size"),
     BAT_TEMPERATURE_UNIT("bat_temperature_unit"),
     CABINET_APPLET("cabinet_applet_mode"),
     CONTROLLER_APPLET("controller_applet_mode"),

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -648,27 +648,27 @@ abstract class SettingsItem(
             )
             put(
                 SingleChoiceSetting(
-                    IntSetting.GPU_UNZWIZZLE_MAXTEXTURE_SIZE,
-                    titleId = R.string.gpu_unzwizzle_maxtexture_size,
-                    descriptionId = R.string.gpu_unzwizzle_maxtexture_size_description,
+                    IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE,
+                    titleId = R.string.gpu_unswizzle_texture_size,
+                    descriptionId = R.string.gpu_unswizzle_texture_size_description,
                     choicesId = R.array.gpuTextureSizeSwizzleEntries,
                     valuesId = R.array.gpuTextureSizeSwizzleValues
                 )
             )
             put(
                 SingleChoiceSetting(
-                    IntSetting.GPU_UNZWIZZLE_STREAM_SIZE,
-                    titleId = R.string.gpu_unzwizzle_stream_size,
-                    descriptionId = R.string.gpu_unzwizzle_stream_size_description,
+                    IntSetting.GPU_UNSWIZZLE_STREAM_SIZE,
+                    titleId = R.string.gpu_unswizzle_stream_size,
+                    descriptionId = R.string.gpu_unswizzle_stream_size_description,
                     choicesId = R.array.gpuSwizzleEntries,
                     valuesId = R.array.gpuSwizzleValues
                 )
             )
             put(
                 SingleChoiceSetting(
-                    IntSetting.GPU_UNZWIZZLE_CHUNK_SIZE,
-                    titleId = R.string.gpu_unzwizzle_chunk_size,
-                    descriptionId = R.string.gpu_unzwizzle_chunk_size_description,
+                    IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE,
+                    titleId = R.string.gpu_unswizzle_chunk_size,
+                    descriptionId = R.string.gpu_unswizzle_chunk_size_description,
                     choicesId = R.array.gpuSwizzleChunkEntries,
                     valuesId = R.array.gpuSwizzleChunkValues
                 )

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.features.settings.ui
@@ -279,9 +279,9 @@ class SettingsFragmentPresenter(
             add(IntSetting.FAST_GPU_TIME.key)
             add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
-            add(IntSetting.GPU_UNZWIZZLE_MAXTEXTURE_SIZE.key)
-            add(IntSetting.GPU_UNZWIZZLE_STREAM_SIZE.key)
-            add(IntSetting.GPU_UNZWIZZLE_CHUNK_SIZE.key)
+            add(IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.key)
+            add(IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.key)
+            add(IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.key)
 
             add(HeaderSetting(R.string.extensions))
 

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

@@ -497,12 +497,12 @@
     <string name="skip_cpu_inner_invalidation_description">Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it\'s performance. This may cause glitches or crashes on some games.</string>
     <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string>
     <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously. This may reduce stutters but may also introduce glitches.</string>
-    <string name="gpu_unzwizzle_maxtexture_size">GPU Unswizzle Max Texture Size</string>
-    <string name="gpu_unzwizzle_maxtexture_size_description">Sets the maximum size (MB) for GPU-based texture unswizzling. While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones. Adjust this to find the balance between GPU acceleration and CPU overhead.</string>
-    <string name="gpu_unzwizzle_stream_size">GPU Unswizzle Stream Size</string>
-    <string name="gpu_unzwizzle_stream_size_description">Sets the data limit per frame for unswizzling large textures. Higher values speed up texture loading at the cost of higher frame latency; lower values reduce GPU overhead but may cause visible texture pop-in.</string>
-    <string name="gpu_unzwizzle_chunk_size">GPU Unswizzle Chunk Size</string>
-    <string name="gpu_unzwizzle_chunk_size_description">Defines the number of depth slices processed per batch for 3D textures. Increasing this improves throughput efficiency on powerful GPUs but may cause stuttering or driver timeouts on weaker hardware.</string>
+    <string name="gpu_unswizzle_texture_size">GPU Unswizzle Max Texture Size</string>
+    <string name="gpu_unswizzle_texture_size_description">Sets the maximum size (MB) for GPU-based texture unswizzling. While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones. Adjust this to find the balance between GPU acceleration and CPU overhead.</string>
+    <string name="gpu_unswizzle_stream_size">GPU Unswizzle Stream Size</string>
+    <string name="gpu_unswizzle_stream_size_description">Sets the data limit per frame for unswizzling large textures. Higher values speed up texture loading at the cost of higher frame latency; lower values reduce GPU overhead but may cause visible texture pop-in.</string>
+    <string name="gpu_unswizzle_chunk_size">GPU Unswizzle Chunk Size</string>
+    <string name="gpu_unswizzle_chunk_size_description">Defines the number of depth slices processed per batch for 3D textures. Increasing this improves throughput efficiency on powerful GPUs but may cause stuttering or driver timeouts on weaker hardware.</string>
 
 
     <string name="extensions">Extensions</string>

src/common/settings.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -506,21 +506,21 @@ struct Values {
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererHacks};
 
-    SwitchableSetting<GpuUnswizzleSize> gpu_unzwizzle_texture_size{linkage,
+    SwitchableSetting<GpuUnswizzleSize> gpu_unswizzle_texture_size{linkage,
                                                   GpuUnswizzleSize::Large,
-                                                  "gpu_unzwizzle_texture_size",
+                                                  "gpu_unswizzle_texture_size",
                                                   Category::RendererHacks,
                                                   Specialization::Default};
 
-    SwitchableSetting<GpuUnswizzle> gpu_unzwizzle_stream_size{linkage,
+    SwitchableSetting<GpuUnswizzle> gpu_unswizzle_stream_size{linkage,
                                                   GpuUnswizzle::Medium,
-                                                  "gpu_unzwizzle_stream_size",
+                                                  "gpu_unswizzle_stream_size",
                                                   Category::RendererHacks,
                                                   Specialization::Default};
 
-    SwitchableSetting<GpuUnswizzleChunk> gpu_unzwizzle_chunk_size{linkage,
+    SwitchableSetting<GpuUnswizzleChunk> gpu_unswizzle_chunk_size{linkage,
                                                   GpuUnswizzleChunk::Medium,
-                                                  "gpu_unzwizzle_chunk_size",
+                                                  "gpu_unswizzle_chunk_size",
                                                   Category::RendererHacks,
                                                   Specialization::Default};
 

src/qt_common/config/shared_translation.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 Torzu Emulator Project
@@ -285,18 +285,18 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
            tr("Overclocks the emulated GPU to increase dynamic resolution and render "
               "distance.\nUse 256 for maximal performance and 512 for maximal graphics fidelity."));
     INSERT(Settings,
-           gpu_unzwizzle_texture_size,
+           gpu_unswizzle_texture_size,
            tr("GPU Unswizzle Max Texture Size"),
            tr("Sets the maximum size (MiB) for GPU-based texture unswizzling.\n"
               "While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones.\n"
               "Adjust this to find the balance between GPU acceleration and CPU overhead."));
     INSERT(Settings,
-           gpu_unzwizzle_stream_size,
+           gpu_unswizzle_stream_size,
            tr("GPU Unswizzle Stream Size"),
            tr("Sets the maximum amount of texture data (in MiB) processed per frame.\n"
               "Higher values can reduce stutter during texture loading but may impact frame consistency."));
     INSERT(Settings,
-           gpu_unzwizzle_chunk_size,
+           gpu_unswizzle_chunk_size,
            tr("GPU Unswizzle Chunk Size"),
            tr("Determines the number of depth slices processed in a single dispatch.\n"
               "Increasing this can improve throughput on high-end GPUs but may cause TDR or driver timeouts on weaker hardware."));

src/video_core/texture_cache/texture_cache.h

@@ -80,7 +80,7 @@ TextureCache<P>::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag
         lowmemorydevice = true;
     }
 
-    switch (Settings::values.gpu_unzwizzle_texture_size.GetValue()) {
+    switch (Settings::values.gpu_unswizzle_texture_size.GetValue()) {
         case Settings::GpuUnswizzleSize::VerySmall:    gpu_unswizzle_maxsize = 16_MiB; break;
         case Settings::GpuUnswizzleSize::Small:        gpu_unswizzle_maxsize = 32_MiB; break;
         case Settings::GpuUnswizzleSize::Normal:       gpu_unswizzle_maxsize = 128_MiB; break;
@@ -89,7 +89,7 @@ TextureCache<P>::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag
         default:                                       gpu_unswizzle_maxsize = 128_MiB; break;
     }
 
-    switch (Settings::values.gpu_unzwizzle_stream_size.GetValue()) {
+    switch (Settings::values.gpu_unswizzle_stream_size.GetValue()) {
         case Settings::GpuUnswizzle::VeryLow: swizzle_chunk_size = 4_MiB; break;
         case Settings::GpuUnswizzle::Low:     swizzle_chunk_size = 8_MiB; break;
         case Settings::GpuUnswizzle::Normal:  swizzle_chunk_size = 16_MiB; break;
@@ -98,7 +98,7 @@ TextureCache<P>::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag
         default:                              swizzle_chunk_size = 16_MiB;
     }
 
-    switch (Settings::values.gpu_unzwizzle_chunk_size.GetValue()) {
+    switch (Settings::values.gpu_unswizzle_chunk_size.GetValue()) {
         case Settings::GpuUnswizzleChunk::VeryLow: swizzle_slices_per_batch = 32; break;
         case Settings::GpuUnswizzleChunk::Low:     swizzle_slices_per_batch = 64; break;
         case Settings::GpuUnswizzleChunk::Normal:  swizzle_slices_per_batch = 128; break;