mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-20 16:49:58 -04:00
Merge the fix for the see-through ground: a finalize marks only its own texture object's slots, so streamed terrain heightmaps stay current (pull request #535).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -100,7 +100,9 @@ keeps per-core data without locks and relies on that, so the host models it (`ru
|
|||||||
(`vk_exec_draw.c pool_sync`); slots that resolve alike share one lookup.
|
(`vk_exec_draw.c pool_sync`); slots that resolve alike share one lookup.
|
||||||
Finalization is retained on registered slots independently of image-cache eviction: a stale CPU-backed descriptor
|
Finalization is retained on registered slots independently of image-cache eviction: a stale CPU-backed descriptor
|
||||||
cannot recreate an image from freed storage or follow newly reused CPU bytes. Registration makes it current again;
|
cannot recreate an image from freed storage or follow newly reused CPU bytes. Registration makes it current again;
|
||||||
finalized descriptors may still follow live GPU-owned content.
|
finalized descriptors may still follow live GPU-owned content. A finalize marks only the slots its own texture
|
||||||
|
object registered (by initialization serial): the game initializes and registers the next terrain heightmap at the
|
||||||
|
storage of the previous one before it finalizes that one (`vk_texture.c vk_texture_release`).
|
||||||
- Shaders: Ampere (SM86) code is lowered to Maxwell (`tools/xlate/AmpereLowering.cs`) and translated to SPIR-V by the
|
- Shaders: Ampere (SM86) code is lowered to Maxwell (`tools/xlate/AmpereLowering.cs`) and translated to SPIR-V by the
|
||||||
pinned shader translator (`tools/vendor/ryujinx`, 1.3.2) with our patches (`tools/xlate/patches/`), built with .NET 10 NativeAOT as
|
pinned shader translator (`tools/vendor/ryujinx`, 1.3.2) with our patches (`tools/xlate/patches/`), built with .NET 10 NativeAOT as
|
||||||
`nx2navi_xlate.exe` and run as separate processes. Translations are cached on disk; shaders and pipelines seen in
|
`nx2navi_xlate.exe` and run as separate processes. Translations are cached on disk; shaders and pipelines seen in
|
||||||
|
|||||||
@@ -961,7 +961,16 @@ static int test_textures(pool_t *tpool, pool_t *phys) {
|
|||||||
const VkTexImage *renewed = vk_texture_by_id(5, NULL, NULL);
|
const VkTexImage *renewed = vk_texture_by_id(5, NULL, NULL);
|
||||||
GCHECK(renewed && renewed->format == VK_FORMAT_BC1_RGBA_UNORM_BLOCK && renewed->width == 64 && renewed->height == 48,
|
GCHECK(renewed && renewed->format == VK_FORMAT_BC1_RGBA_UNORM_BLOCK && renewed->width == 64 && renewed->height == 48,
|
||||||
"re-registered CPU slot 5 did not resolve its own descriptor");
|
"re-registered CPU slot 5 did not resolve its own descriptor");
|
||||||
|
// A release finalizes only the slots of its own texture object: another texture initialized at the same storage
|
||||||
|
// with the same parameters before the finalize keeps its slot (vk_texture_release, terrain heightmaps).
|
||||||
|
tex_t bn = b;
|
||||||
|
bn.serial = 6;
|
||||||
|
vk_texture_register(6, &bn, NULL);
|
||||||
vk_texture_release(&b);
|
vk_texture_release(&b);
|
||||||
|
const VkTexImage *kept = vk_texture_by_id(6, NULL, NULL);
|
||||||
|
GCHECK(kept && kept->width == 64 && kept->height == 48 && !vk_texture_by_id(5, NULL, NULL),
|
||||||
|
"a release finalized slot 6 of another live texture, or left its own slot 5 current");
|
||||||
|
vk_texture_release(&bn);
|
||||||
// Once the live texture at its storage holds GPU content the storage bytes lack, the finalized CPU slot follows it.
|
// Once the live texture at its storage holds GPU content the storage bytes lack, the finalized CPU slot follows it.
|
||||||
// The live texture is cleared on the GPU and noted as rendered into, as a draw into it would be; the slot's image
|
// The live texture is cleared on the GPU and noted as rendered into, as a draw into it would be; the slot's image
|
||||||
// must then show the clear, which neither the storage bytes nor a recreated image of the slot's own descriptor hold.
|
// must then show the clear, which neither the storage bytes nor a recreated image of the slot's own descriptor hold.
|
||||||
|
|||||||
@@ -1537,6 +1537,15 @@ int vk_texture_pool_fresh_locked(void) {
|
|||||||
// slot_resolve's last answer was none because of its stale rule (vk_texture_slot_retry_locked)
|
// slot_resolve's last answer was none because of its stale rule (vk_texture_slot_retry_locked)
|
||||||
static int resolve_stale;
|
static int resolve_stale;
|
||||||
|
|
||||||
|
// NX2NAVI_TRACE=perf, since the last perf line: slots a finalize marked (its own texture object's), slots at the storage
|
||||||
|
// with the same parameters registered with another texture object, which a finalize leaves current
|
||||||
|
// (vk_texture_release), and lookups the stale rule answered with the stand-in (slot_resolve). _hm: of them, the
|
||||||
|
// terrain's streamed heightmaps (R32F 260x260), whose stand-in draws a chunk of ground at height zero.
|
||||||
|
static uint64_t n_fin_own, n_fin_other, n_fin_other_hm, n_stale, n_stale_hm;
|
||||||
|
static int terrain_heightmap(const tex_t *t) {
|
||||||
|
return t->d.format == NVN_FORMAT_R32F && t->d.width == 260 && t->d.height == 260;
|
||||||
|
}
|
||||||
|
|
||||||
int vk_texture_slot_retry_locked(int id) {
|
int vk_texture_slot_retry_locked(int id) {
|
||||||
if (id < 0 || id >= ntslots || !tslots[id].used || !tslots[id].t.mem) return -1;
|
if (id < 0 || id >= ntslots || !tslots[id].used || !tslots[id].t.mem) return -1;
|
||||||
resolve_stale = 0;
|
resolve_stale = 0;
|
||||||
@@ -3545,6 +3554,11 @@ void vk_texture_release(const tex_t *t) {
|
|||||||
// Staleness belongs to the registered descriptor, not the cached image: a released Tex can be destroyed before the
|
// Staleness belongs to the registered descriptor, not the cached image: a released Tex can be destroyed before the
|
||||||
// slot looks again (eviction, the released cap, start_at for a mirrored one). A registered texture may also be
|
// slot looks again (eviction, the released cap, start_at for a mirrored one). A registered texture may also be
|
||||||
// finalized before its image is created.
|
// finalized before its image is created.
|
||||||
|
// Only the slots this texture object registered (its initialization serial): a slot registered with another
|
||||||
|
// texture initialized at the same storage with the same parameters names that one, which is still live. Ocarina
|
||||||
|
// streams terrain heightmaps (R32F 260x260) through a fixed set of storage and initializes and registers the next
|
||||||
|
// chunk's texture there before it finalizes the previous one; finalizing the new registration left the slot stale,
|
||||||
|
// the draws sampled the zero stand-in, and the chunk was drawn at height zero, tens of metres below the ground.
|
||||||
int changed = 0;
|
int changed = 0;
|
||||||
if (sinfo)
|
if (sinfo)
|
||||||
for (int id = bucket_head[agen_idx(k.addr)]; id >= 0; id = slot_next[id]) {
|
for (int id = bucket_head[agen_idx(k.addr)]; id >= 0; id = slot_next[id]) {
|
||||||
@@ -3552,7 +3566,13 @@ void vk_texture_release(const tex_t *t) {
|
|||||||
if (s->finalized || (uintptr_t)s->t.mem != k.addr) continue;
|
if (s->finalized || (uintptr_t)s->t.mem != k.addr) continue;
|
||||||
TexKey sk;
|
TexKey sk;
|
||||||
make_key(&s->t, &sk);
|
make_key(&s->t, &sk);
|
||||||
if (!memcmp(&sk, &k, sizeof k)) s->finalized = 1, s->ce = NULL, changed = 1;
|
if (memcmp(&sk, &k, sizeof k)) continue;
|
||||||
|
if (s->t.serial != t->serial) { // another texture object's registration: it stays current
|
||||||
|
n_fin_other++, n_fin_other_hm += terrain_heightmap(&s->t);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
s->finalized = 1, s->ce = NULL, changed = 1;
|
||||||
|
n_fin_own++;
|
||||||
}
|
}
|
||||||
if (e && !e->released) {
|
if (e && !e->released) {
|
||||||
mark_released(e);
|
mark_released(e);
|
||||||
@@ -3701,7 +3721,7 @@ static Tex *slot_resolve(TexSlot *s, view_t *view, int *has_view) {
|
|||||||
// after its released image was evicted; registering the descriptor again makes it current.
|
// after its released image was evicted; registering the descriptor again makes it current.
|
||||||
if (!e && any) e = any;
|
if (!e && any) e = any;
|
||||||
else if (!e && !cpu_slot) e = own && own->superseded ? NULL : own; // a superseded one: entry_of takes it back
|
else if (!e && !cpu_slot) e = own && own->superseded ? NULL : own; // a superseded one: entry_of takes it back
|
||||||
else if (!e && cpu_slot && s->finalized) stale = 1;
|
else if (!e && cpu_slot && s->finalized) stale = 1, n_stale++, n_stale_hm += terrain_heightmap(&s->t);
|
||||||
}
|
}
|
||||||
resolve_stale = stale;
|
resolve_stale = stale;
|
||||||
if (!e && s->t.mem && !stale) {
|
if (!e && s->t.mem && !stale) {
|
||||||
@@ -3957,6 +3977,12 @@ void vk_texture_new_submit(void) {
|
|||||||
(unsigned long long)n_mark_empty, (unsigned long long)n_mark_none);
|
(unsigned long long)n_mark_empty, (unsigned long long)n_mark_none);
|
||||||
memset(n_drop_by, 0, sizeof n_drop_by), memset(n_cpu_empty, 0, sizeof n_cpu_empty);
|
memset(n_drop_by, 0, sizeof n_drop_by), memset(n_cpu_empty, 0, sizeof n_cpu_empty);
|
||||||
n_mark_empty = n_mark_none = 0;
|
n_mark_empty = n_mark_none = 0;
|
||||||
|
rt_log("perf: frame %llu: texture finalizes: slots marked %llu; slots of another live texture with the same "
|
||||||
|
"parameters at the storage, left current %llu (terrain heightmaps %llu); lookups the stale rule gave the "
|
||||||
|
"stand-in %llu (terrain heightmaps %llu)", (unsigned long long)f * 60, (unsigned long long)n_fin_own,
|
||||||
|
(unsigned long long)n_fin_other, (unsigned long long)n_fin_other_hm, (unsigned long long)n_stale,
|
||||||
|
(unsigned long long)n_stale_hm);
|
||||||
|
n_fin_own = n_fin_other = n_fin_other_hm = n_stale = n_stale_hm = 0;
|
||||||
if (split_mode > 0)
|
if (split_mode > 0)
|
||||||
rt_log("perf: frame %llu: split fill: entries the CPU does not write started with their storage's bytes: "
|
rt_log("perf: frame %llu: split fill: entries the CPU does not write started with their storage's bytes: "
|
||||||
"copied from the released entry they replaced %llu, filled from storage %llu (%.1f MiB, %.2f ms), "
|
"copied from the released entry they replaced %llu, filled from storage %llu (%.1f MiB, %.2f ms), "
|
||||||
|
|||||||
Reference in New Issue
Block a user