mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-15 19:19:58 -04:00
Merge the menu's Window size and Resolution rows into one Resolution row, and name FSR 4 by the version the driver runs.
The Resolution row lists each picture height as the size of the game's shape at it (21:9: 2560 x 1080, 3440 x 1440, 4300 x 1800, ...; the window's own shape where the picture follows the window) and sets both the picture's height and the window outside fullscreen, which follows at once within the monitor; the picture's height takes effect after a restart as before, and Native leaves the window as it is. A build without the widescreen patch sets, which draws the game's own size, keeps the Window size row. The Upscaling rows and the overlay name FSR 4 by the major and minor version of the provider the driver lists (AMD FSR 4.1 for 4.1.2), and AMD FSR 4 until the library was asked. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -77,6 +77,7 @@ int vk_ffx_framegen_available(void); // ... and FSR 3.1 frame generation
|
||||
int vk_ffx4_available(void); // vk_ffx4.cpp: AMD's FSR 4 runs on this device (its libraries, card and driver)
|
||||
int vk_ffx_fsr4(void); // vk_ffx.cpp: ... and the setting asks for it (NX2NAVI_FSR4)
|
||||
void vk_ffx4_retry(void); // vk_ffx4.cpp: FSR 4 chosen again after failures that turned it off
|
||||
const char *vk_ffx4_name(void); // vk_ffx4.cpp: "AMD FSR 4.1.2" once the driver's library was asked
|
||||
int vk_fg4_available(void); // vk_fg4.cpp: the frame generation of AMD's FSR 4 library runs on this device
|
||||
int vk_fg4_failed(void); // ... it failed in this run, FSR 3.1's generates the frames
|
||||
int vk_fg4_active(void); // ... its swapchain is in place
|
||||
@@ -892,6 +893,17 @@ static bool dlss_offered(void) {
|
||||
// for the mode (vk_dlaa.c evaluate, dlss_preset at its default). The list: bilinear, FSR 1, the DLSS modes where DLSS
|
||||
// runs (dlss_offered), the FSR 3.1 modes where FSR 3.1 loads (vk_ffx_available); a DLSS or FSR 3.1 mode still set where
|
||||
// it does not run stays listed last until another choice replaces it, so the row shows what is set.
|
||||
// FSR 4's name in the Upscaling row and the overlay: the version the driver's library runs to its minor number, as
|
||||
// AMD names its releases ("AMD FSR 4.1" for 4.1.2); "AMD FSR 4" until the library was asked (vk_ffx4_available).
|
||||
static const char *fsr4_label(void) {
|
||||
static char s[32];
|
||||
const char *v = strstr(vk_ffx4_name(), "FSR ");
|
||||
int major = 0, minor = 0;
|
||||
if (v && sscanf(v + 4, "%d.%d", &major, &minor) == 2 && major >= 4) snprintf(s, sizeof s, "AMD FSR %d.%d", major, minor);
|
||||
else snprintf(s, sizeof s, "AMD FSR 4");
|
||||
return s;
|
||||
}
|
||||
|
||||
// The Upscaling row's name of what is set now, for the performance overlay.
|
||||
static void upscaling_name(char *out, size_t size) {
|
||||
static const char *const modes[] = {"dlaa", "quality", "balanced", "performance", "ultra_performance"};
|
||||
@@ -907,7 +919,7 @@ static void upscaling_name(char *out, size_t size) {
|
||||
for (int i = 0; i < 5; i++)
|
||||
if (!strcmp(cfg_value("NX2NAVI_DLSS"), modes[i])) mode = i;
|
||||
if (!strcmp(cfg_value("NX2NAVI_TAA"), "fsr3"))
|
||||
snprintf(out, size, vk_ffx_fsr4() ? "AMD FSR 4 %s" : "AMD FSR 3.1 %s", menu_text(fsr3[mode]));
|
||||
snprintf(out, size, "%s %s", vk_ffx_fsr4() ? fsr4_label() : "AMD FSR 3.1", menu_text(fsr3[mode]));
|
||||
else snprintf(out, size, mode ? "DLSS %s" : "NVIDIA %s", menu_text(dlss[mode]));
|
||||
}
|
||||
|
||||
@@ -937,7 +949,7 @@ static void row_upscaling(void) {
|
||||
else {
|
||||
char *t = text[(kind == FSR4 ? 10 : kind == FSR3 ? 5 : 0) + mode];
|
||||
if (kind == DLSS) snprintf(t, sizeof text[0], mode ? "DLSS %s" : "NVIDIA %s", menu_text(mode_names[mode]));
|
||||
else snprintf(t, sizeof text[0], kind == FSR4 ? "AMD FSR 4 %s" : "AMD FSR 3.1 %s", menu_text(fsr_names[mode]));
|
||||
else snprintf(t, sizeof text[0], "%s %s", kind == FSR4 ? fsr4_label() : "AMD FSR 3.1", menu_text(fsr_names[mode]));
|
||||
names[n] = t;
|
||||
}
|
||||
n++;
|
||||
@@ -1170,17 +1182,62 @@ static void row_framegen(void) {
|
||||
else if (cur == 2 && upscaled && dlss) row_framegen_mult(restart);
|
||||
}
|
||||
|
||||
// The picture's height (widescreen.c picture_height): 1080, the game's 1440 or more.
|
||||
static void row_game_res(void) {
|
||||
static const char *const values[] = {"1080", "1440", "1800", "2160", "2880", "window"};
|
||||
const char *names[] = {"1080p", "1440p", "1800p", "2160p (4K)", "2880p (5K)", menu_text(UI_MENU_GAME_RES_NATIVE)};
|
||||
opt_choice_list("NX2NAVI_GAME_RES", UI_MENU_GAME_RES, values, names, 6, UI_MENU_GAME_RES_DESC);
|
||||
// One Resolution row for the picture's height (NX2NAVI_GAME_RES, widescreen.c picture_height: 1080, the game's 1440 or
|
||||
// more) and the window outside fullscreen (NX2NAVI_WINDOW_SIZE): each height is shown as the size of the game's shape at
|
||||
// it (16:9 2560 x 1440, 21:9 3440 x 1440, 32:9 5120 x 1440, the window's own shape where the picture follows the window),
|
||||
// and choosing one sets both. The window takes it at once (gfx_present.c applies a changed size at the next present),
|
||||
// within the monitor, and the picture after a restart. Native draws at the window's size and leaves the window as it is.
|
||||
// As two rows of their own, a window of one size took a picture of another and scaled it for nothing.
|
||||
static void row_resolution(void) {
|
||||
static const int heights[] = {1080, 1440, 1800, 2160, 2880};
|
||||
static const int wide169[] = {1920, 2560, 3200, 3840, 5120}, wide219[] = {2560, 3440, 4300, 5120, 6880},
|
||||
wide329[] = {3840, 5120, 6400, 7680, 10240};
|
||||
enum { N = sizeof heights / sizeof *heights };
|
||||
const char *aspect = cfg_value("NX2NAVI_GAME_ASPECT");
|
||||
int mw = 0, mh = 0, ww = 0, wh = 0;
|
||||
int have_mon = gfx_window_monitor_size(&mw, &mh) && mw > 0 && mh > 0;
|
||||
int have_win = sscanf(cfg_value("NX2NAVI_WINDOW_SIZE"), "%dx%d", &ww, &wh) == 2 && ww > 0 && wh > 0;
|
||||
// the window's shape where the picture follows it: the monitor's in fullscreen, else the window's own
|
||||
double shape = cfg_bool("NX2NAVI_FULLSCREEN") && have_mon ? (double)mw / mh : have_win ? (double)ww / wh : 16.0 / 9.0;
|
||||
static char sizes[N][24], names[N + 1][48];
|
||||
const char *pn[N + 1];
|
||||
for (int i = 0; i < N; i++) {
|
||||
int w = !strcmp(aspect, "21:9") ? wide219[i] : !strcmp(aspect, "32:9") ? wide329[i] :
|
||||
!strcmp(aspect, "window") ? ((int)(heights[i] * shape + 0.5) & ~1) : wide169[i];
|
||||
int h = heights[i], fw = w, fh = h;
|
||||
// the window within the monitor, in the same shape (the picture keeps its height and is scaled into it)
|
||||
if (have_mon && (fw > mw || fh > mh)) {
|
||||
double k = (double)mw / fw < (double)mh / fh ? (double)mw / fw : (double)mh / fh;
|
||||
fw = (int)(fw * k) & ~1, fh = (int)(fh * k) & ~1;
|
||||
}
|
||||
snprintf(sizes[i], sizeof sizes[i], "%dx%d", fw, fh);
|
||||
snprintf(names[i], sizeof names[i], "%d × %d", w, h); // U+00D7, the multiplication sign
|
||||
pn[i] = names[i];
|
||||
}
|
||||
pn[N] = menu_text(UI_MENU_GAME_RES_NATIVE);
|
||||
const char *res = cfg_value("NX2NAVI_GAME_RES");
|
||||
int cur = -1;
|
||||
for (int i = 0; i < N; i++)
|
||||
if (atoi(res) == heights[i]) cur = i;
|
||||
if (!strcmp(res, "window")) cur = N;
|
||||
int nv = opt_choice_index("NX2NAVI_GAME_RES", UI_MENU_GAME_RES, pn, N + 1, cur, 1, UI_MENU_GAME_RES_DESC);
|
||||
if (nv < 0 || nv > N) return;
|
||||
if (nv == N) {
|
||||
opt_apply("NX2NAVI_GAME_RES", "window");
|
||||
return;
|
||||
}
|
||||
char h[16];
|
||||
snprintf(h, sizeof h, "%d", heights[nv]);
|
||||
opt_apply("NX2NAVI_GAME_RES", h);
|
||||
opt_apply("NX2NAVI_WINDOW_SIZE", sizes[nv]);
|
||||
}
|
||||
|
||||
static void tab_screen(float scale) {
|
||||
opt_begin("##screen", scale);
|
||||
opt_toggle("NX2NAVI_FULLSCREEN", UI_MENU_FULLSCREEN, UI_MENU_FULLSCREEN_DESC);
|
||||
row_window_size();
|
||||
// the window's size is the Resolution row's below where the picture's size can be set (row_resolution); a build
|
||||
// without the widescreen patch sets draws the game's own size and keeps the window row
|
||||
if (!wide_available()) row_window_size();
|
||||
// On is the default mode, mailbox with its fallbacks (gfx_present.c pick_present_mode): plain fifo would drop the
|
||||
// game to 30 at every slow frame on a 60 Hz display. A fifo already saved also reads as on.
|
||||
opt_toggle_value("NX2NAVI_VK_PRESENT", UI_MENU_PRESENT_VSYNC, UI_MENU_PRESENT_DESC, "mailbox", "immediate", vsync_note());
|
||||
@@ -1195,7 +1252,7 @@ static void tab_screen(float scale) {
|
||||
static const UiTextId wide[] = {UI_MENU_GAME_ASPECT_16_9, UI_MENU_GAME_ASPECT_WINDOW, UI_MENU_GAME_ASPECT_21_9,
|
||||
UI_MENU_GAME_ASPECT_32_9};
|
||||
if (wide_available()) opt_choice("NX2NAVI_GAME_ASPECT", UI_MENU_GAME_ASPECT, wide, 4, UI_MENU_GAME_ASPECT_DESC);
|
||||
if (wide_available()) row_game_res();
|
||||
if (wide_available()) row_resolution();
|
||||
row_upscaling();
|
||||
row_framegen();
|
||||
row_hdr();
|
||||
|
||||
Reference in New Issue
Block a user