mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 21:39:58 -04:00
Prepare shaders under the code hashes play asks for, from every shader package, with better guessed bind states.
The install step seeded only 63% of the programs a play session met under their run-time code hash. A Switch 2 program with an empty c1 range past its code was hashed with that range, the Switch 2 agl and NDSR packages had no reader, and Layout2Shader/ was not walked. It now seeds 99.3% of the programs play asks for. A default variant's answers are read again from its first translation (runtime/gfx_shader_guess.c): vertex inputs the shader reads as integers become uint, and a compute shader takes the texture and image types its translation declares. Task and mesh defaults carry the workgroup words play answers with. Against a play session's recorded variants, --prepare-shaders now matches 98.3%; the plain default guess matched 89.5%. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -13,7 +13,10 @@ build's nx2navi.exe in the record layouts of runtime/gfx_shader.c ("answers met
|
||||
seed-answers.bin "NX2NSANS": stage, code hash, input id (zero: the runtime computes it), answers, priority
|
||||
|
||||
Priority (the pad byte): 0 shaders the list's warm rows flag as title/menu (t), 1 other warm rows (S, C, R), 2 the
|
||||
rest; a default variant takes its shader's priority. Then it runs `nx2navi.exe --prepare-shaders`, which translates every record into the build's shader cache, writes
|
||||
rest; a default variant takes its shader's priority and sets DEFAULT_FLAG (bit 7). The runtime reads a flagged
|
||||
record's first translation and translates it again with better answers where it reads other ones
|
||||
(runtime/gfx_shader_guess.c): integer vertex inputs, and the texture and image types a compute shader's translation
|
||||
declares, for which a compute default variant goes without texture answers. Then it runs `nx2navi.exe --prepare-shaders`, which translates every record into the build's shader cache, writes
|
||||
shader-prepared.bin (one record per variant, in priority order) and builds every variant's stage library or compute
|
||||
pipeline once, so the GPU driver's own disk cache holds them (vk_pipeline.c "stage library prebuild"). The seed files
|
||||
can be deleted afterwards.
|
||||
@@ -59,6 +62,7 @@ TYPES = {'float': 0, 'sint': 1, 'uint': 2}
|
||||
DEFAULT = {'tex': {str(slot): '2d' for slot in range(32)}} # answers outside a shader's use mask are dropped
|
||||
CONTROL = 0x880
|
||||
ANS_REC = 4 + 32 + 32 + 147 + 1
|
||||
DEFAULT_FLAG = 0x80 # pad byte: a default variant, its answers refined from its first translation (gfx_shader_guess.c)
|
||||
JOURNAL = 'shader-prepare-journal.bin' # vk_pipeline.c skip_init: a 64-byte slot per worker, input id first
|
||||
RETRIES = 3
|
||||
|
||||
@@ -121,10 +125,12 @@ def answers(deps, stage, control):
|
||||
attr[int(loc)] = TYPES[t]
|
||||
for idx, t in deps.get('fout', {}).items():
|
||||
fout[int(idx)] = TYPES[t]
|
||||
local = [0, 0, 0] # vk_exec_draw.c answers_for: zero for graphics stages (they are in the input id)
|
||||
if stage == 5: # compute: the control section's local size (NVN2 at +0x58), 0 read as 1
|
||||
local = [0, 0, 0] # vk_exec_draw.c answers_for: zero for vertex and fragment programs (they are in the input id)
|
||||
if stage not in (STAGES['vs'], STAGES['ps']):
|
||||
# compute, task and mesh: the three words at the control section's local size (NVN2 at +0x58), 0 read as 1,
|
||||
# each cut to 16 bits as answers_for stores them (task and mesh programs keep other fields there)
|
||||
local = struct.unpack_from('<III', control, 0x58 if nvn2(control) else 0x748)
|
||||
local = [1, 1, 1] if not any(local) else [v or 1 for v in local]
|
||||
local = [(v or 1) & 0xffff for v in local]
|
||||
packed = bytes(tex + img + fmt + attr + fout) + struct.pack('<HHHIB', *local, 0, 0)
|
||||
assert len(packed) == 147
|
||||
return packed
|
||||
@@ -136,11 +142,18 @@ def nvn2(control):
|
||||
|
||||
|
||||
def bounds(control, code):
|
||||
"""(c1 offset, length) as runtime/gfx_shader.c req_init takes them."""
|
||||
"""(c1 offset, length) as runtime/gfx_shader.c req_init takes them.
|
||||
|
||||
NVN2: play hands req_init the code size of runtime/vk_exec_draw.c ctl_stage_len, which reaches the end of the c1
|
||||
constants only when there are some (+0x40 below +0x44). With an empty c1 range past the code the length is the code
|
||||
size alone; cutting at the range's end (as shader_census does) seeded most of Ocarina's vertex programs under keys
|
||||
play never asks for."""
|
||||
if nvn2(control):
|
||||
size, c1_start = struct.unpack_from('<I', control, 0x38)[0], struct.unpack_from('<I', control, 0x40)[0]
|
||||
length = len(code) # shader_census cut the code at the end of its c1 part
|
||||
return (c1_start if size <= c1_start <= length else length), length
|
||||
size, c1_start, c1_end = struct.unpack_from('<III', control, 0x38)[0], *struct.unpack_from('<II', control, 0x40)
|
||||
code_size = c1_end if c1_start >= size and c1_end > c1_start and c1_end - size < 1 << 20 else size
|
||||
if c1_start >= size and c1_end >= c1_start and c1_end <= min(code_size, len(code)):
|
||||
return c1_start, c1_end
|
||||
return min(size, len(code)), min(size, len(code))
|
||||
return struct.unpack_from('<II', control, 0x700)
|
||||
|
||||
|
||||
@@ -200,11 +213,12 @@ def main():
|
||||
h = code_hash(stage, control, code, length, c1)
|
||||
progs[key] = (h, struct.pack('<III', stage, length, len(c1)) + h + control + code[:length] + c1)
|
||||
h = progs[key][0]
|
||||
packed = answers(deps, stage, control)
|
||||
default = deps is DEFAULT
|
||||
packed = answers({} if default and stage == STAGES['cs'] else deps, stage, control)
|
||||
if (h, packed) in seen: # a list row of the default bind state
|
||||
continue
|
||||
seen.add((h, packed))
|
||||
rec = struct.pack('<I', stage) + h + bytes(32) + packed + bytes([prio.get(key, 2)])
|
||||
rec = struct.pack('<I', stage) + h + bytes(32) + packed + bytes([prio.get(key, 2) | (DEFAULT_FLAG if default else 0)])
|
||||
assert len(rec) == ANS_REC
|
||||
recs.append((prio.get(key, 2), rec))
|
||||
recs.sort(key=lambda r: r[0]) # stable: list order within a priority
|
||||
|
||||
Reference in New Issue
Block a user