KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

venus: properly destroy deferred ahb image before real image creation 

Fixes: 19b7b09885 ("venus: prepare image creation helpers for AHB")

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15037>
This commit is contained in:
Yiwei Zhang 2022-02-15 20:15:57 +00:00 committed by Marge Bot
parent 3652ff2fa1
commit 9dd15295e3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virtio/vulkan/vn_image.c
View File

@ -206,7 +206,9 @@ vn_image_init_deferred(struct vn_device *dev,
const VkImageCreateInfo *create_info,
struct vn_image *img)
{
return vn_image_init(dev, create_info, img);
VkResult result = vn_image_init(dev, create_info, img);
img->deferred_info->initialized = result == VK_SUCCESS;
return result;
}
VkResult
@ -313,7 +315,9 @@ vn_DestroyImage(VkDevice device,
vn_FreeMemory(device, mem_handle, pAllocator);
}
vn_async_vkDestroyImage(dev->instance, device, image, NULL);
/* must not ask renderer to destroy uninitialized deferred image */
if (!img->deferred_info || img->deferred_info->initialized)
vn_async_vkDestroyImage(dev->instance, device, image, NULL);
if (img->deferred_info)
vk_free(alloc, img->deferred_info);

3
src/virtio/vulkan/vn_image.h
View File

@ -27,6 +27,9 @@ struct vn_image_create_deferred_info {
VkImageCreateInfo create;
VkImageFormatListCreateInfo list;
VkImageStencilUsageCreateInfo stencil;
/* track whether vn_image_init_deferred succeeds */
bool initialized;
};
struct vn_image {