From cedee5ceff5c0dff77d8d196176019ad9bc8b86a Mon Sep 17 00:00:00 2001 From: chrg6 Date: Sat, 7 Nov 2026 13:33:42 -0500 Subject: [PATCH] Menu: sharpness works under FSR 3.1 too, and frame generation asks for a DLSS or FSR 3.1 mode first. Co-Authored-By: Claude Opus 5.5 --- runtime/ui/menu.cpp | 8 ++++++-- runtime/ui_text.c | 3 ++- runtime/ui_text.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index 766e3f79..61f4bb96 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -773,6 +773,8 @@ static void row_hdr(void) { // Frame generation (vk_fg.cpp), after a restart; it needs a temporal upscaler's motion vectors static void row_framegen(void) { + // the generated frames are made from DLSS's or FSR 3.1's motion vectors: without one of them it would do nothing + if (!cfg_bool("NX2NAVI_DLAA")) opt_disable_next(UI_MENU_FRAMEGEN_NEEDS); static const char *const values[] = {"off", "fsr3", "dlss"}; const char *names[] = {menu_text(UI_MENU_FRAMEGEN_OFF), "AMD FSR 3.1", "NVIDIA DLSS"}; const char *v = cfg_value("NX2NAVI_FRAMEGEN"); @@ -812,8 +814,10 @@ static void tab_screen(float scale) { row_upscaling(); row_framegen(); row_hdr(); - // RCAS runs only under FSR (vk_fsr.c vk_fsr_record): with bilinear or DLSS the slider would do nothing - if (strcmp(cfg_value("NX2NAVI_UPSCALER"), "fsr") || cfg_bool("NX2NAVI_DLAA")) opt_disable_next(UI_MENU_SHARPNESS_NEEDS_FSR); + // The sharpening runs under FSR 1 (vk_fsr.c vk_fsr_record, RCAS) and FSR 3.1 (vk_ffx.cpp, its own RCAS); with + // bilinear or DLSS the slider would do nothing + int dl = cfg_bool("NX2NAVI_DLAA"), fsr3 = dl && !strcmp(cfg_value("NX2NAVI_TAA"), "fsr3"); + if (!fsr3 && (strcmp(cfg_value("NX2NAVI_UPSCALER"), "fsr") || dl)) opt_disable_next(UI_MENU_SHARPNESS_NEEDS_FSR); opt_slider("NX2NAVI_SHARPNESS", UI_MENU_SHARPNESS, 0, 100, UI_MENU_SHARPNESS_DESC, 5, "%.0f %%"); static const UiTextId aspect[] = {UI_MENU_ASPECT_FIT, UI_MENU_ASPECT_STRETCH}; opt_choice("NX2NAVI_ASPECT", UI_MENU_ASPECT, aspect, 2, UI_MENU_ASPECT_DESC); diff --git a/runtime/ui_text.c b/runtime/ui_text.c index f6d03a0f..b57a74c9 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -100,7 +100,7 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_MENU_SHARPNESS] = "FSR sharpness", [UI_MENU_SHARPNESS_DESC] = "Sharpening after FSR scaling, also when the picture is shrunk to the window; 0 turns it " "off.", - [UI_MENU_SHARPNESS_NEEDS_FSR] = "only with AMD FSR 1", + [UI_MENU_SHARPNESS_NEEDS_FSR] = "only with AMD FSR 1 or FSR 3.1", [UI_MENU_COLOR] = "Colour", [UI_MENU_COLOR_PRESET] = "Colour profile", [UI_MENU_COLOR_PRESET_DESC] = "Sets the four values below. Vivid: more contrast and saturation, shadows opened a " @@ -527,6 +527,7 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_MENU_HDR_NOTE] = "after restart", [UI_MENU_HDR_ENHANCED] = "Enhanced", [UI_MENU_HDR_NATIVE] = "Native (the game's)", [UI_MENU_FRAMEGEN_NOTE] = "after restart; needs DLSS or FSR 3.1", + [UI_MENU_FRAMEGEN_NEEDS] = "choose a DLSS or FSR 3.1 mode under Upscaling first", [UI_MENU_GAME_RES] = "Resolution", [UI_MENU_GAME_RES_DESC] = "The height of the game's picture: 1440p is the game's own; higher draws a sharper picture " "and its scene in proportion, at a matching cost on the graphics card. Native: the " diff --git a/runtime/ui_text.h b/runtime/ui_text.h index 5f65f576..d16f68ab 100644 --- a/runtime/ui_text.h +++ b/runtime/ui_text.h @@ -244,7 +244,7 @@ typedef enum { // the settings menu's Picture rows for this game (ui/menu.cpp tab_screen): one upscaling choice (bilinear, FSR 1 // or a DLSS mode) and the picture's resolution UI_MENU_UPSCALING, UI_MENU_UPSCALING_DESC, UI_MENU_UPSCALING_DLSS_NOTE, UI_MENU_FRAMEGEN, UI_MENU_FRAMEGEN_DESC, - UI_MENU_FRAMEGEN_OFF, UI_MENU_FRAMEGEN_NOTE, UI_MENU_HDR_NOTE, UI_MENU_HDR_ENHANCED, UI_MENU_HDR_NATIVE, + UI_MENU_FRAMEGEN_OFF, UI_MENU_FRAMEGEN_NOTE, UI_MENU_FRAMEGEN_NEEDS, UI_MENU_HDR_NOTE, UI_MENU_HDR_ENHANCED, UI_MENU_HDR_NATIVE, UI_MENU_GAME_RES, UI_MENU_GAME_RES_DESC, UI_MENU_GAME_RES_NATIVE, UI_TEXT_COUNT } UiTextId;