From: Lionel Landwerlin Date: Wed, 17 Jul 2019 22:00:11 +0000 (+0300) Subject: anv: fix format mapping for depth/stencil formats X-Git-Tag: upstream/19.3.0~4064 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3adc32df922753363d964b637196157587d57565;p=platform%2Fupstream%2Fmesa.git anv: fix format mapping for depth/stencil formats anv_format is supposed to have a pointer back to the associated VkFormat, we were missed this for depth/stencil formats. This doesn't fix anything afaict, but will be needed for future changes. Signed-off-by: Lionel Landwerlin Fixes: 465de47bad70 ("anv: associate vulkan formats with aspects") Acked-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 9aa89d7..362d9ad 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -69,6 +69,7 @@ .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, \ }, \ }, \ + .vk_format = __vk_fmt, \ .n_planes = 1, \ } @@ -80,6 +81,7 @@ .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, \ }, \ }, \ + .vk_format = __vk_fmt, \ .n_planes = 1, \ } @@ -795,6 +797,7 @@ anv_get_image_format_properties( if (format == NULL) goto unsupported; + assert(format->vk_format == info->format); format_feature_flags = anv_get_image_format_features(devinfo, info->format, format, info->tiling);