From 83376d3f3b68328a08060a8cbb49565a8a944798 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Mon, 12 Feb 2024 10:01:29 +0000 Subject: [PATCH] Misc: Rename Disable Depth Emulation Renames Disable Depth Emulation to Disable Depth Conversion as it is both more correct to what it does and less likely for a user to think it is free performance. --- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 10 +++++----- pcsx2-qt/Settings/GraphicsSettingsWidget.ui | 2 +- pcsx2/ImGui/FullscreenUI.cpp | 4 ++-- pcsx2/ImGui/ImGuiOverlays.cpp | 8 ++++++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index 909ce801a4..6cdf00a6b6 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team +// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: LGPL-3.0+ #include "GraphicsSettingsWidget.h" @@ -513,11 +513,11 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* dialog->registerWidgetHelp(m_ui.spinCPUDuringReadbacks, tr("Spin CPU During Readbacks"), tr("Unchecked"), tr("Does useless work on the CPU during readbacks to prevent it from going to into powersave modes. " - "May improve performance but with a significant increase in power usage.")); + "May improve performance during readbacks but with a significant increase in power usage.")); dialog->registerWidgetHelp(m_ui.spinGPUDuringReadbacks, tr("Spin GPU During Readbacks"), tr("Unchecked"), tr("Submits useless work to the GPU during readbacks to prevent it from going into powersave modes. " - "May improve performance but with a significant increase in power usage.")); + "May improve performance during readbacks but with a significant increase in power usage.")); // Software dialog->registerWidgetHelp(m_ui.extraSWThreads, tr("Software Rendering Threads"), tr("2 threads"), @@ -555,9 +555,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* tr("Force a primitive flush when a framebuffer is also an input texture. " "Fixes some processing effects such as the shadows in the Jak series and radiosity in GTA:SA.")); - dialog->registerWidgetHelp(m_ui.disableDepthEmulation, tr("Disable Depth Emulation"), tr("Unchecked"), + dialog->registerWidgetHelp(m_ui.disableDepthEmulation, tr("Disable Depth Conversion"), tr("Unchecked"), tr("Disable the support of depth buffers in the texture cache. " - "It can help to increase speed but it will likely create various glitches.")); + "Will likely create various glitches and is only useful for debugging.")); dialog->registerWidgetHelp(m_ui.disableSafeFeatures, tr("Disable Safe Features"), tr("Unchecked"), tr("This option disables multiple safe features. " diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui index 923d07bb3a..9b6ebd6858 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui @@ -1006,7 +1006,7 @@ - Disable Depth Emulation + Disable Depth Conversion diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index f2e70fb71c..7a900b4708 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team +// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: LGPL-3.0+ #define IMGUI_DEFINE_MATH_OPERATORS @@ -3412,7 +3412,7 @@ void FullscreenUI::DrawGraphicsSettingsPage() DrawToggleSetting(bsi, FSUI_CSTR("CPU Framebuffer Conversion"), FSUI_CSTR("Convert 4-bit and 8-bit framebuffer on the CPU instead of the GPU."), "EmuCore/GS", "UserHacks_CPU_FB_Conversion", false, manual_hw_fixes); - DrawToggleSetting(bsi, FSUI_CSTR("Disable Depth Emulation"), + DrawToggleSetting(bsi, FSUI_CSTR("Disable Depth Conversion"), FSUI_CSTR("Disable the support of depth buffers in the texture cache."), "EmuCore/GS", "UserHacks_DisableDepthSupport", false, manual_hw_fixes); DrawToggleSetting(bsi, FSUI_CSTR("Disable Safe Features"), FSUI_CSTR("This option disables multiple safe features."), diff --git a/pcsx2/ImGui/ImGuiOverlays.cpp b/pcsx2/ImGui/ImGuiOverlays.cpp index d0697a3ff2..201d4a7d4d 100644 --- a/pcsx2/ImGui/ImGuiOverlays.cpp +++ b/pcsx2/ImGui/ImGuiOverlays.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team +// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: LGPL-3.0+ #include "Config.h" @@ -418,7 +418,7 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa if (GSConfig.UserHacks_ReadTCOnClose) APPEND("FTC "); if (GSConfig.UserHacks_DisableDepthSupport) - APPEND("DDE "); + APPEND("DDC "); if (GSConfig.UserHacks_DisablePartialInvalidation) APPEND("DPIV "); if (GSConfig.UserHacks_DisableSafeFeatures) @@ -429,6 +429,10 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa APPEND("PLFD "); if (GSConfig.UserHacks_EstimateTextureRegion) APPEND("ETR "); + if (GSConfig.HWSpinGPUForReadbacks) + APPEND("RBSG "); + if (GSConfig.HWSpinCPUForReadbacks) + APPEND("RBSC "); } #undef APPEND