mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 06:59:57 -04:00
Hold less video memory in empty space: smaller VMA blocks, spare blocks only where textures grow, a smaller ASTC scratch, and DLSS features freed once unused, with a VRAM breakdown in the perf log.
VMA's blocks on large heaps are 64 MiB instead of 256 (vma_block_mb): one session held 2.1 GiB free inside the device blocks beside 8.2 GiB of allocations after a few area changes, and the driver counts a block whole until it empties. The headroom thread keeps its spare block only for the device-local types textures and mirrors grow in; the spare blocks it made for the host types and the PCIe BAR type at boot stayed empty for the whole run. The ASTC decoder's scratch is 32 MiB, so it stays inside a block, and an area load that makes one per upload batch holds half as much at once. A DLSS feature no frame used for 3600 evaluations is freed with its work images, and a model change now frees all five sizes. The perf log gets a "vram by use" line (textures, released textures, mirrors, physical pools, ASTC scratch, headroom spare, free space inside the blocks, memory outside VMA and DLSS's own share), the free ranges per memory type, the addresses whose duplicate texture entries hold the most, and a line when memory outside VMA moves by 256 MiB. astc_bc_probe in nx2navi.ini turns on the ASTC opacity probe. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 99cfc2fa14ae208b7b23e057ff9b87986cd6a5e0)
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
// device cannot. cpu: astc_decode_ldr_mt on the uploading thread, as before. check: gpu, and every upload is also
|
||||
// decoded on the CPU and compared (waits for the GPU; for testing only).
|
||||
//
|
||||
// The decode is recorded into the upload batch (vk_memory.c) in chunks of at most 32 MiB of texels: a chunk's raw
|
||||
// The decode is recorded into the upload batch (vk_memory.c) in chunks of at most 16 MiB of texels: a chunk's raw
|
||||
// blocks go from staging to a device-local scratch buffer, its dispatches write RGBA8 texels behind them, and a
|
||||
// buffer-to-image copy puts them into the image; the next chunk reuses the scratch after a barrier. The next texture
|
||||
// reuses it too, behind the same barrier, while it records into the same command buffer (scratch_get): a buffer per
|
||||
@@ -430,8 +430,12 @@ static void mem_barrier(VkCommandBuffer cb, VkPipelineStageFlags2 src, VkAccessF
|
||||
|
||||
// Scratch per vk_astc_record: texels of at most this many bytes at a time (or one region, when larger), so a large
|
||||
// texture array (169 M texels, 677 MB as RGBA8, on monsters2) does not need its whole RGBA8 copy as scratch.
|
||||
#define CHUNK_OUT (32ull << 20)
|
||||
#define SCRATCH_MIN (64ull << 20) // the shared scratch's least size: one chunk's texels plus its blocks and BC3
|
||||
// The scratch is made per upload batch and kept until that batch completes (scratch_keep), and an area load records
|
||||
// many batches in one frame: 12 scratches in the frame that uploaded 2617 textures entering an area, all alive at once.
|
||||
// So each is kept to half a VMA block (vk_vma_block_size's default 64 MiB), where VMA still places it in a block, not in
|
||||
// memory of its own: 16 MiB of texels, their blocks and BC3 fit in 32 MiB.
|
||||
#define CHUNK_OUT (16ull << 20)
|
||||
#define SCRATCH_MIN (32ull << 20) // the shared scratch's least size: one chunk's texels plus its blocks and BC3
|
||||
|
||||
// The shared scratch and the command buffer it was last recorded into. An upload batch's command buffer is used again
|
||||
// only after that batch completed (vk_memory.c: completed batches go to the spare list), so the same handle means the
|
||||
@@ -497,6 +501,14 @@ static VkBuffer scratch_get(VkCtx *c, VkCommandBuffer cb, VkDeviceSize need, int
|
||||
return out;
|
||||
}
|
||||
|
||||
// The shared scratch's size, for the log's VRAM breakdown (scratches still owned by an upload batch not counted).
|
||||
uint64_t vk_astc_scratch_bytes(void) {
|
||||
plat_mutex_lock(&g_lock);
|
||||
uint64_t n = S.buf ? S.size : 0;
|
||||
plat_mutex_unlock(&g_lock);
|
||||
return n;
|
||||
}
|
||||
|
||||
static VkDeviceSize region_out(const VkAstcRegion *r) { return (VkDeviceSize)r->w * r->h * r->slices * 4; }
|
||||
static VkDeviceSize tight_in(const VkAstcRegion *r, uint32_t bw, uint32_t bh) {
|
||||
return (VkDeviceSize)((r->w + bw - 1) / bw) * ((r->h + bh - 1) / bh) * r->slices * 16;
|
||||
|
||||
Reference in New Issue
Block a user