From ce4f6bda66e32db8cc52233932062bf7bfd256e7 Mon Sep 17 00:00:00 2001
From: Chad Versace <chad@kiwitree.net>
Date: Sat, 8 Aug 2020 18:45:48 -0500
Subject: [PATCH] anv/image: Fail earlier in anv_get_image_format_properties

If anv_get_image_format_features reports that the inputs are
unsupported, fail immediately.

Without the early fail, I have less confidence in the function's
correctness when a DRM format modifier is present.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---
 src/intel/vulkan/anv_formats.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 6cfa41610ad..e70263f390a 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -925,6 +925,8 @@ anv_get_image_format_properties(
    format_feature_flags = anv_get_image_format_features(devinfo, info->format,
                                                         format, info->tiling,
                                                         isl_mod_info);
+   if (!format_feature_flags)
+      goto unsupported;
 
    switch (info->type) {
    default: