mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 00:29:58 -04:00
Log shaders that index the texture pool with the earlier translator's length, and a texture they cannot reach.
A shader whose texture pool array has 32768 entries reads slot 32767 for every texture the game numbers from 32768 up (Ocarina's pool has 33068), but nothing in the log said such a shader was in use: vk_texture_register warned only for slots past VK_POOL_TEX (40960), which Ocarina never registers, and vk_pipeline.c spirv_pool_rebind accepts the shorter arrays silently. gfx_shader.c pool_short_note now counts the shaders entering the memory cache with such an array (carry_usable keeps carried ones out, so these come from a translator older than the runtime) and logs the first; vk_texture_register logs once, with that count, when a slot between 32768 and 40959 is registered while one is in use. The count is kept per shader in gfx_shader.c (gfx_shader_pool_short_seen) rather than per pipeline stage in spirv_pool_rebind, which runs once per module built. Diagnostics only. tests/carry_pool_check.py now also checks that pool_short_note counts only shaders of the earlier length and logs once; every runtime file compiles, with no new warnings in gfx_shader.c and vk_texture.c. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,7 +3,8 @@ earlier length (32768, vk.h VK_POOL_TEX_CARRIED) is never served, because its cl
|
||||
32768 up with slot 32767. The check cuts pool_short, carry_usable, carry_load, carry_find and carry_find_iid out of
|
||||
gfx_shader.c, compiles them against stand-ins for the disk and memory caches, and walks the lookups: a refused entry
|
||||
is freed and the lookup goes on to the next previous identity, the owned branch (gfx_shader_load_private) frees it as
|
||||
well, and entries with the current length, the sampler pool or no pool are served as before.
|
||||
well, and entries with the current length, the sampler pool or no pool are served as before. 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.
|
||||
|
||||
No GPU, no game files, any Python.
|
||||
|
||||
@@ -155,8 +156,25 @@ int main(void) {
|
||||
disk_len[0] = 32768;
|
||||
assert(!carry_find(h, &a, 1, 0) && !carry_find_iid(iid, 0, NULL) && loads == 0);
|
||||
|
||||
/* pool_short_note (what mem_insert calls for every shader entering the memory cache): only shaders with a pool
|
||||
array of the earlier length count, the first is logged, gfx_shader_pool_short_seen gives the count. */
|
||||
reset();
|
||||
printf("carry pool check: earlier-length pool translations refused and freed, the lookup goes on, others served\n");
|
||||
uint8_t k[32] = {0};
|
||||
disk_len[0] = 40960, disk_len[1] = 32768, disk_len[2] = -1;
|
||||
GfxShader *cur = disk_load(k, NULL);
|
||||
k[0] = 1;
|
||||
GfxShader *old = disk_load(k, NULL);
|
||||
k[0] = 2;
|
||||
GfxShader *none = disk_load(k, NULL);
|
||||
pool_short_note(cur), pool_short_note(none);
|
||||
assert(gfx_shader_pool_short_seen() == 0 && logs == 0);
|
||||
pool_short_note(old), pool_short_note(old);
|
||||
assert(gfx_shader_pool_short_seen() == 2 && logs == 1 && strstr(last_log, "older than this runtime"));
|
||||
shader_free(cur), shader_free(old), shader_free(none);
|
||||
|
||||
reset();
|
||||
printf("carry pool check: earlier-length pool translations refused and freed, the lookup goes on, others served; "
|
||||
"shaders of the earlier length in use counted\n");
|
||||
return 0;
|
||||
}
|
||||
'''
|
||||
|
||||
Reference in New Issue
Block a user