aboutsummaryrefslogtreecommitdiff
path: root/src/core/launch_params.cpp
diff options
context:
space:
mode:
authorkraibse <33869366+kraibse@users.noreply.github.com>2026-11-02 13:50:54 +0100
committerkraibse <33869366+kraibse@users.noreply.github.com>2026-11-02 14:43:01 +0100
commitc0cb3325e22756edb65c87d33ef298349ade0ad3 (patch)
treee3f6d670018b57004915e69d1fc741b4efecb325 /src/core/launch_params.cpp
parent9210b8d69d172b5456e90cbd56b8f2bacbd7386b (diff)
parenta407703f6d29a5ab73328b4ededb12cf29b2758d (diff)
Merge nx2 into nx2-experimental
Resolved by area: - audio feature_support.h: nx2's native revision handling. - fiber.cpp: ours, which also drops the unused rewind stack. - host_memory.cpp: ours granule bitmap and HintCold, plus nx2's fallocate hole punching per whole dirty granule on Linux. - texture_cache.h: nx2's old-age eviction pass, then our Collect(). - kepler_compute.cpp: shared upscale slots, then Fortune's Weave's, then the Kirby Air Riders scan. - nx2_gsv.h: ours, plus nx2's GetBufferMaxResolution and graphics device ids (1-based). - nvhost_ctrl_gpu.cpp: engine support flag bits 40-44. - lower_to_maxwell.h: ours as the base, with nx2's seven lowering commits applied one at a time. Second texture descriptor buffers are read bindless in TEX, TLD.SCR (level zero) and SUST; FSEL keeps its operand modifiers; TXD takes any channel mask. lower_to_maxwell.h lowers 837 Fortune's Weave and 1183 Mario Kart World shader dumps with the same rejects as nx2 and ours (12 and 0). Assisted-by: Claude Sonnet 5.5 (conflict analysis and drafting)
Diffstat (limited to 'src/core/launch_params.cpp')
-rw-r--r--src/core/launch_params.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/launch_params.cpp b/src/core/launch_params.cpp
index 25fdd45fdb..6c436d0346 100644
--- a/src/core/launch_params.cpp
+++ b/src/core/launch_params.cpp
@@ -39,6 +39,7 @@ LaunchParams ParseLaunchParams(Core::System& system, int argc, char *argv[], wch
{"null-render", no_argument, 0, 'n'},
{"singlecore", no_argument, 0, 's'},
{"filter", no_argument, 0, 'x'},
+ {"pack-nup", required_argument, 0, 'N'},
{0, 0, 0, 0},
// clang-format on
};
@@ -62,6 +63,9 @@ LaunchParams ParseLaunchParams(Core::System& system, int argc, char *argv[], wch
case 'g':
p.filepath = std::string(optarg);
break;
+ case 'N':
+ p.pack_nup_source = std::string(optarg);
+ break;
case 'i': {
p.input_profile = std::string(optarg);
break;
@@ -196,7 +200,9 @@ void ApplyLaunchParams(LaunchParams const& lp) noexcept {
"-p, --program Pass following string as arguments to executable\n"
"-u, --user Select a specific user profile from 0 to 7\n"
"-d, --debug Run the GDB stub on a port from 1 to 65535\n"
- "-v, --version Output version information and exit\n",
+ "-v, --version Output version information and exit\n"
+ "--pack-nup <dump> [<out.nup>]"
+ " Pack a loose dump with all its updates and DLC into a NUP file and exit\n",
lp.argv0
);
}