From 737bae42676dc3587d0879879746056e7fcdce9c Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 17 Apr 2024 10:22:37 -0700 Subject: [PATCH] venus: fix swapchain image memory bind Fixed dEQP-VK.wsi.*.swapchain.simulate_oom.image_swapchain_create_info Fixes: 36f639375b3 ("venus: use STACK_ARRAY to simplify BindImageMemory2") Signed-off-by: Yiwei Zhang Part-of: --- src/virtio/vulkan/vn_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/virtio/vulkan/vn_image.c b/src/virtio/vulkan/vn_image.c index 2d326ea374f..a48e097b003 100644 --- a/src/virtio/vulkan/vn_image.c +++ b/src/virtio/vulkan/vn_image.c @@ -768,9 +768,10 @@ vn_BindImageMemory2(VkDevice device, vn_image_from_handle(wsi_common_get_image( swapchain_info->swapchain, swapchain_info->imageIndex)); mem = swapchain_img->wsi.memory; + info->memory = vn_device_memory_to_handle(mem); #endif } - assert(mem); + assert(mem && info->memory != VK_NULL_HANDLE); if (img->wsi.is_wsi) vn_image_bind_wsi_memory(img, mem);