diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index d865574453f..f08d1ec2bc3 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -853,7 +853,7 @@ anv_get_image_format_features2(const struct anv_physical_device *physical_device
     *
     * Remove disallowed flags if any of the plane can support that feature.
     */
-   if (usage & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT) {
+   if (create_flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT) {
       for (uint32_t p = 0; p < anv_format->n_planes; p++) {
          const struct anv_format_plane ycbcr_plane_format =
             anv_get_format_plane(physical_device, vk_format, p, vk_tiling);
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 447f7af4e00..60daa7a7621 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -481,7 +481,8 @@ anv_formats_ccs_e_compatible(const struct anv_physical_device *physical_device,
 
    if ((vk_usage & VK_IMAGE_USAGE_STORAGE_BIT) &&
        vk_tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
-      assert(vk_format_aspects(vk_format) == VK_IMAGE_ASPECT_COLOR_BIT);
+      /* Only color */
+      assert((vk_format_aspects(vk_format) & ~VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) == 0);
       if (devinfo->ver == 12) {
          /* From the TGL Bspec 44930 (r47128):
           *