mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 04:49:57 -04:00
Let the limit on released textures follow the card's memory as well as the PC's.
The limit was a thirty-second of the installed memory, 1 GiB on a PC with 32 GB whatever its card. The game lets go of the textures of what leaves the view and takes them back when it returns: walking through a village the released ones passed 1 GiB within two or three minutes, and from then on older ones were dropped and decoded again on their way back. The limit is now also a quarter of the card's budget where the PC has an eighth of its memory to match, up to 8 GiB; the video memory and commit pressure rules still drop released textures first. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -1499,7 +1499,8 @@ void vk_texture_pool_ctx(int on) { pool_ctx = on; }
|
||||
|
||||
static int idle(const Tex *e, uint64_t now);
|
||||
|
||||
// NX2NAVI_TEX_RELEASED_MB (default a thirty-second of the installed memory, 512 MiB to 2 GiB; 0 = no limit) bounds the
|
||||
// NX2NAVI_TEX_RELEASED_MB (default a thirty-second of the installed memory, 512 MiB to 2 GiB, or more by the card's
|
||||
// budget, released_cap_bytes; 0 = no limit) bounds the
|
||||
// own memory of the released entries: RELEASED_MAX alone kept 5-7 GiB of released render targets and decoded textures
|
||||
// after an hour of play at a 2160p game resolution, device memory the driver also charges to the system's commit (the
|
||||
// process's private bytes reached 31 GiB). A sixteenth (1 to 4 GiB) still let them hold 1.3 GiB on a 32 GB PC whose
|
||||
@@ -1523,6 +1524,7 @@ static int idle(const Tex *e, uint64_t now);
|
||||
#define COMMIT_LOW_KEEP ((uint64_t)256 << 20)
|
||||
#define PROC_COMMIT_MIN_MB 24576
|
||||
static uint64_t released_cap; // bytes; 0 = not read yet, UINT64_MAX = no limit
|
||||
#define RELEASED_CAP_MAX_MB 8192
|
||||
static long long commit_free_mb = -2; // -2: not read yet, -1: the default
|
||||
static long long proc_commit_mb; // this process's bound in MB; 0 = none
|
||||
static int commit_low, commit_logs; // commit_low: either of the two below at the last check
|
||||
@@ -1533,15 +1535,32 @@ static uint64_t released_cap_bytes(void) {
|
||||
if (!released_cap) {
|
||||
const char *s = cfg_get("NX2NAVI_TEX_RELEASED_MB");
|
||||
long long mb;
|
||||
int by_vram = 0;
|
||||
if (s && *s) mb = atoll(s);
|
||||
else {
|
||||
float used, total, proc;
|
||||
plat_mem_info(&used, &total, &proc);
|
||||
mb = total > 0 ? (long long)(total / 32) : 1024;
|
||||
mb = mb < 512 ? 512 : mb > 2048 ? 2048 : mb;
|
||||
// By the card too: a quarter of its budget where the PC has an eighth of its memory to match, up to
|
||||
// RELEASED_CAP_MAX_MB. The game lets go of the textures of what leaves the view and takes them back when
|
||||
// it returns; walking through a village the released ones passed 1 GiB within two or three minutes, and
|
||||
// from then on each release dropped an older one that was decoded and encoded again on its way back,
|
||||
// hundreds a second, on a card with 30 GiB free. The two pressure rules still come first: released
|
||||
// entries go before anything else above NX2NAVI_TEX_VRAM_PRESSURE of the budget, and the bound falls to
|
||||
// COMMIT_LOW_KEEP while the commit is low.
|
||||
uint64_t vused = 0, vbudget = 0;
|
||||
int exact = 0;
|
||||
if (vk_mem_vram(&vused, &vbudget, &exact) && total > 0) {
|
||||
long long by_card = (long long)(vbudget >> 22), by_ram = (long long)(total / 8); // a quarter, in MiB
|
||||
long long more = by_card < by_ram ? by_card : by_ram;
|
||||
if (more > RELEASED_CAP_MAX_MB) more = RELEASED_CAP_MAX_MB;
|
||||
if (more > mb) mb = more, by_vram = 1;
|
||||
}
|
||||
}
|
||||
released_cap = mb > 0 ? (uint64_t)mb << 20 : UINT64_MAX;
|
||||
if (mb > 0) rt_log("vk: released textures keep at most %lld MiB of their own memory", mb);
|
||||
if (mb > 0) rt_log("vk: released textures keep at most %lld MiB of their own memory%s (NX2NAVI_TEX_RELEASED_MB)", mb,
|
||||
by_vram ? ", a quarter of the video memory budget" : "");
|
||||
else rt_log("vk: released textures: no size limit");
|
||||
}
|
||||
return released_cap;
|
||||
|
||||
Reference in New Issue
Block a user