From b7e23f4833383bc1adb59ce6c95caca808ea9471 Mon Sep 17 00:00:00 2001 From: TJnotJT Date: Sat, 22 Feb 2025 09:57:20 -0500 Subject: [PATCH] GS/UI: Rename dumping variables and UI labels to be more consistent/clear. --- pcsx2-gsrunner/Main.cpp | 24 ++++++------- pcsx2-qt/Settings/DebugSettingsWidget.cpp | 34 +++++++++--------- pcsx2-qt/Settings/DebugSettingsWidget.ui | 18 +++++----- pcsx2/Config.h | 12 +++---- pcsx2/Pcsx2Config.cpp | 44 ++++++++++++----------- 5 files changed, 67 insertions(+), 65 deletions(-) diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index a59b310a24344..ad4fcd9c205db 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -517,17 +517,17 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa s_settings_interface.SetBoolValue("EmuCore/GS", "dump", true); if (str.find("rt") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "save", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveRT", true); if (str.find("f") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "savef", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveFrame", true); if (str.find("tex") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "savet", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveTexture", true); if (str.find("z") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "savez", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveDepth", true); if (str.find("a") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "savea", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveAlpha", true); if (str.find("i") != std::string::npos) - s_settings_interface.SetBoolValue("EmuCore/GS", "savei", true); + s_settings_interface.SetBoolValue("EmuCore/GS", "SaveInfo", true); continue; } else if (CHECK_ARG_PARAM("-dumprange")) @@ -550,9 +550,9 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa { by = std::max(1, StringUtil::FromChars(split[2]).value_or(1)); } - s_settings_interface.SetIntValue("EmuCore/GS", "saven", start); - s_settings_interface.SetIntValue("EmuCore/GS", "savel", num); - s_settings_interface.SetIntValue("EmuCore/GS", "saveb", by); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveDrawStart", start); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveDrawCount", num); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveDrawBy", by); continue; } else if (CHECK_ARG_PARAM("-dumprangef")) @@ -575,9 +575,9 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa { by = std::max(1, StringUtil::FromChars(split[2]).value_or(1)); } - s_settings_interface.SetIntValue("EmuCore/GS", "savenf", start); - s_settings_interface.SetIntValue("EmuCore/GS", "savelf", num); - s_settings_interface.SetIntValue("EmuCore/GS", "savebf", by); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveFrameStart", start); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveFrameCount", num); + s_settings_interface.SetIntValue("EmuCore/GS", "SaveFrameBy", by); continue; } else if (CHECK_ARG_PARAM("-dumpdirhw")) diff --git a/pcsx2-qt/Settings/DebugSettingsWidget.cpp b/pcsx2-qt/Settings/DebugSettingsWidget.cpp index bd18b11087bca..617824d4414e2 100644 --- a/pcsx2-qt/Settings/DebugSettingsWidget.cpp +++ b/pcsx2-qt/Settings/DebugSettingsWidget.cpp @@ -44,23 +44,23 @@ DebugSettingsWidget::DebugSettingsWidget(SettingsWindow* dialog, QWidget* parent ////////////////////////////////////////////////////////////////////////// // GS Settings ////////////////////////////////////////////////////////////////////////// - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.dumpGSDraws, "EmuCore/GS", "dump", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveRT, "EmuCore/GS", "save", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveFrame, "EmuCore/GS", "savef", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveTexture, "EmuCore/GS", "savet", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveDepth, "EmuCore/GS", "savez", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveAlpha, "EmuCore/GS", "savea", false); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveInfo, "EmuCore/GS", "savei", false); - SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.startDraw, "EmuCore/GS", "saven", 0); - SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.drawDumpCount, "EmuCore/GS", "savel", 5000); - SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.startFrame, "EmuCore/GS", "savenf", 0); - SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.frameDumpCount, "EmuCore/GS", "savelf", 5000); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.dumpGSData, "EmuCore/GS", "DumpGSData", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveRT, "EmuCore/GS", "SaveRT", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveFrame, "EmuCore/GS", "SaveFrame", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveTexture, "EmuCore/GS", "SaveTexture", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveDepth, "EmuCore/GS", "SaveDepth", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveAlpha, "EmuCore/GS", "SaveAlpha", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveInfo, "EmuCore/GS", "SaveInfo", false); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveDrawStart, "EmuCore/GS", "SaveDrawStart", 0); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveDrawCount, "EmuCore/GS", "SaveDrawCount", 5000); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveFrameStart, "EmuCore/GS", "SaveFrameStart", 0); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveFrameCount, "EmuCore/GS", "SaveFrameCount", 999999); SettingWidgetBinder::BindWidgetToFolderSetting( sif, m_ui.hwDumpDirectory, m_ui.hwDumpBrowse, m_ui.hwDumpOpen, nullptr, "EmuCore/GS", "HWDumpDirectory", std::string(), false); SettingWidgetBinder::BindWidgetToFolderSetting( sif, m_ui.swDumpDirectory, m_ui.swDumpBrowse, m_ui.swDumpOpen, nullptr, "EmuCore/GS", "SWDumpDirectory", std::string(), false); - connect(m_ui.dumpGSDraws, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onDrawDumpingChanged); + connect(m_ui.dumpGSData, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onDrawDumpingChanged); onDrawDumpingChanged(); #ifdef PCSX2_DEVBUILD @@ -150,17 +150,17 @@ DebugSettingsWidget::~DebugSettingsWidget() = default; void DebugSettingsWidget::onDrawDumpingChanged() { - const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore/GS", "dump", false); + const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore/GS", "DumpGSData", false); m_ui.saveRT->setEnabled(enabled); m_ui.saveFrame->setEnabled(enabled); m_ui.saveTexture->setEnabled(enabled); m_ui.saveDepth->setEnabled(enabled); m_ui.saveAlpha->setEnabled(enabled); m_ui.saveInfo->setEnabled(enabled); - m_ui.startDraw->setEnabled(enabled); - m_ui.drawDumpCount->setEnabled(enabled); - m_ui.startFrame->setEnabled(enabled); - m_ui.frameDumpCount->setEnabled(enabled); + m_ui.saveDrawStart->setEnabled(enabled); + m_ui.saveDrawCount->setEnabled(enabled); + m_ui.saveFrameStart->setEnabled(enabled); + m_ui.saveFrameCount->setEnabled(enabled); m_ui.hwDumpDirectory->setEnabled(enabled); m_ui.hwDumpBrowse->setEnabled(enabled); m_ui.hwDumpOpen->setEnabled(enabled); diff --git a/pcsx2-qt/Settings/DebugSettingsWidget.ui b/pcsx2-qt/Settings/DebugSettingsWidget.ui index bebbe9484fb61..cb9e6eb76217d 100644 --- a/pcsx2-qt/Settings/DebugSettingsWidget.ui +++ b/pcsx2-qt/Settings/DebugSettingsWidget.ui @@ -161,7 +161,7 @@ - + Dump GS Draws @@ -214,12 +214,12 @@ - Start Draw Number: + Dump Draw Start: - + 99999999 @@ -228,12 +228,12 @@ - Draw Dump Count: + Dump Draw Count: - + 1 @@ -245,12 +245,12 @@ - Start Frame Number: + Dump Frame Start: - + 99999999 @@ -259,12 +259,12 @@ - Frame Dump Count: + Dump Frame Count: - + 1 diff --git a/pcsx2/Config.h b/pcsx2/Config.h index a6269b1ad83b9..bca65de381dde 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -822,12 +822,12 @@ struct Pcsx2Config u16 SWExtraThreads = 2; u16 SWExtraThreadsHeight = 4; - int SaveN = 0; - int SaveL = 5000; - int SaveB = 1; - int SaveNF = 0; - int SaveLF = -1; - int SaveBF = 1; + int SaveDrawStart = 0; + int SaveDrawCount = 5000; + int SaveDrawBy = 1; + int SaveFrameStart = 0; + int SaveFrameCount = -1; + int SaveFrameBy = 1; s8 ExclusiveFullscreenControl = -1; GSScreenshotSize ScreenshotSize = GSScreenshotSize::WindowResolution; diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index a2ee45de8d451..a73fa8de98e70 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -838,12 +838,12 @@ bool Pcsx2Config::GSOptions::OptionsAreEqual(const GSOptions& right) const OpEqu(ShadeBoost_Contrast) && OpEqu(ShadeBoost_Saturation) && OpEqu(PNGCompressionLevel) && - OpEqu(SaveN) && - OpEqu(SaveL) && - OpEqu(SaveB) && - OpEqu(SaveNF) && - OpEqu(SaveLF) && - OpEqu(SaveBF) && + OpEqu(SaveDrawStart) && + OpEqu(SaveDrawCount) && + OpEqu(SaveDrawBy) && + OpEqu(SaveFrameStart) && + OpEqu(SaveFrameCount) && + OpEqu(SaveFrameBy) && OpEqu(ExclusiveFullscreenControl) && OpEqu(ScreenshotSize) && @@ -965,13 +965,13 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap) SettingsWrapBitBoolEx(UserHacks_EstimateTextureRegion, "UserHacks_EstimateTextureRegion"); SettingsWrapBitBoolEx(FXAA, "fxaa"); SettingsWrapBitBool(ShadeBoost); - SettingsWrapBitBoolEx(DumpGSData, "dump"); - SettingsWrapBitBoolEx(SaveRT, "save"); - SettingsWrapBitBoolEx(SaveFrame, "savef"); - SettingsWrapBitBoolEx(SaveTexture, "savet"); - SettingsWrapBitBoolEx(SaveDepth, "savez"); - SettingsWrapBitBoolEx(SaveAlpha, "savea"); - SettingsWrapBitBoolEx(SaveInfo, "savei"); + SettingsWrapBitBoolEx(DumpGSData, "DumpGSData"); + SettingsWrapBitBoolEx(SaveRT, "SaveRT"); + SettingsWrapBitBoolEx(SaveFrame, "SaveFrame"); + SettingsWrapBitBoolEx(SaveTexture, "SaveTexture"); + SettingsWrapBitBoolEx(SaveDepth, "SaveDepth"); + SettingsWrapBitBoolEx(SaveAlpha, "SaveAlpha"); + SettingsWrapBitBoolEx(SaveInfo, "SaveInfo"); SettingsWrapBitBool(DumpReplaceableTextures); SettingsWrapBitBool(DumpReplaceableMipmaps); SettingsWrapBitBool(DumpTexturesWithFMVActive); @@ -1030,12 +1030,12 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap) SettingsWrapBitfield(ShadeBoost_Saturation); SettingsWrapBitfield(ExclusiveFullscreenControl); SettingsWrapBitfieldEx(PNGCompressionLevel, "png_compression_level"); - SettingsWrapBitfieldEx(SaveN, "saven"); - SettingsWrapBitfieldEx(SaveL, "savel"); - SettingsWrapBitfieldEx(SaveB, "saveb"); - SettingsWrapBitfieldEx(SaveNF, "savenf"); - SettingsWrapBitfieldEx(SaveLF, "savelf"); - SettingsWrapBitfieldEx(SaveBF, "savebf"); + SettingsWrapBitfieldEx(SaveDrawStart, "SaveDrawStart"); + SettingsWrapBitfieldEx(SaveDrawCount, "SaveDrawCount"); + SettingsWrapBitfieldEx(SaveDrawBy, "SaveDrawBy"); + SettingsWrapBitfieldEx(SaveFrameStart, "SaveFrameStart"); + SettingsWrapBitfieldEx(SaveFrameCount, "SaveFrameCount"); + SettingsWrapBitfieldEx(SaveFrameBy, "SaveFrameBy"); SettingsWrapEntryEx(CaptureContainer, "CaptureContainer"); SettingsWrapEntryEx(VideoCaptureCodec, "VideoCaptureCodec"); @@ -1122,9 +1122,11 @@ bool Pcsx2Config::GSOptions::UseHardwareRenderer() const bool Pcsx2Config::GSOptions::ShouldDump(int draw, int frame) const { + int drawOffset = draw - SaveDrawStart; + int frameOffset = frame - SaveFrameStart; return DumpGSData && - (SaveN <= draw) && ((SaveL < 0) || (draw < SaveN + SaveL)) && (draw % SaveB == 0) && - (SaveNF <= frame) && ((SaveLF < 0) || (frame < SaveNF + SaveLF)) && (frame % SaveBF == 0); + (drawOffset >= 0) && ((SaveDrawCount < 0) || (drawOffset < SaveDrawCount)) && (drawOffset % SaveDrawBy == 0) && + (frameOffset >= 0) && ((SaveFrameCount < 0) || (frameOffset < SaveFrameCount)) && (frameOffset % SaveFrameBy == 0); } static constexpr const std::array s_spu2_sync_mode_names = {