diff --git a/runtime/cfg.c b/runtime/cfg.c index bed3d8e0..c19af5d4 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -302,6 +302,7 @@ static const CfgMeta metas[] = { // the menu's Lama patches tab (ui/menu.cpp tab_lama): the settings of the RX 580 patches {"TEX_RELEASED_MAX", "", NULL, RESTART}, // vk_texture.c released_max: "" by the video memory budget, else 1..16384 {"MIRROR_HOT", "25", "0..1000", RESTART}, {"FREEZE_IDLE", "1800", "0..100000", RESTART}, + {"SUBMIT_FINISH_KINDS", "31", "0..31", RESTART}, // vk_sync.c res_mask {"VRAM_HEAP_LIMIT", "auto", NULL, RESTART}, // vk_device.c vram_heap_limits: auto, 0 or MiB {"UPLOAD_BATCH_MB", "256", NULL, RESTART}, // vk_memory.c: MiB of staging before a batch goes early, 0 no limit {"MESH_EMULATION", "1", "0|1", RESTART}, {"MESH_EMU_MB", "256", "32..2048", RESTART}, diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index 0341e6d7..9cf0ddaa 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -1639,6 +1639,8 @@ static void tab_lama(float scale) { static const char *const values[] = {"auto", "0"}; const char *names[] = {menu_text(UI_MENU_AUTO), menu_text(UI_MENU_OFF)}; opt_choice_list("NX2NAVI_VRAM_HEAP_LIMIT", UI_MENU_LAMA_HEAP_LIMIT, values, names, 2, UI_MENU_LAMA_HEAP_LIMIT_DESC); + } + } { // vk_memory.c upload_batch_cap static const char *const values[] = {"128", "256", "512", "1024", "0"}; const char *names[] = {"128 MB", "256 MB", "512 MB", "1024 MB", menu_text(UI_MENU_LAMA_NO_LIMIT)}; @@ -1648,6 +1650,10 @@ static void tab_lama(float scale) { static const char *const values[] = {"1800", "1200", "600", "60", "0"}; const char *names[] = {"1800", "1200", "600", "60", menu_text(UI_MENU_OFF)}; opt_choice_list("NX2NAVI_FREEZE_IDLE", UI_MENU_LAMA_FREEZE, values, names, 5, UI_MENU_LAMA_FREEZE_DESC); + { // vk_sync.c res_mask: the result kinds the submit wait counts (31 all, 30 all but events) + static const char *const values[] = {"31", "30"}; + const char *names[] = {menu_text(UI_MENU_LAMA_RESULTS_ALL), menu_text(UI_MENU_LAMA_RESULTS_NO_EVENTS)}; + opt_choice_list("NX2NAVI_SUBMIT_FINISH_KINDS", UI_MENU_LAMA_RESULTS, values, names, 2, UI_MENU_LAMA_RESULTS_DESC); opt_toggle("NX2NAVI_ZSTD_NATIVE", UI_MENU_LAMA_ZSTD, UI_MENU_LAMA_ZSTD_DESC); // ov_zstd.c trusted opt_group(UI_MENU_LAMA_RENDER); opt_toggle("NX2NAVI_REPLAY_ASYNC", UI_MENU_LAMA_ASYNC, UI_MENU_LAMA_ASYNC_DESC); // vk_backend.c diff --git a/runtime/ui_text.c b/runtime/ui_text.c index c7729e2d..5c35bb74 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -144,6 +144,12 @@ static const char *const text_en[UI_TEXT_COUNT] = { "tracking can skip it. 1800 (about 15 s): few thaws and small tracking queries. 60: " "the game thaws regions all the time and every thaw stalls a frame. Off: no stalls, but " "the tracking scans all memory every frame.", + [UI_MENU_LAMA_RESULTS] = "Wait for GPU results", + [UI_MENU_LAMA_RESULTS_DESC] = "After a frame's first submission the game waits until the GPU wrote the results it " + "reads back. All: events, counter and occlusion reports, write-backs. Without events: " + "a shorter wait; on an RX 580 nothing flickered.", + [UI_MENU_LAMA_RESULTS_ALL] = "All", + [UI_MENU_LAMA_RESULTS_NO_EVENTS] = "Without events", [UI_MENU_LAMA_ZSTD] = "Native data decompression", [UI_MENU_LAMA_ZSTD_DESC] = "Decompresses the game's zstd data with the PC's libzstd instead of the game's own " "decoder translated from the console. Lighter streaming while you move.", diff --git a/runtime/ui_text.h b/runtime/ui_text.h index 8875d9f7..37be47df 100644 --- a/runtime/ui_text.h +++ b/runtime/ui_text.h @@ -336,6 +336,7 @@ typedef enum { UI_MENU_TAB_LAMA, UI_MENU_LAMA_INTRO, UI_MENU_LAMA_MEMORY, UI_MENU_LAMA_RENDER, UI_MENU_LAMA_BUILD, UI_MENU_LAMA_DIAG, UI_MENU_LAMA_FREEZE, UI_MENU_LAMA_FREEZE_DESC, UI_MENU_LAMA_ZSTD, UI_MENU_LAMA_ZSTD_DESC, + UI_MENU_LAMA_RESULTS, UI_MENU_LAMA_RESULTS_DESC, UI_MENU_LAMA_RESULTS_ALL, UI_MENU_LAMA_RESULTS_NO_EVENTS, UI_MENU_LAMA_ASYNC, UI_MENU_LAMA_ASYNC_DESC, UI_MENU_LAMA_RELEASED, UI_MENU_LAMA_RELEASED_DESC, UI_MENU_LAMA_CLOBBER, UI_MENU_LAMA_CLOBBER_DESC,