From aea5c098259097b24ff1b26dcd99a01896cfe0f7 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Tue, 7 Feb 2023 22:18:43 +0000 Subject: [PATCH] GSDumpRunner: Ability to enable manual hw hacks for testing --- pcsx2-gsrunner/Main.cpp | 21 +++++++++++++++++++++ pcsx2-gsrunner/test_run_dumps.py | 15 ++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index c123033c35..4f6da0935c 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -522,6 +522,27 @@ static bool ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& param s_settings_interface.SetIntValue("EmuCore/GS", "Renderer", static_cast(type)); continue; } + else if (CHECK_ARG_PARAM("-renderhacks")) + { + std::string str(argv[++i]); + + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks", true); + + if(str.find("af") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_AutoFlush", true); + if (str.find("cpufb") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_CPU_FB_Conversion ", true); + if (str.find("dds") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_DisableDepthSupport ", true); + if (str.find("dpi") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_DisablePartialInvalidation ", true); + if (str.find("dsf") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_DisableSafeFeatures ", true); + if (str.find("tinrt") != std::string::npos) + s_settings_interface.SetBoolValue("EmuCore/GS", "UserHacks_TextureInsideRt ", true); + + continue; + } else if (CHECK_ARG_PARAM("-logfile")) { const char* logfile = argv[++i]; diff --git a/pcsx2-gsrunner/test_run_dumps.py b/pcsx2-gsrunner/test_run_dumps.py index c843b0b90e..87dfebbd1a 100644 --- a/pcsx2-gsrunner/test_run_dumps.py +++ b/pcsx2-gsrunner/test_run_dumps.py @@ -16,7 +16,7 @@ def is_gs_path(path): return False -def run_regression_test(runner, dumpdir, renderer, parallel, gspath): +def run_regression_test(runner, dumpdir, renderer, parallel, renderhacks, gspath): args = [runner] gsname = Path(gspath).name while gsname.rfind('.') >= 0: @@ -28,6 +28,10 @@ def run_regression_test(runner, dumpdir, renderer, parallel, gspath): if renderer is not None: args.extend(["-renderer", renderer]) + + if renderhacks is not None: + args.extend(["-renderhacks", renderhacks]) + args.extend(["-dumpdir", real_dumpdir]) args.extend(["-logfile", os.path.join(real_dumpdir, "emulog.txt")]) @@ -46,7 +50,7 @@ def run_regression_test(runner, dumpdir, renderer, parallel, gspath): subprocess.run(args) -def run_regression_tests(runner, gsdir, dumpdir, renderer, parallel=1): +def run_regression_tests(runner, gsdir, dumpdir, renderer, renderhacks, parallel=1): paths = glob.glob(gsdir + "/*.*", recursive=True) gamepaths = list(filter(is_gs_path, paths)) @@ -57,10 +61,10 @@ def run_regression_tests(runner, gsdir, dumpdir, renderer, parallel=1): if parallel <= 1: for game in gamepaths: - run_regression_test(runner, dumpdir, renderer, parallel, game) + run_regression_test(runner, dumpdir, renderer, parallel, renderhacks, game) else: print("Processing %u games on %u processors" % (len(gamepaths), parallel)) - func = partial(run_regression_test, runner, dumpdir, renderer, parallel) + func = partial(run_regression_test, runner, dumpdir, renderer, parallel, renderhacks) pool = multiprocessing.Pool(parallel) pool.map(func, gamepaths) pool.close() @@ -76,10 +80,11 @@ if __name__ == "__main__": parser.add_argument("-dumpdir", action="store", required=True, help="Base directory to dump frames to") parser.add_argument("-renderer", action="store", required=False, help="Renderer to use") parser.add_argument("-parallel", action="store", type=int, default=1, help="Number of proceeses to run") + parser.add_argument("-renderhacks", action="store", required=False, help="Enable HW Renering hacks") args = parser.parse_args() - if not run_regression_tests(args.runner, os.path.realpath(args.gsdir), os.path.realpath(args.dumpdir), args.renderer, args.parallel): + if not run_regression_tests(args.runner, os.path.realpath(args.gsdir), os.path.realpath(args.dumpdir), args.renderer, args.renderhacks, args.parallel): sys.exit(1) else: sys.exit(0)