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

Route present_image's fence-wait results through the lost-device check, cap their lines, and skip a capture whose wait failed.

Browse Source 
present_image's 5 s wait for the slot's fence passed its result to nothing but a "present fence wait timed out" line.
A lost device was reported as a timeout, and since a lost device's wait returns at once, the line repeated at the
game's present rate until another thread noticed the loss. A GPU hung but not lost repeated the line every 5 s with no
cap. The result now goes to vk_device_lost_check first. The line says whether the wait timed out or failed, with its
code and count, for the first 8 times and at each doubling.

An acquire answering an error other than OUT_OF_DATE (VK_ERROR_SURFACE_LOST_KHR, say) skipped the frame without a
word. Each such code is now logged once. Making the surface again would be presentation and device work and is left
alone.

The capture path waited for the slot's fence and then read the read-back buffer whatever the wait returned:
save_capture and grab_deliver could copy a frame the GPU had not finished. A failed wait now goes to
vk_device_lost_check, marks no capture valid, and ends a pending grab with no pixels, as the no-buffer path does.

Not reproduced before the change: the fresh logs have no such line. Checks that passed: pass_cc_check on
gfx_present.c, no new -Wall -Wextra warnings.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-13 17:19:21 -05:00
parent c0f8a3224d
commit 68bc197393
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/gfx_present.c
View File

@@ -1537,8 +1537,15 @@ static void present_image(VkImage src, VkImageLayout layout, VkFormat fmt, int w
if (wsys_minimized() || !g_sc) goto out;
unsigned slot = g_frame % FRAMES;
if (vkWaitForFences(c->device, 1, &g_fence[slot], VK_TRUE, 5000000000ull) != VK_SUCCESS) {
rt_log("gfx: present fence wait timed out");
VkResult fw = vkWaitForFences(c->device, 1, &g_fence[slot], VK_TRUE, 5000000000ull);
if (fw != VK_SUCCESS) {
// A lost device ends the run here as anywhere else; a hung GPU times out at every present, so the line is
// kept to the first 8 and each doubling.
vk_device_lost_check(fw, "the present slot's fence wait");
static uint32_t n_fw;
if (++n_fw <= 8 || !(n_fw & (n_fw - 1)))
rt_log("gfx: present fence wait %s (%d), the frame is skipped: %u times so far",
fw == VK_TIMEOUT ? "timed out" : "failed", (int)fw, n_fw);
goto out;
}
pts_read(c, slot); // the GPU timeline (vk_gtl_note): this slot's last present is done
@@ -1570,6 +1577,17 @@ static void present_image(VkImage src, VkImageLayout layout, VkFormat fmt, int w
} else {
n_timeouts = 0;
}
if (r < 0 && r != VK_ERROR_OUT_OF_DATE_KHR) { // an error (the surface lost, say), logged once per code
static VkResult seen[8];
static int nseen;
int k = 0;
while (k < nseen && seen[k] != r) k++;
if (k == nseen && nseen < 8) {
seen[nseen++] = r;
rt_log("gfx: the acquire of a swapchain image failed (%d%s): the frame is skipped", (int)r,
r == VK_ERROR_SURFACE_LOST_KHR ? ", the window's surface is lost" : "");
}
}
if (r != VK_SUCCESS && r != VK_SUBOPTIMAL_KHR) goto out;
if (r == VK_SUBOPTIMAL_KHR) plat_xchg32(&g_dirty, 1);
vkResetFences(c->device, 1, &g_fence[slot]);
@@ -1780,8 +1798,18 @@ static void present_image(VkImage src, VkImageLayout layout, VkFormat fmt, int w
plat_xchg32(&g_dirty, 1);
}
g_frame++;
if (cap) {
vkWaitForFences(c->device, 1, &g_fence[slot], VK_TRUE, 5000000000ull);
VkResult cap_r = cap ? vkWaitForFences(c->device, 1, &g_fence[slot], VK_TRUE, 5000000000ull) : VK_SUCCESS;
if (cap && cap_r != VK_SUCCESS) { // the read-back buffer may not hold this frame yet: nothing reads it
vk_device_lost_check(cap_r, "the wait for a captured frame");
g_cap_valid = 0;
static int logged;
if (logged++ < 8) rt_log("gfx: the wait for a captured frame ended with %d: no capture this frame", (int)cap_r);
if (grab) {
void (*cb)(VkGrab *g, void *ctx) = g_grab_cb;
g_grab_cb = NULL;
cb(NULL, g_grab_ctx);
}
} else if (cap) {
vmaInvalidateAllocation(c->vma, g_cap_alloc, 0, VK_WHOLE_SIZE);
g_cap_w = (int)g_sc_ext.width;
g_cap_h = (int)g_sc_ext.height;