mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-15 19:19:58 -04:00
ac4af77973
vk_dlaa_fg_inputs hands out DLSS's new history with the frame's depth and motion, and FSR 4's and NVIDIA's frame generation pass it on, but vk_fg_frame dropped it: FSR 3.1 takes a cut only in the generation callback, which its swapchain calls later on its own thread. vk_fg_frame now notes each frame id's cut in a small ring (runtime/vk_fg_reset.h), and generate sets the callback's reset from it. A frame after one that was not prepared (the menu open, no inputs) counts as a cut too, and so does an id the ring no longer holds. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
47 lines
2.1 KiB
C
47 lines
2.1 KiB
C
// runtime/vk_fg_reset.h: the camera cut FSR 3.1 frame generation's callback is told of for a frame id. Built and run
|
|
// by tests/fg_reset_check.py; prints each failed check and exits 1 on any.
|
|
#include <pthread.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "vk_fg_reset.h"
|
|
|
|
static int fails;
|
|
#define CHECK(c, ...) do { if (!(c)) { fails++; printf("FAIL line %d: ", __LINE__); printf(__VA_ARGS__); printf("\n"); } } while (0)
|
|
|
|
static FgrRing ring;
|
|
static volatile int stop;
|
|
|
|
// Rewrites one slot over and over: frame 3, a cut, and frame 3 + FGR_SLOTS, none.
|
|
static void *writer(void *arg) {
|
|
(void)arg;
|
|
while (!stop) fgr_note(&ring, 3, 1), fgr_note(&ring, 3 + FGR_SLOTS, 0);
|
|
return NULL;
|
|
}
|
|
|
|
int main(void) {
|
|
// nothing noted: every id is a cut, id 0 and ids past the range too
|
|
CHECK(fgr_cut(&ring, 0) && fgr_cut(&ring, 1) && fgr_cut(&ring, 77), "an id never noted is a cut");
|
|
CHECK(fgr_cut(&ring, FGR_MAX_ID + 1) && fgr_cut(&ring, UINT64_MAX), "an id past the range is a cut");
|
|
// a run of frames, a cut at 40: the callback for each id gets that frame's answer
|
|
for (uint64_t f = 1; f <= 60; f++) fgr_note(&ring, f, f == 40);
|
|
int wrong = 0;
|
|
for (uint64_t f = 60 - FGR_SLOTS + 1; f <= 60; f++) wrong += fgr_cut(&ring, f) != (f == 40);
|
|
CHECK(!wrong, "%d of the last %d frames answered wrong", wrong, FGR_SLOTS);
|
|
// the callback fell behind by more than the ring: its frame's slot holds a later one, so it is a cut
|
|
CHECK(fgr_cut(&ring, 60 - FGR_SLOTS), "a frame the ring no longer holds is a cut");
|
|
CHECK(fgr_cut(&ring, 61), "a frame not noted yet is a cut");
|
|
// the id and its cut are one word: a slot rewritten on another thread never answers frame 3 with the next one's
|
|
// "no cut"
|
|
memset(&ring, 0, sizeof ring);
|
|
pthread_t t;
|
|
pthread_create(&t, NULL, writer, NULL);
|
|
int paired = 0;
|
|
for (int i = 0; i < 2000000; i++) paired += !fgr_cut(&ring, 3);
|
|
stop = 1;
|
|
pthread_join(t, NULL);
|
|
CHECK(!paired, "frame 3 was answered with the other frame's value %d times", paired);
|
|
printf(fails ? "fg_reset_check: %d failed\n" : "fg_reset_check: ok\n", fails);
|
|
return fails != 0;
|
|
}
|