[MarrasFederico]

What

sceNgs2SystemCreate and sceNgs2SystemCreateWithAllocator checked the output handle first and threw for a missing buffer or allocator. They now follow prosper's reading of the two exports in libSceNgs2.native.sprx (0x1d1e0 and 0x1d2f0):

• sceNgs2SystemCreate:
  1. a NULL buffer info, or a NULL host_buffer in it, returns 0x804A8020;
  2. then a NULL handle returns 0x804A8010;
  3. then the option checks run.
• sceNgs2SystemCreateWithAllocator:
  1. a NULL allocator, or a NULL alloc_handler, returns 0x804A8023;
  2. then the NULL handle;
  3. then the option checks.
• No free_handler: the module checks only alloc_handler, so an allocator with no free_handler keeps throwing, after the option checks as before. The new debt entry records it.

Rack creation is left as it is. #8609's tests rely on its current order, and it will follow separately.

This builds on #9312, which makes the option checks return codes.

Tested

Ubuntu 26.04.1, kernel 7.0.0-38, GCC 15.2.0, Release, full build with BUILD_TESTING=ON. Windows was not compiled. No title was run.

• ngs2_handleerrors, new CheckCreateArguments:
  • sceNgs2SystemCreate:
    • a NULL buffer info or host buffer returns 0x804A8020, also with a NULL handle and a bad option;
    • a NULL handle with a bad option returns 0x804A8010;
    • a bad option returns its code;
    • the handle is untouched in every refused case;
    • a NULL option succeeds.
  • sceNgs2SystemCreateWithAllocator:
    • the same matrix with 0x804A8023;
    • the allocator is never called on refusal;
    • a successful create allocates once and frees on destroy.
• The test fails on this branch's base (fix(libSceNgs2.native): validate the system option with the module's error codes #9312), where the NULL buffer info throws. Dropping the host-buffer check, or checking the handle before the allocator, makes it fail.
• All 13 ngs2 tests pass.
• tools/check_conventions.py --base origin/main passes. tools/pr_overlap.py reports:
  • fix(libSceNgs2): accept system option flag bit 1 #8341 on the flags line, inherited from fix(libSceNgs2.native): validate the system option with the module's error codes #9312;
  • my fix(libSceNgs2.native): return the module's codes from sceNgs2SystemSetSampleRate and sceNgs2SystemSetGrainSamples #9315 on Ngs2Types.hpp L11. Both branches carry fix(libSceNgs2.native): validate the system option with the module's error codes #9312's constants; this one adds two lines after them, and fix(libSceNgs2.native): return the module's codes from sceNgs2SystemSetSampleRate and sceNgs2SystemSetGrainSamples #9315 does not change the header.
    It could not compare feat(ngs2): add experimental I3DL2 reverb #1384 and feat(ngs2): decode complete HE-VAG waveform blocks #5797; neither changes these two calls.

Checklist

• Based on current main; no other open PR implements the same functions
• One topic per PR; follow-ups go in a new PR
• No comments in code except technical debt
• Unimplemented paths throw (NotImplemented_nid_no_patch); silent stubs are listed under Silent stubs in their library's technical debt file
• No notes, investigation .md files or images added to the repository (attach them to this PR)
• New third-party code is a submodule built from source
• Generic behaviour, not specific to one title
• Depends on: fix(libSceNgs2.native): validate the system option with the module's error codes #9312
• Fixes: none
• Unblocks: none
• GPUs tested: n/a
• AI-assisted: yes

[github-actions]

Other open pull requests touch the same code. Merging one will break the other, or both implement the same thing. If this one builds on them, list them in Depends on.

Pull request	Conflicting files (lines on main)	Same exports	Same new files
PR 9926	core/libs/prx/libSceNgs2.native/include/Ngs2Types.hpp L11
PR 10037	docs/dev/debt/libSceNgs2.native.md L33-34

Some comparisons could not be completed because a pull request conflicts with the base branch. Review these shared files manually before concluding that there is no overlap.

Pull request	Shared files not compared
PR 1384	core/libs/prx/libSceNgs2.native/include/Ngs2Types.hpp core/libs/prx/libSceNgs2.native/src/System.cpp
PR 5797	core/libs/prx/libSceNgs2.native/include/Ngs2Types.hpp docs/dev/debt/libSceNgs2.native.md

[ycbuzi]

Windows run of 6279944 merged onto main 0c6a5bd (dcc541cae9, clean), the platform the description lists as not tested. Windows 11 Home 10.0.26200, MinGW-w64 GCC 15.2.0 (ucrt-posix-seh r7), Release, BUILD_TESTING=ON.

Built libSceNgs2.native and ngs2_handleerrors_tests with no errors or warnings. ctest --repeat until-fail:2 on ngs2_handleerrors: passes on both repeats. The head carries the PRs below it in its stack (#9312, #9299) too. Not run: a title.

[oneandonlydean]

@MarrasFederico I read the stack: #9316 contains #9312, so I will review and land #9316 and treat #9312 as included. The module error codes and the new tests look right to me.

Before it can merge, Ngs2Types.hpp needs one fix. Since #9233 was merged, main already defines SCE_NGS2_ERROR_INVALID_OPTION_SIZE (0x804A8013) and SCE_NGS2_ERROR_INVALID_NUM_CHANNELS (0x804A8052), with the same values you use. This branch adds both again. Git merges that without a conflict, but the header then defines each name twice and the library does not compile. The CI runs on this branch started before #9233 landed, so they do not show it.

Could you rebase onto current main and:

• delete those two lines from core/libs/prx/libSceNgs2.native/include/Ngs2Types.hpp, and keep the others you add (INVALID_SAMPLE_RATE, INVALID_NUM_GRAIN_SAMPLES, INVALID_MAX_GRAIN_SAMPLES, INVALID_BUFFER_INFO, INVALID_BUFFER_ALLOCATOR)?
• fix(libSceNgs2): accept system option flag bit 1 #8341 is now in main (01f99305be), so please keep its rule for the system option flags inside your CheckSystemOption: it accepts bit 1 and throws for any other bit. In System.cpp replace the line if (option->flags != 0) throw std::runtime_error("NGS2: system option flags are not implemented"); with

    constexpr std::uint32_t knownFlags = 0x2;
    if ((option->flags & ~knownFlags) != 0) throw std::runtime_error("NGS2: system option flags " + Ngs2Hex(option->flags) + " are not implemented");

Ngs2Hex is already defined in that file. Without this, the new test that #8341 adds for the flags fails once both are in.

After the push CI runs again on the new head, and I will do a short delta review.

[MarrasFederico]

@oneandonlydean thanks, both are in the current head (ad5df50d6d). I merged rather than rebased so I wouldn't have to force-push:

• I merged current main (01f99305be) into fix(libSceNgs2.native): validate the system option with the module's error codes #9312's branch and then into this one. Ngs2Types.hpp now defines SCE_NGS2_ERROR_INVALID_OPTION_SIZE and SCE_NGS2_ERROR_INVALID_NUM_CHANNELS once each, with main's lines from feat(libSceNgs2): process the custom Gain module #9233. This branch only adds INVALID_SAMPLE_RATE, INVALID_NUM_GRAIN_SAMPLES, INVALID_MAX_GRAIN_SAMPLES, INVALID_BUFFER_INFO and INVALID_BUFFER_ALLOCATOR.
• CheckSystemOption keeps fix(libSceNgs2): accept system option flag bit 1 #8341's rule, using the two lines you gave: bit 1 is accepted, any other bit throws.

On that tree the library builds and all 13 NGS2 test targets pass after a full rebuild, including #8341's flags test in Ngs2Render.cpp. tools/check_conventions.py --base upstream/main passes. I gave #9312 and #9315 the same merge, so all three are mergeable again.