From 7642f3b99c8b17c7cfa1f140c65ce82e7dbcea2b Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Sun, 11 Dec 2022 16:07:06 -0500 Subject: [PATCH] intel: Fix crashes for importing drm buffer image_aspect_to_binding() converts aspect to index by subrracting VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT, however these enum values are bitfields, not consecutive numbers, so comparing and subtracting them won't work. Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_image.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 86d276b1cf7..97a7553cd6b 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -59,21 +59,28 @@ memory_range_end(struct anv_image_memory_range memory_range) static struct anv_image_binding * image_aspect_to_binding(struct anv_image *image, VkImageAspectFlags aspect) { - uint32_t plane; + uint32_t plane = 0; assert(image->disjoint); if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) { /* Spec requires special aspects for modifier images. */ - assert(aspect >= VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT && - aspect <= VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT); + assert(aspect == VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT || + aspect == VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT || + aspect == VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT || + aspect == VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT); /* We don't advertise DISJOINT for modifiers with aux, and therefore we * don't handle queries of the modifier's "aux plane" here. */ assert(!isl_drm_modifier_has_aux(image->vk.drm_format_mod)); - plane = aspect - VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT; + switch(aspect) { + case VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT: plane = 0; break; + case VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT: plane = 1; break; + case VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT: plane = 2; break; + case VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT: plane = 3; break; + } } else { plane = anv_image_aspect_to_plane(image, aspect); }