From 970cc5da24783e92005e1f7cb065d2f29e8ccf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 17 Jul 2024 18:20:45 +0200 Subject: [PATCH 1/2] Use config defaults in the headless binary. Fixes #19332 --- headless/Headless.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 4487a445cd88..4424f5163f57 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -464,6 +464,8 @@ int main(int argc, const char* argv[]) coreParameter.pixelHeight = 272; coreParameter.fastForward = true; + // NOTE: In headless mode, we never save the config. This is just for this run. + g_Config.RestoreDefaults(RestoreSettingsBits::SETTINGS | RestoreSettingsBits::CONTROLS); g_Config.bEnableSound = false; g_Config.bFirstRun = false; g_Config.bIgnoreBadMemAccess = true; From b8dac21ede6da365ab9c6dd8eda4d19f7877b363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 17 Jul 2024 19:52:32 +0200 Subject: [PATCH 2/2] Headless: Test making the graphics settings like they're uninitialized --- headless/Headless.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 4424f5163f57..1540bbbe485c 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -504,6 +504,16 @@ int main(int argc, const char* argv[]) g_Config.iReverbVolume = VOLUME_FULL; g_Config.internalDataDirectory.clear(); g_Config.bUseNewAtrac = newAtrac; + + // Trying to get tests to pass. TEMP + g_Config.iTexFiltering = 0; + g_Config.bVendorBugChecksEnabled = false; + g_Config.bUseGeometryShader = false; + g_Config.bDisableRangeCulling = false; + g_Config.bUberShaderFragment = false; + g_Config.bUberShaderVertex = false; + g_Config.bHardwareTessellation = false; + g_Config.bRenderMultiThreading = false; Path exePath = File::GetExeDirectory(); g_Config.flash0Directory = exePath / "assets/flash0";