From 5988871aba5915ab8d43bc9b71a56ecbe0b4875b Mon Sep 17 00:00:00 2001 From: chrg6 Date: Tue, 10 Nov 2026 12:40:11 -0500 Subject: [PATCH] Pick texture detail one step lower where ASTC textures stay uncompressed on a card under 20 GB. The automatic levels assume the ASTC textures end as BC3. Decoded on the CPU or with the BC3 pass off they stay RGBA8 and take four times the memory, which is what one mip level left out gives back. A card with 8 GB that decoded on the CPU went 560 MiB over its budget and lost its device. Co-Authored-By: Claude Fable 5.2 --- nx2navi.ini.example | 5 +++-- runtime/vk_texture.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nx2navi.ini.example b/nx2navi.ini.example index 2ab095cc..a60402ea 100644 --- a/nx2navi.ini.example +++ b/nx2navi.ini.example @@ -346,8 +346,9 @@ # more, with smaller levels) without that level, low without the two largest when they are 1024x1024 or more. Surfaces # seen up close look softer; interface art, small textures, shadow maps and everything the game draws itself keep their # size. auto picks by the video memory Windows grants the game: full from 8192 MiB (cards of 10 GB and more), low under -# 6144 MiB (cards of 6 GB and less), reduced between (8 GB cards). The log says what was picked ("texture detail:"). -# Read at start. +# 6144 MiB (cards of 6 GB and less), reduced between (8 GB cards). Where the ASTC textures stay uncompressed (astc = +# cpu or astc_bc = 0) and the budget is under 20480 MiB, auto goes one step lower, as they take four times the memory. +# The log says what was picked ("texture detail:"). Read at start. # texture_detail = auto # Sun shadow map size: game (the game's own, which changes with the view and drops to about 400 near the ground, so # leaf shadows look blocky and jump) or a fixed 256, 512, 768, 1024, 1536 or 2048. Above 960 the texture heap grows with diff --git a/runtime/vk_texture.c b/runtime/vk_texture.c index e9fc6390..8a7dfbfd 100644 --- a/runtime/vk_texture.c +++ b/runtime/vk_texture.c @@ -739,6 +739,11 @@ static void astc_probe_alpha(const tex_t *t, const TexVkFormat *f) { #define DETAIL_LOW_MIN 1024 #define DETAIL_FULL_MB 8192 #define DETAIL_LOW_MB 6144 +// The levels above assume the ASTC textures end as BC3 (or stay ASTC), a byte a texel. Where they stay RGBA8 (astc = +// cpu, a card without the decoder, astc_bc = 0) they take four times that, which is what one level left out gives +// back: under this budget auto then goes one step lower. A card with 8 GiB that decoded on the CPU held two texture +// arrays of 852 MiB each, was 560 MiB over its budget and lost its device. +#define DETAIL_RGBA8_MB 20480 #define EXACT_MAX 65536 static nvn_hmap exact = {.klen = sizeof(TexKey)}; // keys made whole whatever the setting; value 1 static uint64_t n_exact; // textures made whole again so far @@ -756,7 +761,9 @@ int vk_texture_detail_auto(void) { mb = vk_mem_vram(&used, &budget, &exact_budget) ? (int64_t)(budget >> 20) : 0; __atomic_store_n(&detail_budget_mb, mb, __ATOMIC_RELAXED); } - return !mb || mb >= DETAIL_FULL_MB ? 0 : mb >= DETAIL_LOW_MB ? 1 : 2; + int most = !mb || mb >= DETAIL_FULL_MB ? 0 : mb >= DETAIL_LOW_MB ? 1 : 2; + if (mb && mb < DETAIL_RGBA8_MB && most < 2 && vk_astc_mode() != VK_ASTC_NATIVE && !vk_astc_bc()) most++; + return most; } static int detail_most(void) { // the most levels a texture is made without: 0 full, 1 reduced, 2 low @@ -773,7 +780,9 @@ static int detail_most(void) { // the most levels a texture is made without: 0 rt_log("vk: texture detail: full (texture_detail = %s; the device reports no video memory budget)", v); else rt_log("vk: texture detail: %s, chosen for a video memory budget of %lld MiB (texture_detail = %s; full from " - "%d MiB, low under %d MiB)", names[most], (long long)detail_budget_mb, v, DETAIL_FULL_MB, DETAIL_LOW_MB); + "%d MiB, low under %d MiB%s)", names[most], (long long)detail_budget_mb, v, DETAIL_FULL_MB, DETAIL_LOW_MB, + vk_astc_mode() != VK_ASTC_NATIVE && !vk_astc_bc() && detail_budget_mb < DETAIL_RGBA8_MB + ? "; one step lower because ASTC textures stay uncompressed here" : ""); } return most; }