dahjah/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2025-12-16 04:08:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

GSRunner: Allow loading GS settings from INI.
Some checks are pending
🐧 Linux Builds / AppImage (push) Waiting to run
Details
🐧 Linux Builds / Flatpak (push) Waiting to run
Details
🍎 MacOS Builds / Defaults (push) Waiting to run
Details
🖥️ Windows Builds / Lint VS Project Files (push) Waiting to run
Details
🖥️ Windows Builds / SSE4 (push) Blocked by required conditions
Details
🖥️ Windows Builds / AVX2 (push) Blocked by required conditions
Details
🖥️ Windows Builds / CMake (push) Waiting to run
Details

Browse Source
This commit is contained in:
TJnotJT 2025-09-26 11:51:03 -04:00 committed by Ty
parent ba0dae5f57
commit c96607fe37
1 changed files with 65 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
pcsx2-gsrunner/Main.cpp
View File

@ -59,6 +59,7 @@ namespace GSRunner
{ {
static void InitializeConsole(); static void InitializeConsole();
static bool InitializeConfig(); static bool InitializeConfig();
static void SettingsOverride();
static bool ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& params); static bool ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& params);
static void DumpStats(); static void DumpStats();
@ -119,42 +120,6 @@ bool GSRunner::InitializeConfig()
VMManager::SetDefaultSettings(si, true, true, true, true, true); VMManager::SetDefaultSettings(si, true, true, true, true, true);
// complete as quickly as possible
si.SetBoolValue("EmuCore/GS", "FrameLimitEnable", false);
si.SetIntValue("EmuCore/GS", "VsyncEnable", false);
// Force screenshot quality settings to something more performant, overriding any defaults good for users.
si.SetIntValue("EmuCore/GS", "ScreenshotFormat", static_cast<int>(GSScreenshotFormat::PNG));
si.SetIntValue("EmuCore/GS", "ScreenshotQuality", 10);
// ensure all input sources are disabled, we're not using them
si.SetBoolValue("InputSources", "SDL", false);
si.SetBoolValue("InputSources", "XInput", false);
// we don't need any sound output
si.SetStringValue("SPU2/Output", "OutputModule", "nullout");
// none of the bindings are going to resolve to anything
Pad::ClearPortBindings(si, 0);
si.ClearSection("Hotkeys");
// force logging
si.SetBoolValue("Logging", "EnableSystemConsole", !s_no_console);
si.SetBoolValue("Logging", "EnableTimestamps", true);
si.SetBoolValue("Logging", "EnableVerbose", true);
// and show some stats :)
si.SetBoolValue("EmuCore/GS", "OsdShowFPS", true);
si.SetBoolValue("EmuCore/GS", "OsdShowResolution", true);
si.SetBoolValue("EmuCore/GS", "OsdShowGSStats", true);
// remove memory cards, so we don't have sharing violations
for (u32 i = 0; i < 2; i++)
{
si.SetBoolValue("MemoryCards", fmt::format("Slot{}_Enable", i + 1).c_str(), false);
si.SetStringValue("MemoryCards", fmt::format("Slot{}_Filename", i + 1).c_str(), "");
}
VMManager::Internal::LoadStartupSettings(); VMManager::Internal::LoadStartupSettings();
return true; return true;
} }
@ -709,6 +674,28 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
continue; continue;
} }
else if (CHECK_ARG_PARAM("-ini"))
{
std::string path = std::string(StringUtil::StripWhitespace(argv[++i]));
if (!FileSystem::FileExists(path.c_str()))
{
Console.ErrorFmt("INI file {} does not exit.", path);
return false;
}
INISettingsInterface si_ini(path);
if (!si_ini.Load())
{
Console.ErrorFmt("Unable to load INI settings from {}.", path);
return false;
}
for (const auto& [key, value] : si_ini.GetKeyValueList("EmuCore/GS"))
s_settings_interface.SetStringValue("EmuCore/GS", key.c_str(), value.c_str());
continue;
}
else if (CHECK_ARG_PARAM("-upscale")) else if (CHECK_ARG_PARAM("-upscale"))
{ {
const float upscale = StringUtil::FromChars<float>(argv[++i]).value_or(0.0f); const float upscale = StringUtil::FromChars<float>(argv[++i]).value_or(0.0f);
@ -813,6 +800,45 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
return true; return true;
} }
void GSRunner::SettingsOverride()
{
// complete as quickly as possible
s_settings_interface.SetBoolValue("EmuCore/GS", "FrameLimitEnable", false);
s_settings_interface.SetIntValue("EmuCore/GS", "VsyncEnable", false);
// Force screenshot quality settings to something more performant, overriding any defaults good for users.
s_settings_interface.SetIntValue("EmuCore/GS", "ScreenshotFormat", static_cast<int>(GSScreenshotFormat::PNG));
s_settings_interface.SetIntValue("EmuCore/GS", "ScreenshotQuality", 10);
// ensure all input sources are disabled, we're not using them
s_settings_interface.SetBoolValue("InputSources", "SDL", false);
s_settings_interface.SetBoolValue("InputSources", "XInput", false);
// we don't need any sound output
s_settings_interface.SetStringValue("SPU2/Output", "OutputModule", "nullout");
// none of the bindings are going to resolve to anything
Pad::ClearPortBindings(s_settings_interface, 0);
s_settings_interface.ClearSection("Hotkeys");
// force logging
s_settings_interface.SetBoolValue("Logging", "EnableSystemConsole", !s_no_console);
s_settings_interface.SetBoolValue("Logging", "EnableTimestamps", true);
s_settings_interface.SetBoolValue("Logging", "EnableVerbose", true);
// and show some stats :)
s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowFPS", true);
s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowResolution", true);
s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowGSStats", true);
// remove memory cards, so we don't have sharing violations
for (u32 i = 0; i < 2; i++)
{
s_settings_interface.SetBoolValue("MemoryCards", fmt::format("Slot{}_Enable", i + 1).c_str(), false);
s_settings_interface.SetStringValue("MemoryCards", fmt::format("Slot{}_Filename", i + 1).c_str(), "");
}
}
void GSRunner::DumpStats() void GSRunner::DumpStats()
{ {
std::atomic_thread_fence(std::memory_order_acquire); std::atomic_thread_fence(std::memory_order_acquire);
@ -871,6 +897,9 @@ int main(int argc, char* argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Override settings that shouldn't be picked up from defaults or INIs.
GSRunner::SettingsOverride();
// apply new settings (e.g. pick up renderer change) // apply new settings (e.g. pick up renderer change)
VMManager::ApplySettings(); VMManager::ApplySettings();
GSDumpReplayer::SetIsDumpRunner(true); GSDumpReplayer::SetIsDumpRunner(true);