From 2ddd021baed0bbf27a1999637363a55df2bf4774 Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Thu, 5 Dec 2024 20:03:44 -0800 Subject: [PATCH] panvk: Fix assertion in is_disjoint() We were not correctly following VUID-VkImageCreateInfo-format-01577: If format is not a multi-planar format, and flags does not include VK_IMAGE_CREATE_ALIAS_BIT, flags must not contain VK_IMAGE_CREATE_DISJOINT_BIT. Fixes: 412c2863 ("panvk: Enable multiplane images and image views") Signed-off-by: Rebecca Mckeever Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/vulkan/panvk_image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index 758c621284a..6845399d1ad 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -317,6 +317,7 @@ is_disjoint(struct panvk_image *image) { assert((image->plane_count > 1 && image->vk.format != VK_FORMAT_D32_SFLOAT_S8_UINT) || + (image->vk.create_flags & VK_IMAGE_CREATE_ALIAS_BIT) || !(image->vk.create_flags & VK_IMAGE_CREATE_DISJOINT_BIT)); return image->vk.create_flags & VK_IMAGE_CREATE_DISJOINT_BIT; }