Skip to content

config/ui: UX improvements, decrease settings ambiguity, fix namings #18220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Megamouse merged 16 commits into from
Mar 15, 2026
Merged

config/ui: UX improvements, decrease settings ambiguity, fix namings #18220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
47e0557
config: Move FSR CAS out of Vulkan subcategory
AniLeo Feb 22, 2026
04687a2
config: Fix naming of Asynchronous Texture Streaming
AniLeo Feb 22, 2026
1d9ed1e
config: Fix naming of SPU XFloat Accuracy
AniLeo Feb 22, 2026
b700fce
ui: Specify Anti-Aliasing as MSAA
AniLeo Feb 22, 2026
8fdcbc0
ui: Rename depth buffers to depth buffer
AniLeo Feb 22, 2026
6f4972e
ui: Merge exit/boot game dialog options
AniLeo Mar 8, 2026
a9b758c
ui: Merge pkg/pup install dialog options
AniLeo Mar 8, 2026
115c0ab
ui: Allow toggling pad navigation on BSD
AniLeo Mar 8, 2026
c37984a
config: Enable pad navigation by default
AniLeo Mar 8, 2026
ff6fb0e
ui: A-Z order advanced tab settings
AniLeo Mar 8, 2026
5fd8b41
ui: Move Accurate DFMA to debug
AniLeo Mar 8, 2026
4c23e96
ui: Move PPU Non-Java Fixup to debug
AniLeo Mar 8, 2026
9524eca
ui: Move SPU Loop Detection to advanced
AniLeo Mar 8, 2026
a2b0fec
ui: Split overlay settings, A-Z order emulator tab settings
AniLeo Mar 9, 2026
ffc4dac
config/ui: Unify Shader Mode values
AniLeo Mar 14, 2026
0281ab6
Merge branch 'master' into config
Megamouse Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace gl
void rcas_pass::configure()
{
// 0 is actually the sharpest with 2 being the chosen limit. Each progressive unit 'halves' the sharpening intensity.
auto cas_attenuation = 2.f - (g_cfg.video.vk.rcas_sharpening_intensity / 50.f);
auto cas_attenuation = 2.f - (g_cfg.video.rcas_sharpening_intensity / 50.f);
FsrRcasCon(&m_constants_buf[0], cas_attenuation);
}
}
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace rsx
add_dropdown(&g_cfg.video.output_scaling, localized_string_id::HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING);
if (g_cfg.video.renderer == video_renderer::vulkan && g_cfg.video.output_scaling == output_scaling_mode::fsr)
{
add_unsigned_slider(&g_cfg.video.vk.rcas_sharpening_intensity, localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING, " %", 1);
add_unsigned_slider(&g_cfg.video.rcas_sharpening_intensity, localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING, " %", 1);
}

add_checkbox(&g_cfg.video.stretch_to_display_area, localized_string_id::HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY);
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace vk
void rcas_pass::configure(const vk::command_buffer& cmd)
{
// 0 is actually the sharpest with 2 being the chosen limit. Each progressive unit 'halves' the sharpening intensity.
auto cas_attenuation = 2.f - (g_cfg.video.vk.rcas_sharpening_intensity / 50.f);
auto cas_attenuation = 2.f - (g_cfg.video.rcas_sharpening_intensity / 50.f);
FsrRcasCon(&m_constants_buf[0], cas_attenuation);

vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, m_constants_buf);
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/Emu/system_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct cfg_root : cfg::node
cfg::uint<0, 16> mfc_transfers_shuffling{ this, "MFC Commands Shuffling Limit", 0 };
cfg::uint<0, 10000> mfc_transfers_timeout{ this, "MFC Commands Timeout", 0, true };
cfg::_bool mfc_shuffling_in_steps{ this, "MFC Commands Shuffling In Steps", false, true };
cfg::_enum<xfloat_accuracy> spu_xfloat_accuracy{ this, "XFloat Accuracy", xfloat_accuracy::approximate, false };
cfg::_enum<xfloat_accuracy> spu_xfloat_accuracy{ this, "SPU XFloat Accuracy", xfloat_accuracy::approximate, false };
cfg::_int<-1, 14> ppu_128_reservations_loop_max_length{ this, "Accurate PPU 128-byte Reservation Op Max Length", 0, true }; // -1: Always accurate, 0: Never accurate, 1-14: max accurate loop length
cfg::_int<-64, 64> stub_ppu_traps{ this, "Stub PPU Traps", 0, true }; // Hack, skip PPU traps for rare cases where the trap is continueable (specify relative instructions to skip)
cfg::_bool precise_spu_verification{ this, "Precise SPU Verification", false }; // Disables use of xorsum based spu verification if enabled.
Expand Down Expand Up @@ -177,6 +177,7 @@ struct cfg_root : cfg::node
cfg::_enum<output_scaling_mode> output_scaling{ this, "Output Scaling Mode", output_scaling_mode::bilinear, true };
cfg::_bool record_with_overlays{ this, "Record With Overlays", true, true };
cfg::_bool disable_hardware_texel_remapping{ this, "Disable Hardware ColorSpace Remapping", false, true };
cfg::uint<0, 100> rcas_sharpening_intensity{ this, "FidelityFX CAS Sharpening Intensity", 50, true };

struct node_vk : cfg::node
{
Expand All @@ -186,8 +187,7 @@ struct cfg_root : cfg::node
cfg::_bool force_fifo{ this, "Force FIFO present mode" };
cfg::_bool force_primitive_restart{ this, "Force primitive restart flag" };
cfg::_enum<vk_exclusive_fs_mode> exclusive_fullscreen_mode{ this, "Exclusive Fullscreen Mode", vk_exclusive_fs_mode::unspecified};
cfg::_bool asynchronous_texture_streaming{ this, "Asynchronous Texture Streaming 2", false };
cfg::uint<0, 100> rcas_sharpening_intensity{ this, "FidelityFX CAS Sharpening Intensity", 50, true };
cfg::_bool asynchronous_texture_streaming{ this, "Asynchronous Texture Streaming", false };
cfg::_enum<vk_gpu_scheduler_mode> asynchronous_scheduler{ this, "Asynchronous Queue Scheduler", vk_gpu_scheduler_mode::safe };
cfg::uint<256, 65536> vram_allocation_limit{ this, "VRAM allocation limit (MB)", 65536, false };
cfg::_bool use_rebar_upload_heap{ this, "Use Re-BAR for GPU uploads", true, false };
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/Emu/system_config_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,9 @@ void fmt_class_string<shader_mode>::format(std::string& out, u64 arg)
{
switch (value)
{
case shader_mode::recompiler: return "Shader Recompiler";
case shader_mode::async_recompiler: return "Async Shader Recompiler";
case shader_mode::async_with_interpreter: return "Async with Shader Interpreter";
case shader_mode::recompiler: return "Legacy Recompiler (single-threaded)";
case shader_mode::async_recompiler: return "Async Recompiler (multi-threaded)";
case shader_mode::async_with_interpreter: return "Async Recompiler with Shader Interpreter";
case shader_mode::interpreter_only: return "Shader Interpreter only";
}

Expand Down
6 changes: 3 additions & 3 deletions rpcs3/rpcs3qt/emu_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,9 +1054,9 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
case emu_settings_type::ShaderMode:
switch (static_cast<shader_mode>(index))
{
case shader_mode::recompiler: return tr("Legacy (single threaded)", "Shader Mode");
case shader_mode::async_recompiler: return tr("Async (multi threaded)", "Shader Mode");
case shader_mode::async_with_interpreter: return tr("Async with Shader Interpreter", "Shader Mode");
case shader_mode::recompiler: return tr("Legacy Recompiler (single-threaded)", "Shader Mode");
case shader_mode::async_recompiler: return tr("Async Recompiler (multi-threaded)", "Shader Mode");
case shader_mode::async_with_interpreter: return tr("Async Recompiler with Shader Interpreter", "Shader Mode");
case shader_mode::interpreter_only: return tr("Shader Interpreter only", "Shader Mode");
}
break;
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/rpcs3qt/emu_settings_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
{ emu_settings_type::AccurateClineStores, { "Core", "Accurate Cache Line Stores"}},
{ emu_settings_type::AccurateRSXAccess, { "Core", "Accurate RSX reservation access"}},
{ emu_settings_type::FIFOAccuracy, { "Core", "RSX FIFO Fetch Accuracy"}},
{ emu_settings_type::XFloatAccuracy, { "Core", "XFloat Accuracy"}},
{ emu_settings_type::XFloatAccuracy, { "Core", "SPU XFloat Accuracy"}},
{ emu_settings_type::MFCCommandsShuffling, { "Core", "MFC Commands Shuffling Limit"}},
{ emu_settings_type::SetDAZandFTZ, { "Core", "Set DAZ and FTZ"}},
{ emu_settings_type::SPUBlockSize, { "Core", "SPU Block Size"}},
Expand Down Expand Up @@ -317,11 +317,11 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
{ emu_settings_type::DisableAsyncHostMM, { "Video", "Disable Asynchronous Memory Manager"}},
{ emu_settings_type::RecordWithOverlays, { "Video", "Record With Overlays"}},
{ emu_settings_type::DisableHWTexelRemapping, { "Video", "Disable Hardware ColorSpace Remapping"}},
{ emu_settings_type::FsrSharpeningStrength, { "Video", "FidelityFX CAS Sharpening Intensity"}},
Comment thread
AniLeo marked this conversation as resolved.

// Vulkan
{ emu_settings_type::VulkanAsyncTextureUploads, { "Video", "Vulkan", "Asynchronous Texture Streaming 2"}},
{ emu_settings_type::VulkanAsyncTextureUploads, { "Video", "Vulkan", "Asynchronous Texture Streaming"}},
{ emu_settings_type::VulkanAsyncSchedulerDriver, { "Video", "Vulkan", "Asynchronous Queue Scheduler"}},
{ emu_settings_type::FsrSharpeningStrength, { "Video", "Vulkan", "FidelityFX CAS Sharpening Intensity"}},
{ emu_settings_type::ExclusiveFullscreenMode, { "Video", "Vulkan", "Exclusive Fullscreen Mode"}},
{ emu_settings_type::UseReBAR, { "Video", "Vulkan", "Use Re-BAR for GPU uploads"}},

Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/gui_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ namespace gui

const gui_save sc_shortcuts = gui_save(sc, "shortcuts", QVariantMap());

const gui_save nav_enabled = gui_save(navigation, "pad_input_enabled", false);
const gui_save nav_enabled = gui_save(navigation, "pad_input_enabled", true);
const gui_save nav_global = gui_save(navigation, "allow_global_pad_input", false);
}

Expand Down
14 changes: 0 additions & 14 deletions rpcs3/rpcs3qt/settings_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,9 +2165,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
SubscribeTooltip(ui->cb_custom_colors, tooltips.settings.custom_colors);
SubscribeTooltip(ui->cb_show_welcome, tooltips.settings.show_welcome);
SubscribeTooltip(ui->cb_show_exit_game, tooltips.settings.show_exit_game);
SubscribeTooltip(ui->cb_show_boot_game, tooltips.settings.show_boot_game);
SubscribeTooltip(ui->cb_show_pkg_install, tooltips.settings.show_pkg_install);
SubscribeTooltip(ui->cb_show_pup_install, tooltips.settings.show_pup_install);
SubscribeTooltip(ui->cb_show_obsolete_cfg_dialog, tooltips.settings.show_obsolete_cfg);
SubscribeTooltip(ui->cb_show_same_buttons_dialog, tooltips.settings.show_same_buttons);
SubscribeTooltip(ui->cb_show_restart_hint, tooltips.settings.show_restart_hint);
Expand All @@ -2179,7 +2177,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
SubscribeTooltip(ui->cb_global_pad_navigation, tooltips.settings.global_navigation);
ui->cb_pad_navigation->setChecked(m_gui_settings->GetValue(gui::nav_enabled).toBool());
ui->cb_global_pad_navigation->setChecked(m_gui_settings->GetValue(gui::nav_global).toBool());
#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
connect(ui->cb_pad_navigation, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::nav_enabled, checked);
Expand All @@ -2188,9 +2185,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
{
m_gui_settings->SetValue(gui::nav_global, checked);
});
#else
ui->gb_gui_pad_input->setEnabled(false);
#endif

// Discord:
SubscribeTooltip(ui->useRichPresence, tooltips.settings.use_rich_presence);
Expand Down Expand Up @@ -2273,9 +2267,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std

ui->cb_show_welcome->setChecked(m_gui_settings->GetValue(gui::ib_show_welcome).toBool());
ui->cb_show_exit_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_exit).toBool());
ui->cb_show_boot_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_boot).toBool());
ui->cb_show_pkg_install->setChecked(m_gui_settings->GetValue(gui::ib_pkg_success).toBool());
ui->cb_show_pup_install->setChecked(m_gui_settings->GetValue(gui::ib_pup_success).toBool());
ui->cb_show_obsolete_cfg_dialog->setChecked(m_gui_settings->GetValue(gui::ib_obsolete_cfg).toBool());
ui->cb_show_same_buttons_dialog->setChecked(m_gui_settings->GetValue(gui::ib_same_buttons).toBool());
ui->cb_show_restart_hint->setChecked(m_gui_settings->GetValue(gui::ib_restart_hint).toBool());
Expand Down Expand Up @@ -2305,17 +2297,11 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
connect(ui->cb_show_exit_game, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_confirm_exit, checked);
});
connect(ui->cb_show_boot_game, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_confirm_boot, checked);
});
connect(ui->cb_show_pkg_install, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_pkg_success, checked);
});
connect(ui->cb_show_pup_install, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_pup_success, checked);
});
connect(ui->cb_show_obsolete_cfg_dialog, &QCheckBox::toggled, [this](bool checked)
Expand Down
Loading
Loading