Mesa (main): anv: Use anv_get_format_plane in anv_get_image_format_features

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 61807505e85c39b3fbf090137cd60f2cef7bba62
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=61807505e85c39b3fbf090137cd60f2cef7bba62

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Jul 30 06:57:35 2021 -0500

anv: Use anv_get_format_plane in anv_get_image_format_features

Once we get past depth/stencil, what we really want is plane 0 not the
color aspect.  A bunch of those formats don't have a single color
aspect.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12141>

---

 src/intel/vulkan/anv_formats.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 5485d79dd49..6b10d7b5b18 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -581,18 +581,17 @@ anv_get_image_format_features(const struct intel_device_info *devinfo,
       return flags;
    }
 
+   assert(aspects & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV);
    const struct anv_format_plane plane_format =
-      anv_get_format_aspect(devinfo, vk_format, VK_IMAGE_ASPECT_COLOR_BIT,
-                            vk_tiling);
+      anv_get_format_plane(devinfo, vk_format, 0, vk_tiling);
 
    if (plane_format.isl_format == ISL_FORMAT_UNSUPPORTED)
       return 0;
 
    struct anv_format_plane base_plane_format = plane_format;
    if (vk_tiling != VK_IMAGE_TILING_LINEAR) {
-      base_plane_format = anv_get_format_aspect(devinfo, vk_format,
-                                                VK_IMAGE_ASPECT_COLOR_BIT,
-                                                VK_IMAGE_TILING_LINEAR);
+      base_plane_format = anv_get_format_plane(devinfo, vk_format, 0,
+                                               VK_IMAGE_TILING_LINEAR);
    }
 
    enum isl_format base_isl_format = base_plane_format.isl_format;