From: Jason Ekstrand Date: Wed, 18 May 2022 17:49:45 +0000 (-0500) Subject: v3dv: Loosen an assert in copy_buffer_to_image_shader X-Git-Tag: upstream/22.3.5~8641 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f38adda6383f426195f435fadb5c3b0c9fc1659;p=platform%2Fupstream%2Fmesa.git v3dv: Loosen an assert in copy_buffer_to_image_shader In f99ac7f2de19 ("v3dv: Don't use color aspects for depth/stencil images"), we stopped using color aspects for depth/stencil images in a bunch of cases. This causes us to trigger an assert in copy_buffer_to_image_shader where it assumes 16-bit is always color but now it can also be D16_UNORM. The assert isn't protecting us from anything we weren't already doing before so we can just loosen it a bit. Fixes: f99ac7f2de19 ("v3dv: Don't use color aspects for depth/stencil images") Reviewed-by: Alejandro Piñeiro Part-of: --- diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c index 8206183..67a6e51 100644 --- a/src/broadcom/vulkan/v3dv_meta_copy.c +++ b/src/broadcom/vulkan/v3dv_meta_copy.c @@ -2604,7 +2604,8 @@ copy_buffer_to_image_shader(struct v3dv_cmd_buffer *cmd_buffer, }; break; case 2: - assert(aspect == VK_IMAGE_ASPECT_COLOR_BIT); + assert(aspect == VK_IMAGE_ASPECT_COLOR_BIT || + aspect == VK_IMAGE_ASPECT_DEPTH_BIT); src_format = VK_FORMAT_R16_UINT; dst_format = src_format; break;