MacKwnoX/NX2navi
1
0
Fork 0
mirror of https://github.com/tangerineturtle1/NX2navi.git synced 2026-11-15 17:09:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check in carry_pool_check that gfx_shader.c's earlier pool length equals vk.h's.

Browse Source 
The review of the carry refusal (a2de7eb7) found that gfx_shader.c, which does not include vk.h, defines its own
POOL_TEX_SHORT 32768 beside vk.h's VK_POOL_TEX_CARRIED, and nothing checked that the two stay equal. Should one change
alone, carry_usable would refuse other translations than those vk_texture_register warns about. tests/carry_pool_check.py
now reads both defines and fails, naming both values, when they differ.

Test only. The check passes, and fails with both values named against a copy of vk.h whose VK_POOL_TEX_CARRIED is 32769.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-13 17:43:49 -05:00
parent a47c6d69de
commit d2e23ce9c9
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/carry_pool_check.py
View File

@@ -7,13 +7,14 @@ the owned branch (gfx_shader_load_private) frees it as well, and entries with th
pool are served as before. carry_last, which runs once the current translator has failed the shader, serves the refused
translation after all and puts it in the memory cache, where the memory lookup finds it. pool_short_note, which counts
the shaders of the earlier length that enter the memory cache for vk_texture.c's warning, counts those only, and logs
only one that is not carried.
only one that is not carried. gfx_shader.c's POOL_TEX_SHORT must equal vk.h's VK_POOL_TEX_CARRIED.
No GPU, no game files, any Python.
Usage: carry_pool_check.py
"""
import os
import re
import shutil
import subprocess
import sys
@@ -217,8 +218,22 @@ def cut(source, start, end):
return source[i:source.index(end, i)]
def define(source, name):
"""The decimal value of `#define name <n>` in source."""
m = re.search(r'^#define ' + name + r' (\d+)\b', source, re.M)
if not m:
raise SystemExit(f'carry pool check: no #define {name}')
return int(m.group(1))
def main():
src = (ROOT / 'runtime' / 'gfx_shader.c').read_text(encoding='utf-8')
# gfx_shader.c does not include vk.h, so it states the earlier length itself: the two must stay equal.
short = define(src, 'POOL_TEX_SHORT')
carried = define((ROOT / 'runtime' / 'vk.h').read_text(encoding='utf-8'), 'VK_POOL_TEX_CARRIED')
if short != carried:
print(f'carry pool check: gfx_shader.c POOL_TEX_SHORT is {short}, vk.h VK_POOL_TEX_CARRIED is {carried}')
return 1
production = cut(src, '#define POOL_TEX_SHORT', '// Whether the cache holds a previous translator\'s entry of input iid.')
work = ROOT / 'build' / 'test' / 'carry_pool'
work.mkdir(parents=True, exist_ok=True)