mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-16 11:49:59 -04:00
Let frame generation run without a temporal upscaler, from inputs made for it alone.
With frame generation running and no DLSS or FSR upscaling, vk_dlaa.c arms and ends the frame in the same places and, where the upscaler's evaluation would run, makes only frame generation's inputs (fg_only_frame): the scene's depth and camera found as before, motion vectors from the same pass at the scene's size, no jitter at all, and the picture without the HUD copied from the game's own scaled picture. DLSS Frame Generation and AMD's frame generation no longer need an upscaler set; NVIDIA's through NGX still needs DLSS at the start and then keeps running when the upscaler is switched off. The menu's Frame generation row stays usable with every Upscaling choice and the Upscaling row keeps frame generation as set, with texts in all four menu languages. The log says at the start and at each change whether frame generation takes its inputs from the upscaler or runs without one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -4,9 +4,9 @@
|
||||
// queue and pacing threads, so the screen shows twice the game's frame rate.
|
||||
//
|
||||
// The generated frame is built from the presented picture and the scene's depth and camera motion vectors, which
|
||||
// vk_dlaa.c makes for DLSS and FSR 3.1 upscaling: frame generation needs one of those on (DLAA or Native AA included).
|
||||
// The HUD is interpolated with the picture (it hardly moves); the menu is not, since generation pauses while it is
|
||||
// open. The device creates two more queues of the graphics family for it (vk_device.c, vk_fg_queue_count).
|
||||
// vk_dlaa.c makes for DLSS and FSR 3.1 upscaling, and without an upscaler for frame generation alone (vk_dlaa.c
|
||||
// fg_only_frame: the same pass at the scene's size, no jitter). The HUD is kept out through the picture without it
|
||||
// (vk_dlaa.c hudless); the menu is not generated, since generation pauses while it is open. The device creates two more queues of the graphics family for it (vk_device.c, vk_fg_queue_count).
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
@@ -86,8 +86,8 @@ void fail(const char *what, unsigned r) {
|
||||
} // namespace
|
||||
|
||||
// Follows the setting: gfx_present.c's window_settings_live remakes the swapchain when this stops matching vk_fg_active.
|
||||
// It needs DLSS's or FSR 3.1's motion vectors, so it also needs one of them on, and the FSR 3.1 library: a build
|
||||
// without it keeps the plain swapchain whatever the setting says, with one line in the log. Not on a device made through
|
||||
// With or without an upscaler (vk_dlaa.c makes the motion vectors either way, fg_only_frame), and with the FSR 3.1
|
||||
// library: a build without it keeps the plain swapchain whatever the setting says, with one line in the log. Not on a device made through
|
||||
// Streamline's proxies (NVIDIA's frame generation set at the start, vk_dlssg_dpa): AMD's swapchain there crashed in
|
||||
// NVIDIA's driver when the menu switched from NVIDIA's frame generation to AMD's. That switch waits for a restart,
|
||||
// as the menu says (menu.cpp row_framegen). Not after a failure (fail): the present code then takes AMD's swapchain
|
||||
@@ -97,13 +97,14 @@ void fail(const char *what, unsigned r) {
|
||||
// setting asks for it while FSR 4 is the upscaler (use4). The swapchain in place is wanted only while its library is
|
||||
// still the one to use: a change of that setting or of the upscaler between FSR 3.1 and FSR 4, or a failure of the SDK
|
||||
// 2.4 path, takes it down as switching frame generation off does, and the next present makes it with the other library.
|
||||
// FSR 4 is the upscaler only while one is set (dlaa): without an upscaler the FSR 3.1 library's runs.
|
||||
static int use4(void) { // NX2NAVI_FSR4_FG (default 0, live): 1 takes the SDK 2.4's frame generation with FSR 4
|
||||
return cfg_bool("NX2NAVI_FSR4_FG") && vk_ffx_fsr4() && !vk_fg4_failed() && vk_fg4_available();
|
||||
return cfg_bool("NX2NAVI_FSR4_FG") && cfg_bool("NX2NAVI_DLAA") && vk_ffx_fsr4() && !vk_fg4_failed() &&
|
||||
vk_fg4_available();
|
||||
}
|
||||
|
||||
extern "C" int vk_fg_wanted(void) {
|
||||
if (strcmp(cfg_value("NX2NAVI_FRAMEGEN"), "fsr3") || !cfg_bool("NX2NAVI_DLAA") || !vk_dlaa_wanted() || vk_dlssg_dpa())
|
||||
return 0;
|
||||
if (strcmp(cfg_value("NX2NAVI_FRAMEGEN"), "fsr3") || vk_dlssg_dpa()) return 0;
|
||||
int four = use4();
|
||||
if (vk_fg4_active()) return four;
|
||||
if (F.sc) return !F.failed && !four;
|
||||
@@ -229,8 +230,8 @@ extern "C" void vk_fg_frame(VkCommandBuffer cb, VkSwapchainKHR sc, VkFormat fmt,
|
||||
float jx = 0, jy = 0;
|
||||
int reset = 0;
|
||||
int have = vk_dlaa_fg_inputs(&depth, &mv, &jx, &jy, &reset);
|
||||
// The context's largest render size covers the depth and motion vectors it is given. They have the scene's size,
|
||||
// which DLAA and the widescreen pictures make larger than the window, and a context made for the window's size alone
|
||||
// The context's largest render size covers the depth and motion vectors it is given. They have the scene's size
|
||||
// (with an upscaler or without), which DLAA and the widescreen pictures make larger than the window, and a context made for the window's size alone
|
||||
// wrote past its own resources: a crash in amd_fidelityfx_vk.dll, device faults, striped frames. The scene is never
|
||||
// larger than the picture (widescreen.c wide_picture), so the context is made for that once; remaking it while the
|
||||
// swapchain still generated from the old one hung the present. A frame with a larger depth anyway is not generated.
|
||||
@@ -282,7 +283,7 @@ extern "C" void vk_fg_frame(VkCommandBuffer cb, VkSwapchainKHR sc, VkFormat fmt,
|
||||
else if (!hudless) F.no_hudless++;
|
||||
else if (!on) F.paused++;
|
||||
F.frame++;
|
||||
// A cut: DLSS started a new history (vk_dlaa_fg_inputs), or the frame before was not prepared (generation off for
|
||||
// A cut: DLSS started a new history, or without an upscaler the same cases did (vk_dlaa_fg_inputs), or the frame before was not prepared (generation off for
|
||||
// the menu, no inputs), so the frame between the two would be made from a stale depth and motion
|
||||
fgr_note(&F.cuts, F.frame, reset || !F.prepared);
|
||||
if ((reset || !F.prepared) && on) F.cut_frames++;
|
||||
|
||||
Reference in New Issue
Block a user