From dd3b67b9746f1d0f2766d6c39bb23e59d6548aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= Date: Mon, 20 Feb 2023 23:40:12 +0100 Subject: [PATCH] v3dv: handle ASPECT_MEMORY_PLANE aspect flags when getting plane number As we support VK_EXT_image_drm_format_modifier, we could receive VK_IMAGE_ASPECT_MEMORY_PLANE_0/1/2_BIT_EXT flags. Fixes several tests like this: dEQP-VK.drm_format_modifiers.create_explicit_modifier.* when using CTS 1.3.5.0 Reviewed-by: Eric Engestrom Part-of: --- src/broadcom/vulkan/v3dv_private.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index 8107e06e72d..9662bb7df46 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -654,10 +654,13 @@ static uint8_t v3dv_plane_from_aspect(VkImageAspectFlags aspect) case VK_IMAGE_ASPECT_STENCIL_BIT: case VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT: case VK_IMAGE_ASPECT_PLANE_0_BIT: + case VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT: return 0; case VK_IMAGE_ASPECT_PLANE_1_BIT: + case VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT: return 1; case VK_IMAGE_ASPECT_PLANE_2_BIT: + case VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT: return 2; default: unreachable("invalid image aspect");