Mesa (master): anv/image: Use the has_matching_typed_storage_image_format helper from isl

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Apr 15 17:08:18 2016 -0700

anv/image: Use the has_matching_typed_storage_image_format helper from isl

Reviewed-by: Chad Versace <chad.versace at intel.com>

---

 src/intel/vulkan/anv_image.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 7236b81..03a8cb8 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -424,16 +424,6 @@ alloc_surface_state(struct anv_device *device,
       }
 }
 
-static bool
-has_matching_storage_typed_format(const struct anv_device *device,
-                                  enum isl_format format)
-{
-   return (isl_format_get_layout(format)->bs <= 4 ||
-           (isl_format_get_layout(format)->bs <= 8 &&
-            (device->info.gen >= 8 || device->info.is_haswell)) ||
-           device->info.gen >= 9);
-}
-
 static enum isl_channel_select
 remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component,
               struct anv_format_swizzle format_swizzle)
@@ -574,7 +564,7 @@ anv_image_view_init(struct anv_image_view *iview,
    if (image->usage & usage_mask & VK_IMAGE_USAGE_STORAGE_BIT) {
       iview->storage_surface_state = alloc_surface_state(device, cmd_buffer);
 
-      if (has_matching_storage_typed_format(device, format)) {
+      if (isl_has_matching_typed_storage_image_format(&device->info, format)) {
          isl_view.usage = cube_usage | ISL_SURF_USAGE_STORAGE_BIT;
          isl_surf_fill_state(&device->isl_dev,
                              iview->storage_surface_state.map,
@@ -677,7 +667,8 @@ void anv_buffer_view_init(struct anv_buffer_view *view,
       view->storage_surface_state = alloc_surface_state(device, cmd_buffer);
 
       enum isl_format storage_format =
-         has_matching_storage_typed_format(device, view->format) ?
+         isl_has_matching_typed_storage_image_format(&device->info,
+                                                     view->format) ?
          isl_lower_storage_image_format(&device->info, view->format) :
          ISL_FORMAT_RAW;