From 6dcf63009e6d72de18f7a6982690ede2ebc3e8bb Mon Sep 17 00:00:00 2001 From: Ani Date: Mon, 12 Jun 2023 23:23:16 +0100 Subject: [PATCH] Settings: Move Accurate SPU DMA to Advanced --- rpcs3/rpcs3qt/settings_dialog.cpp | 10 +++++----- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- rpcs3/rpcs3qt/tooltips.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 7a026ade9d..ed9d0af1af 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1455,11 +1455,14 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->accurateDFMA, tooltips.settings.accurate_dfma); ui->accurateDFMA->setDisabled(utils::has_fma3() || utils::has_fma4()); + m_emu_settings->EnhanceCheckBox(ui->accurateGETLLAR, emu_settings_type::AccurateGETLLAR); + SubscribeTooltip(ui->accurateGETLLAR, tooltips.settings.accurate_getllar); + m_emu_settings->EnhanceCheckBox(ui->accurateRSXAccess, emu_settings_type::AccurateRSXAccess); SubscribeTooltip(ui->accurateRSXAccess, tooltips.settings.accurate_rsx_access); - m_emu_settings->EnhanceCheckBox(ui->accurateGETLLAR, emu_settings_type::AccurateGETLLAR); - SubscribeTooltip(ui->accurateGETLLAR, tooltips.settings.accurate_getllar); + m_emu_settings->EnhanceCheckBox(ui->accurateSpuDMA, emu_settings_type::AccurateSpuDMA); + SubscribeTooltip(ui->accurateSpuDMA, tooltips.settings.accurate_spu_dma); m_emu_settings->EnhanceCheckBox(ui->ppuNJFixup, emu_settings_type::PPUNJFixup); SubscribeTooltip(ui->ppuNJFixup, tooltips.settings.fixup_ppunj); @@ -2334,9 +2337,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->accuratePPUFPCC, emu_settings_type::AccuratePPUFPCC); SubscribeTooltip(ui->accuratePPUFPCC, tooltips.settings.accurate_ppufpcc); - m_emu_settings->EnhanceCheckBox(ui->accurateSpuDMA, emu_settings_type::AccurateSpuDMA); - SubscribeTooltip(ui->accurateSpuDMA, tooltips.settings.accurate_spu_dma); - m_emu_settings->EnhanceCheckBox(ui->accurateClineStores, emu_settings_type::AccurateClineStores); SubscribeTooltip(ui->accurateClineStores, tooltips.settings.accurate_cache_line_stores); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index a3da5080b5..0cec6e6d80 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2365,6 +2365,13 @@ + + + + Accurate SPU DMA + + + @@ -4219,13 +4226,6 @@ - - - - Accurate SPU DMA - - - diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 184b0d419f..296b180ecf 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -28,6 +28,7 @@ public: const QString debug_console_mode = tr("Increases the amount of usable system memory to match a DECR console and more.\nCauses some software to behave differently than on retail hardware."); const QString accurate_getllar = tr("Accurately processes SPU MFC_GETLLAR operation."); const QString accurate_rsx_access = tr("Forces RSX pauses on SPU MFC_GETLLAR and SPU MFC_PUTLLUC operations."); + const QString accurate_spu_dma = tr("Accurately processes SPU DMA operations."); const QString fixup_ppunj = tr("Legacy option. Fixup result vector values in Non-Java Mode in PPU LLVM.\nIf unsure, do not modify this setting."); const QString accurate_dfma = tr("Use accurate double-precision FMA instructions in PPU and SPU backends.\nWhile disabling it might give a decent performance boost if your CPU doesn't support FMA, it may also introduce subtle bugs that otherwise do not occur.\nYou shouldn't disable it if your CPU supports FMA."); const QString fixup_ppuvnan = tr("Fixup NaN results in vector instructions in PPU backends.\nIf unsure, do not modify this setting."); @@ -98,7 +99,6 @@ public: const QString accurate_ppunj = tr("Respect Non-Java Mode Bit values for vector ops in PPU backends.\nIf unsure, do not modify this setting."); const QString accurate_ppuvnan = tr("Accurately set NaN results in vector instructions in PPU backends.\nIf unsure, do not modify this setting."); const QString accurate_ppufpcc = tr("Accurately set FPCC Bits in PPU backends.\nIf unsure, do not modify this setting."); - const QString accurate_spu_dma = tr("Accurately processes SPU DMA operations."); const QString accurate_cache_line_stores = tr("Accurately processes PPU DCBZ instruction.\nIn addition, when combined with Accurate SPU DMA, SPU PUT cache line accesses will be processed atomically."); const QString mfc_delay_command = tr("Forces delaying any odd MFC command, waits for at least 2 pending commands to execute them in a random order.\nMust be used with either SPU interpreters currently.\nSeverely degrades performance! If unsure, don't use this option."); const QString hook_static_functions = tr("Allows to hook some functions like 'memcpy' replacing them with high-level implementations. May do nothing or break things. Experimental.");