anv: Add field anv_image::planes[]::bo_is_owned (v2)

If this flag is set, then the image and the bo have the same lifetime.
vkDestroyImage will release the bo.

We need this for VK_ANDROID_native_buffer, because that extension
creates the VkImage *and* imports its memory during the same
call, vkCreateImage.

v2: Rebase onto VK_KHR_bind_memory2.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Chad Versace
2017-08-29 01:36:42 -07:00
parent a9ca8f370d
commit 076a279a1a
2 changed files with 14 additions and 0 deletions
+9
View File
@@ -565,6 +565,13 @@ anv_DestroyImage(VkDevice _device, VkImage _image,
if (!image)
return;
for (uint32_t p = 0; p < image->n_planes; ++p) {
if (image->planes[p].bo_is_owned) {
assert(image->planes[p].bo != NULL);
anv_bo_cache_release(device, &device->bo_cache, image->planes[p].bo);
}
}
vk_free2(&device->alloc, pAllocator, image);
}
@@ -574,6 +581,8 @@ static void anv_image_bind_memory_plane(struct anv_device *device,
struct anv_device_memory *memory,
uint32_t memory_offset)
{
assert(!image->planes[plane].bo_is_owned);
if (!memory) {
image->planes[plane].bo = NULL;
image->planes[plane].bo_offset = 0;
+5
View File
@@ -2420,6 +2420,11 @@ struct anv_image {
*/
struct anv_bo *bo;
VkDeviceSize bo_offset;
/**
* When destroying the image, also free the bo.
* */
bool bo_is_owned;
} planes[3];
};