mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 06:59:57 -04:00
Ask the shipped translator itself for its texture pool length before make_launcher packages it.
The review of the packaging guard (b4c21998) found that D-1's optional behaviour probe was left out without a reason: check_built compares only nx2navi_xlate.id with the checkout's sources, so an old exe beside a current .id still passed, and while the exe build record waits (G-12), a probe of the exe is the only landable check on the exe itself. It also passes the release scripts' folder, as that translator declares 40960 entries and clamps to 40959. tools/xlate_smoke.py gains pool_check(exe): it sends a hand-assembled fragment shader that reads a texture handle from an input (IPA R4 = a[0x80]; TXQ.B R0, R4; EXIT), which the translator reads from the texture pool array, and refuses an exe that does not run or answer, whose res.json texture pool entry (pool 1) has another array length than tools/xlate/Program.cs TexturePoolLength, or whose SPIR-V lacks that array or a GLSL.std.450 UMin by length - 1 (spirv_clamps reads the module itself, no disassembler needed). xlate_smoke.py runs it last and takes --exe. make_launcher.check_xlate runs pool_check on the exe after check_built on Windows, still before anything is downloaded, built or deleted. Not reproduced before the change beyond the audit's probe. On this PC, pool_check passes on work\xlate_6866a13e (and make_launcher.check_xlate on that folder), refuses the 0.9.2 translator (identity 4d051299) with "declares the texture pool with [32768] entries, where its sources say 40960", also through check_xlate beside a current .id, and xlate_smoke.py --exe passes on work\xlate_6866a13e. tests/xlate_package_check.py now checks spirv_clamps on a module it assembles, that pool_check and check_xlate refuse an exe that does not run beside a matching .id, and that a translator built in build/xlate passes when there is one; it passes. docs/building.md names pool_check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -193,11 +193,18 @@ def check_xlate(xlate):
|
||||
4d051299) after tools/xlate/Program.cs had raised the texture pool to 40960 slots, so their translations still
|
||||
clamped every pool handle to slot 32767 and the ground went see-through after some area loads (issues #569 and
|
||||
#824). A missing translator, or one whose nx2navi_xlate.id differs from this checkout's sources
|
||||
(build_xlate.check_built), stops the build; main runs this before anything is resolved, downloaded or deleted."""
|
||||
(build_xlate.check_built), stops the build; main runs this before anything is resolved, downloaded or deleted.
|
||||
On Windows the exe itself is asked too, as the .id says nothing of the exe beside it: a translator that declares
|
||||
the texture pool with another length than its sources, or does not run, stops the build (xlate_smoke.pool_check)."""
|
||||
import build_xlate
|
||||
reason = build_xlate.check_built(xlate, 'nx2navi_xlate.exe')
|
||||
if reason:
|
||||
sys.exit(reason)
|
||||
if os.name == 'nt':
|
||||
import xlate_smoke
|
||||
reason = xlate_smoke.pool_check(xlate / 'nx2navi_xlate.exe')
|
||||
if reason:
|
||||
sys.exit(f'{xlate / "nx2navi_xlate.exe"}: {reason}')
|
||||
have = (xlate / 'nx2navi_xlate.id').read_text(encoding='ascii').strip()
|
||||
print(f'translator identity {have[:16]}: built from this checkout\'s sources')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user