From 922e364f50439cf1a77786530f1eff03c52990a5 Mon Sep 17 00:00:00 2001 From: Tobim6 <102646588+Tobim6@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:23:21 +0100 Subject: [PATCH] Staged mirror uploads: device address table readers noted at every bind gpl noted them in ssbo_info, which the bind skip and the kept descriptors leave out once they have warmed up: the submissions were taken as reading no guest memory again, and the grass and moss flickered again after a minute of play (every submit wait of a 2100-frame run ended without the GPU). gpa_reader looks once per pipeline for a table binding and notes the submission at each bind_resources and mo_desc. Co-Authored-By: Claude Opus 5.5 --- runtime/vk.h | 2 ++ runtime/vk_exec_draw.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/runtime/vk.h b/runtime/vk.h index 6bf6cef8..ddbb5b61 100644 --- a/runtime/vk.h +++ b/runtime/vk.h @@ -880,6 +880,8 @@ typedef struct { // mesh stages are compute pipelines of the same layout, vk_pipeline_mesh_emu), and set 0's compute-side template. int emu; VkDescriptorUpdateTemplate emu_tpl_c; + int8_t gpa; // vk_exec_draw.c gpa_reader: 0 not known yet, 1 no binding of the device + // address table, 2 one (its draws read guest memory as the GPU runs) } VkPipeInfo; // One descriptor of the packed array a descriptor update template reads (VkPipeInfo.tpl), 24 bytes for every type; the // bytes a type leaves unused are zero, so equal descriptors compare equal byte for byte. diff --git a/runtime/vk_exec_draw.c b/runtime/vk_exec_draw.c index 596c978e..84a9c7ae 100644 --- a/runtime/vk_exec_draw.c +++ b/runtime/vk_exec_draw.c @@ -1550,6 +1550,7 @@ static VkDescriptorBufferInfo ssbo_info(VkExec *ex, int st, const GfxShaderRes * // (NX2NAVI_MIRROR_STAGE) ended the wait once the replay had submitted, and the game wrote the next frame's // instances while the GPU still drew from them: the small grass and moss, which reach their instances through // the table, flickered and slid over the ground as the camera turned (RX 580, Kokiri Forest, 2026-11-11). + // Not every bind comes here (the bind skip, the kept descriptors): gpa_reader notes it at each bind. vk_mem_note_live(); VkDescriptorBufferInfo t = vk_gpa_info(); return t.buffer ? t : (VkDescriptorBufferInfo){Z.zbuf, 0, VK_WHOLE_SIZE}; @@ -3478,7 +3479,29 @@ static void write_set(const VkPipeInfo *info, uint32_t s, VkDescriptorSet set, c // template reads directly (VkPipeInfo.tpl); write structs are filled only when a set has no template. static _Thread_local const VkDescSlot *emu_d; // set 0's descriptors of the last bind_resources build (mesh emulation) static uint32_t emu_d_bytes; +// A pipeline that binds the device address table reads what it names, mostly guest memory itself (pools without a +// mirror), as the GPU runs: the submission's submit wait is the GPU's (vk_mem_take_live). Without this the staged mirror +// uploads (NX2NAVI_MIRROR_STAGE) ended the wait once the replay had submitted, and the game wrote the next frame's +// instances while the GPU still drew from them: the small grass and moss, which reach their instances through the +// table, flickered and slid over the ground as the camera turned (RX 580, Kokiri Forest, 2026-11-11). Noted at every +// bind, before the bind skip and the kept descriptors (bind_sig, pb_take), which leave ssbo_info out: noted only there, +// it was missed once those had warmed up, and the flicker came back after a minute of play. +// the pipeline's binding list holds a table binding +static void gpa_reader(const VkPipeInfo *info) { + int8_t g = __atomic_load_n(&info->gpa, __ATOMIC_RELAXED); // the replay workers bind too + if (!g) { + g = 1; + for (uint32_t i = 0; i < info->n_bindings && g == 1; i++) { + const VkPipeBinding *b = &info->bindings[i]; + if (b->kind == GFX_RES_SSBO && b->res && b->res->cbuf_slot == VK_GPA_CB_SLOT) g = 2; + } + __atomic_store_n(&((VkPipeInfo *)info)->gpa, g, __ATOMIC_RELAXED); + } + if (g == 2) vk_mem_note_live(); +} + static void bind_resources(VkExec *ex, const VkPipeInfo *info) { + gpa_reader(info); DrawCtx *const cx = ex->dc; VkWriteDescriptorSet *w = cx->bind_w; VkDescSlot *d = cx->bind_d; @@ -4657,6 +4680,7 @@ static VkWriteDescriptorSet mo_write(const VkPipeBinding *b, const VkDescSlot *d // would hold the same); a pushed set is pushed by mo_emit. 0 for a pipeline with storage buffers, images or texel // buffers (not drawn again). static int mo_desc(VkExec *ex, const VkPipeInfo *info, MoDraw *q) { + gpa_reader(info); if (info->n_bindings > MAX_BINDINGS || info->pool) return 0; uint32_t total = 0; for (uint32_t i = 0; i < info->n_bindings; i++) total += info->bindings[i].count ? info->bindings[i].count : 1;