mirror of
https://github.com/valentderah/totk-pc-recomp.git
synced 2026-11-19 20:25:57 +00:00
Merge task/rdna2hires: depth images that outgrow their NVN storage get their own memory (RDNA2 garbage above 1080p)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
4b6158f883
1 file changed
+8
-2
@@ -212,14 +212,20 @@ static VkImageAspectFlags aspect_of(const TexVkFormat *f) {
|
||||
|
||||
// Binds img into the pool memory behind its GPU address (physical pools, virtual pools through the page table) when
|
||||
// the memory type, alignment and contiguous size allow; 0 otherwise.
|
||||
// A depth / stencil image that needs more bytes than its NVN storage (guest_size) is not bound: AMD's RDNA2 driver
|
||||
// (26.10.1) puts the depth compression metadata after the depth data, and above 1080p that tail lies over the next
|
||||
// texture of the game's heap; each depth write then scrambled it (garbage band at the top, pink glow, blocks in the
|
||||
// grass, a blue checkered scene in the menu). Colour images keep their place: the RX 9070 also sizes some of them
|
||||
// above their storage, and nothing there showed that the GPU writes the excess.
|
||||
static int format_compressed(VkFormat f) { // vkCmdClearColorImage takes no block-compressed format
|
||||
return (f >= VK_FORMAT_BC1_RGB_UNORM_BLOCK && f <= VK_FORMAT_ASTC_12x12_SRGB_BLOCK) ||
|
||||
(f >= VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK && f <= VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK);
|
||||
}
|
||||
|
||||
static int bind_pool_memory(VkCtx *c, Tex *e, VkImage img) {
|
||||
static int bind_pool_memory(VkCtx *c, Tex *e, VkImage img, uint64_t guest_size) {
|
||||
VkMemoryRequirements req;
|
||||
vkGetImageMemoryRequirements(c->device, img, &req);
|
||||
if ((e->f.depth || e->f.stencil) && req.size > guest_size) return 0;
|
||||
VkMemSpan sp;
|
||||
if (!vk_mem_resolve(e->pub.addr, req.size, &sp) || !sp.alloc || sp.alloc_offset % req.alignment) return 0;
|
||||
VmaAllocationInfo info;
|
||||
@@ -360,7 +366,7 @@ static Tex *create_tex(const tex_t *t, const TexKey *k, int defer_init) {
|
||||
e->pub.addr = k->addr;
|
||||
VkImage img = VK_NULL_HANDLE;
|
||||
if (nvn_gpu_only(k->addr)) { // storage in a physical or virtual pool: alias the pool memory (section 3.2)
|
||||
if (vkCreateImage(c->device, &ci, NULL, &img) == VK_SUCCESS && !bind_pool_memory(c, e, img)) {
|
||||
if (vkCreateImage(c->device, &ci, NULL, &img) == VK_SUCCESS && !bind_pool_memory(c, e, img, L.size)) {
|
||||
vkDestroyImage(c->device, img, NULL);
|
||||
img = VK_NULL_HANDLE;
|
||||
log_limited(&n_unbound, "texture %#llx (%ux%u fmt %#x) cannot alias its pool memory; own memory instead",
|
||||
|
||||
Reference in new issue
Block a user