From 1a33358b274631e0b8b493b0d885091d839f9d13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Fri, 24 Apr 2020 15:28:41 +0300 Subject: [PATCH] anv: remove assert from GetImageMemoryRequirements[2] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This assert is actually correct but due to how android hardware buffer support is implemented we should remove it, otherwise debug build of mesa hits the assert with Android CTS tests. Test creates VkImage with non-external format and sets up VkExternalMemoryImageCreateInfo to indicate that image *may* be used with Android hardwarebuffer handle. Then test attempts to get image memory requirements. Problem with this is that we setup all android supporting images as having external format and thus hit the assert as the size has not been set yet. This is not a problem in practice since android will bind ahw memory with the image later on. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2807 Signed-off-by: Tapani Pälli Acked-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_device.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 8d44cd72f35..b0a02b02a6d 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -3909,12 +3909,6 @@ void anv_GetImageMemoryRequirements( */ uint32_t memory_types = (1ull << device->physical->memory.type_count) - 1; - /* We must have image allocated or imported at this point. According to the - * specification, external images must have been bound to memory before - * calling GetImageMemoryRequirements. - */ - assert(image->size > 0); - pMemoryRequirements->size = image->size; pMemoryRequirements->alignment = image->alignment; pMemoryRequirements->memoryTypeBits = memory_types; @@ -3954,12 +3948,6 @@ void anv_GetImageMemoryRequirements2( pMemoryRequirements->memoryRequirements.memoryTypeBits = (1ull << device->physical->memory.type_count) - 1; - /* We must have image allocated or imported at this point. According to the - * specification, external images must have been bound to memory before - * calling GetImageMemoryRequirements. - */ - assert(image->planes[plane].size > 0); - pMemoryRequirements->memoryRequirements.size = image->planes[plane].size; pMemoryRequirements->memoryRequirements.alignment = image->planes[plane].alignment; -- 2.30.2