From ef41157341f92643e032dda6681a509ed2361588 Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Mon, 17 Apr 2023 16:18:37 +0200 Subject: [PATCH] radv/rmv: Fix import memory For some import memory, it is valid to specify zero size. Cc: mesa-stable Part-of: (cherry picked from commit 7cad28571bfe10ce3f7d5db08926c1577524fb86) --- .pick_status.json | 2 +- src/amd/vulkan/radv_rmv.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index da105fc3a55..32329e0345e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -679,7 +679,7 @@ "description": "radv/rmv: Fix import memory", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c index a2689d08d21..27f57da647d 100644 --- a/src/amd/vulkan/radv_rmv.c +++ b/src/amd/vulkan/radv_rmv.c @@ -492,6 +492,10 @@ radv_rmv_log_heap_create(struct radv_device *device, VkDeviceMemory heap, bool i RADV_FROM_HANDLE(radv_device_memory, memory, heap); + /* Do not log zero-sized device memory objects. */ + if (!memory->alloc_size) + return; + radv_rmv_log_bo_allocate(device, memory->bo, memory->alloc_size, false); simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);