From: Iago Toral Quiroga <itoral@igalia.com>
Date: Tue, 15 Nov 2016 07:48:46 +0000 (+0100)
Subject: anv/format: handle unsupported formats earlier
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=277f868e6682b9ee398ed326425274c3d1898417;p=mesa.git

anv/format: handle unsupported formats earlier

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 2adde8b347a..9ef998cfff2 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -467,6 +467,9 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties(
    uint32_t maxArraySize;
    VkSampleCountFlags sampleCounts = VK_SAMPLE_COUNT_1_BIT;
 
+   if (anv_formats[format].isl_format == ISL_FORMAT_UNSUPPORTED)
+      goto unsupported;
+
    anv_physical_device_get_format_properties(physical_device, format,
                                              &format_props);
 
@@ -511,9 +514,6 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties(
       break;
    }
 
-   if (anv_formats[format].isl_format == ISL_FORMAT_UNSUPPORTED)
-      goto unsupported;
-
    /* Our hardware doesn't support 1D compressed textures.
     *    From the SKL PRM, RENDER_SURFACE_STATE::SurfaceFormat:
     *    * This field cannot be a compressed (BC*, DXT*, FXT*, ETC*, EAC*) format