mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-16 18:09:58 -04:00
Give the upscalers' device-idle waits and their releases perf marks of their own, so a slow frame's line names them.
The twelve places where DLSS (vk_dlaa.c) and FSR 3.1 and FSR 4 (vk_ffx.cpp, vk_ffx4.cpp context_for) wait for the whole device to be idle before they free what the GPU may still use go through one function, vk_upscaler_device_idle, which NX2NAVI_TRACE=perf times as "upscaler device waits". The releases of DLSS features and of FSR contexts are timed as "upscaler releases". These waits run on the replaying thread with the queue lock held, so the present's flip, the completion thread's hold release and upload submits wait with them at each pause-screen size, reload, window size or mode change; until now only the "DLSS feature creates" mark saw one of them, the wait in release_kept, which it summed with the create. That mark now times the create alone. Diagnostics only: nothing waits or frees differently. stutter_map_check, stutter_hitch_check, frame_step_check and fg_reset_check passed; every runtime file compiles, the changed ones with -Wall -Wextra and no warning. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -141,7 +141,9 @@ const uint64_t UP_IDLE_NS = 90ull * 1000000000ull;
|
||||
|
||||
void destroy_up(Up *u, const char *why) {
|
||||
rt_log("ffx: the FSR 3.1 context for %ux%u (render sizes up to %ux%u) destroyed: %s", u->ow, u->oh, u->mw, u->mh, why);
|
||||
uint64_t t0 = perf_mark_begin(); // NX2NAVI_TRACE=perf: "upscaler releases"
|
||||
A.destroy(&u->ctx, nullptr);
|
||||
perf_mark_end(PERF_M_UPREL, t0, 0);
|
||||
*u = Up();
|
||||
}
|
||||
|
||||
@@ -195,7 +197,7 @@ Up *context_for(uint32_t w, uint32_t h, uint32_t ow, uint32_t oh) {
|
||||
int waited = 0;
|
||||
for (Up &u : U) // the contexts of this output size for another render size, once no command buffer holds them
|
||||
if (u.ctx && &u != found && u.ow == ow && u.oh == oh && up_tick - u.used >= UP_RECENT) {
|
||||
if (!waited++) vk_queue_lock(), vkDeviceWaitIdle(c->device), vk_queue_unlock(); // their work may be in flight
|
||||
if (!waited++) vk_upscaler_device_idle(); // their work may be in flight
|
||||
destroy_up(&u, "the render size changed");
|
||||
}
|
||||
if (found) {
|
||||
@@ -211,7 +213,7 @@ Up *context_for(uint32_t w, uint32_t h, uint32_t ow, uint32_t oh) {
|
||||
if (up_tick - u.used >= UP_RECENT && (!lru || u.used < lru->used)) lru = &u;
|
||||
}
|
||||
if (!slot && lru) {
|
||||
vk_queue_lock(), vkDeviceWaitIdle(c->device), vk_queue_unlock(); // its work may still be in flight
|
||||
vk_upscaler_device_idle(); // its work may still be in flight
|
||||
destroy_up(lru, "its slot went to another output size");
|
||||
slot = lru;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user