Mesa (master): anv/format: handle unsupported formats earlier

[Iago Toral Quiroga]

Module: Mesa
Branch: master
Commit: 277f868e6682b9ee398ed326425274c3d1898417
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=277f868e6682b9ee398ed326425274c3d1898417

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Nov 15 08:48:46 2016 +0100

anv/format: handle unsupported formats earlier

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

---

 src/intel/vulkan/anv_formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 2adde8b..9ef998c 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