anv/pipeline: Delete out-of-bounds fragment shader outputs
[mesa.git] / src / vulkan / anv_image.c
index 973e8bd609a17192aa864daf64ec9f26b5d37754..0a412a3f8c668e40ab62620d7e77edef57ba6a7b 100644 (file)
 
 #include "anv_private.h"
 
-/* FIXME: We shouldn't be using the actual hardware enum values here.  They
- * change across gens.  Once we get that fixed, this include needs to go.
+/**
+ * Exactly one bit must be set in \a aspect.
  */
-#include "gen8_pack.h"
-
-static const uint8_t anv_halign[] = {
-    [4] = HALIGN4,
-    [8] = HALIGN8,
-    [16] = HALIGN16,
-};
-
-static const uint8_t anv_valign[] = {
-    [4] = VALIGN4,
-    [8] = VALIGN8,
-    [16] = VALIGN16,
-};
-
-static const uint8_t anv_surf_type_from_image_type[] = {
-   [VK_IMAGE_TYPE_1D] = SURFTYPE_1D,
-   [VK_IMAGE_TYPE_2D] = SURFTYPE_2D,
-   [VK_IMAGE_TYPE_3D] = SURFTYPE_3D,
-};
-
-static const struct anv_image_view_info
-anv_image_view_info_table[] = {
-   #define INFO(s, ...) { .surface_type = s, __VA_ARGS__ }
-   [VK_IMAGE_VIEW_TYPE_1D]          = INFO(SURFTYPE_1D),
-   [VK_IMAGE_VIEW_TYPE_2D]          = INFO(SURFTYPE_2D),
-   [VK_IMAGE_VIEW_TYPE_3D]          = INFO(SURFTYPE_3D),
-   [VK_IMAGE_VIEW_TYPE_CUBE]        = INFO(SURFTYPE_CUBE,                  .is_cube = 1),
-   [VK_IMAGE_VIEW_TYPE_1D_ARRAY]    = INFO(SURFTYPE_1D,     .is_array = 1),
-   [VK_IMAGE_VIEW_TYPE_2D_ARRAY]    = INFO(SURFTYPE_2D,     .is_array = 1),
-   [VK_IMAGE_VIEW_TYPE_CUBE_ARRAY]  = INFO(SURFTYPE_CUBE,   .is_array = 1, .is_cube = 1),
-   #undef INFO
-};
-
-struct anv_image_view_info
-anv_image_view_info_for_vk_image_view_type(VkImageViewType type)
+static isl_surf_usage_flags_t
+choose_isl_surf_usage(VkImageUsageFlags vk_usage,
+                      VkImageAspectFlags aspect)
 {
-   return anv_image_view_info_table[type];
-}
+   isl_surf_usage_flags_t isl_usage = 0;
 
-static const struct anv_surf_type_limits {
-   int32_t width;
-   int32_t height;
-   int32_t depth;
-} anv_surf_type_limits[] = {
-   [SURFTYPE_1D]     = {16384,       1,   2048},
-   [SURFTYPE_2D]     = {16384,   16384,   2048},
-   [SURFTYPE_3D]     = {2048,     2048,   2048},
-   [SURFTYPE_CUBE]   = {16384,   16384,    340},
-   [SURFTYPE_BUFFER] = {128,     16384,     64},
-   [SURFTYPE_STRBUF] = {128,     16384,     64},
-};
-
-static const struct anv_tile_info {
-   /**
-    * Alignment for RENDER_SURFACE_STATE.SurfaceBaseAddress.
-    *
-    * To simplify calculations, the alignments defined in the table are
-    * sometimes larger than required.  For example, Skylake requires that X and
-    * Y tiled buffers be aligned to 4K, but Broadwell permits smaller
-    * alignment. We choose 4K to accomodate both chipsets.  The alignment of
-    * a linear buffer depends on its element type and usage. Linear depth
-    * buffers have the largest alignment, 64B, so we choose that for all linear
-    * buffers.
-    */
-   uint32_t surface_alignment;
-} anv_tile_info_table[] = {
-   [ISL_TILING_LINEAR]  = {   64 },
-   [ISL_TILING_X]       = { 4096 },
-   [ISL_TILING_Y]       = { 4096 },
-   [ISL_TILING_Yf]      = { 4096 },
-   [ISL_TILING_Ys]      = { 4096 },
-   [ISL_TILING_W]       = { 4096 },
-};
-
-static enum isl_tiling
-anv_image_choose_tiling(const struct anv_image_create_info *anv_info)
-{
-   if (anv_info->force_tiling)
-      return anv_info->tiling;
+   /* FINISHME: Support aux surfaces */
+   isl_usage |= ISL_SURF_USAGE_DISABLE_AUX_BIT;
 
-   /* The Sandybridge PRM says that the stencil buffer "is supported
-    * only in Tile W memory".
-    */
+   if (vk_usage & VK_IMAGE_USAGE_SAMPLED_BIT)
+      isl_usage |= ISL_SURF_USAGE_TEXTURE_BIT;
 
-   switch (anv_info->vk_info->tiling) {
-   case VK_IMAGE_TILING_LINEAR:
-      assert(anv_info->vk_info->format != VK_FORMAT_S8_UINT);
-      return ISL_TILING_LINEAR;
-   case VK_IMAGE_TILING_OPTIMAL:
-      if (unlikely(anv_info->vk_info->format == VK_FORMAT_S8_UINT)) {
-         return ISL_TILING_W;
-      } else {
-         return ISL_TILING_Y;
+   if (vk_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)
+      isl_usage |= ISL_SURF_USAGE_TEXTURE_BIT;
+
+   if (vk_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
+      isl_usage |= ISL_SURF_USAGE_RENDER_TARGET_BIT;
+
+   if (vk_usage & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT)
+      isl_usage |= ISL_SURF_USAGE_CUBE_BIT;
+
+   if (vk_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
+      switch (aspect) {
+      default:
+         unreachable("bad VkImageAspect");
+      case VK_IMAGE_ASPECT_DEPTH_BIT:
+         isl_usage |= ISL_SURF_USAGE_DEPTH_BIT;
+         break;
+      case VK_IMAGE_ASPECT_STENCIL_BIT:
+         isl_usage |= ISL_SURF_USAGE_STENCIL_BIT;
+         break;
       }
-   default:
-      assert(!"bad VKImageTiling");
-      return ISL_TILING_LINEAR;
    }
+
+   if (vk_usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) {
+      /* Meta implements transfers by sampling from the source image. */
+      isl_usage |= ISL_SURF_USAGE_TEXTURE_BIT;
+   }
+
+   if (vk_usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) {
+      /* Meta implements transfers by rendering into the destination image. */
+      isl_usage |= ISL_SURF_USAGE_RENDER_TARGET_BIT;
+   }
+
+   return isl_usage;
 }
 
+/**
+ * Exactly one bit must be set in \a aspect.
+ */
+static struct anv_surface *
+get_surface(struct anv_image *image, VkImageAspectFlags aspect)
+{
+   switch (aspect) {
+   default:
+      unreachable("bad VkImageAspect");
+   case VK_IMAGE_ASPECT_COLOR_BIT:
+      return &image->color_surface;
+   case VK_IMAGE_ASPECT_DEPTH_BIT:
+      return &image->depth_surface;
+   case VK_IMAGE_ASPECT_STENCIL_BIT:
+      return &image->stencil_surface;
+   }
+}
 
 /**
- * The \a format argument is required and overrides any format in
- * struct anv_image_create_info.
+ * Initialize the anv_image::*_surface selected by \a aspect. Then update the
+ * image's memory requirements (that is, the image's size and alignment).
+ *
+ * Exactly one bit must be set in \a aspect.
  */
 static VkResult
-anv_image_make_surface(const struct anv_device *dev,
-                       const struct anv_image_create_info *create_info,
-                       const struct anv_format *format,
-                       uint64_t *inout_image_size,
-                       uint32_t *inout_image_alignment,
-                       struct anv_surface *out_surface)
+make_surface(const struct anv_device *dev,
+             struct anv_image *image,
+             const struct anv_image_create_info *anv_info,
+             VkImageAspectFlags aspect)
 {
-   /* See RENDER_SURFACE_STATE.SurfaceQPitch */
-   static const uint16_t min_qpitch UNUSED = 0x4;
-   static const uint16_t max_qpitch UNUSED = 0x1ffc;
+   const VkImageCreateInfo *vk_info = anv_info->vk_info;
+   bool ok UNUSED;
 
-   const VkExtent3D *restrict extent = &create_info->vk_info->extent;
-   const uint32_t levels = create_info->vk_info->mipLevels;
-   const uint32_t array_size = create_info->vk_info->arraySize;
-   const enum isl_tiling tiling = anv_image_choose_tiling(create_info);
-
-   const struct anv_tile_info *tile_info =
-       &anv_tile_info_table[tiling];
-
-   const uint32_t bs = format->isl_layout->bs;
-   const uint32_t bw = format->isl_layout->bw;
-   const uint32_t bh = format->isl_layout->bh;
-
-   struct isl_extent2d tile_extent;
-   isl_tiling_get_extent(&dev->isl_dev, tiling, bs, &tile_extent);
+   static const enum isl_surf_dim vk_to_isl_surf_dim[] = {
+      [VK_IMAGE_TYPE_1D] = ISL_SURF_DIM_1D,
+      [VK_IMAGE_TYPE_2D] = ISL_SURF_DIM_2D,
+      [VK_IMAGE_TYPE_3D] = ISL_SURF_DIM_3D,
+   };
 
-   const uint32_t i = MAX(4, bw); /* FINISHME: Stop hardcoding subimage alignment */
-   const uint32_t j = MAX(4, bh); /* FINISHME: Stop hardcoding subimage alignment */
-   assert(i == 4 || i == 8 || i == 16);
-   assert(j == 4 || j == 8 || j == 16);
+   isl_tiling_flags_t tiling_flags = anv_info->isl_tiling_flags;
+   if (vk_info->tiling == VK_IMAGE_TILING_LINEAR)
+      tiling_flags &= ISL_TILING_LINEAR_BIT;
 
-   uint16_t qpitch = min_qpitch;
-   uint32_t mt_width = 0;
-   uint32_t mt_height = 0;
+   struct anv_surface *anv_surf = get_surface(image, aspect);
 
-   switch (create_info->vk_info->imageType) {
+   VkExtent3D extent;
+   switch (vk_info->imageType) {
    case VK_IMAGE_TYPE_1D:
-      /* From the Broadwell PRM >> Memory Views >> Common Surface Formats >>
-       * Surface Layout >> 1D Surfaces:
-       *
-       *    One-dimensional surfaces are identical to 2D surfaces with height of one.
-       *
-       * So fallthrough...
-       */
-   case VK_IMAGE_TYPE_2D: {
-      const uint32_t w0 = align_u32(extent->width, i);
-      const uint32_t h0 = align_u32(extent->height, j);
-
-      if (levels == 1 && array_size == 1) {
-         qpitch = min_qpitch;
-         mt_width = w0;
-         mt_height = h0;
-      } else {
-         uint32_t w1 = align_u32(anv_minify(extent->width, 1), i);
-         uint32_t h1 = align_u32(anv_minify(extent->height, 1), j);
-         uint32_t w2 = align_u32(anv_minify(extent->width, 2), i);
-
-         /* The QPitch equation is found in the Broadwell PRM >> Volume 5: Memory
-          * Views >> Common Surface Formats >> Surface Layout >> 2D Surfaces >>
-          * Surface Arrays >> For All Surface Other Than Separate Stencil Buffer:
-          */
-         assert(bh ==1 || bh == 4);
-         qpitch = (h0 + h1 + 11 * j) / bh;
-         mt_width = MAX(w0, w1 + w2);
-         mt_height = array_size * qpitch;
-      }
+      extent = (VkExtent3D) { vk_info->extent.width, 1, 1 };
+      break;
+   case VK_IMAGE_TYPE_2D:
+      extent = (VkExtent3D) { vk_info->extent.width, vk_info->extent.height, 1 };
       break;
-   }
    case VK_IMAGE_TYPE_3D:
-      /* The layout of 3D surfaces is described by the Broadwell PRM >>
-       * Volume 5: Memory Views >> Common Surface Formats >> Surface Layout >>
-       * 3D Surfaces.
-       */
-      for (uint32_t l = 0; l < levels; ++l) {
-         const uint32_t w_l = align_u32(anv_minify(extent->width, l), i);
-         const uint32_t h_l = align_u32(anv_minify(extent->height, l), j);
-         const uint32_t d_l = anv_minify(extent->depth, l);
-
-         const uint32_t max_layers_horiz = MIN(d_l, 1u << l);
-         const uint32_t max_layers_vert = align_u32(d_l, 1u << l) / (1u << l);
-
-         mt_width = MAX(mt_width, w_l * max_layers_horiz);
-         mt_height += h_l * max_layers_vert;
-      }
+      extent = vk_info->extent;
       break;
    default:
-      unreachable(!"bad VkImageType");
+      unreachable("invalid image type");
    }
 
-   assert(qpitch >= min_qpitch);
-   if (qpitch > max_qpitch) {
-      anv_loge("image qpitch > 0x%x\n", max_qpitch);
-      return vk_error(VK_ERROR_OUT_OF_DEVICE_MEMORY);
-   }
-
-   /* From the Broadwell PRM, RENDER_SURFACE_STATE.SurfaceQpitch:
-    *
-    *   This field must be set an integer multiple of the Surface Vertical
-    *   Alignment.
+   image->extent = extent;
+
+   ok = isl_surf_init(&dev->isl_dev, &anv_surf->isl,
+      .dim = vk_to_isl_surf_dim[vk_info->imageType],
+      .format = anv_get_isl_format(vk_info->format, aspect,
+                                   vk_info->tiling, NULL),
+      .width = extent.width,
+      .height = extent.height,
+      .depth = extent.depth,
+      .levels = vk_info->mipLevels,
+      .array_len = vk_info->arrayLayers,
+      .samples = vk_info->samples,
+      .min_alignment = 0,
+      .min_pitch = 0,
+      .usage = choose_isl_surf_usage(image->usage, aspect),
+      .tiling_flags = tiling_flags);
+
+   /* isl_surf_init() will fail only if provided invalid input. Invalid input
+    * is illegal in Vulkan.
     */
-   assert(anv_is_aligned(qpitch, j));
-
-   uint32_t stride = align_u32(mt_width * bs / bw, tile_extent.width);
-   if (create_info->stride > 0)
-      stride = create_info->stride;
-
-  /* The padding requirement is found in the Broadwell PRM >> Volume 5: Memory
-   * Views >> Common Surface Formats >> Surface Padding Requirements >>
-   * Sampling Engine Surfaces >> Buffer Padding Requirements:
-   */
-   const uint32_t mem_rows = align_u32(mt_height / bh, 2 * bh);
-   const uint32_t size = stride * align_u32(mem_rows, tile_extent.height);
-   const uint32_t offset = align_u32(*inout_image_size,
-                                     tile_info->surface_alignment);
-
-   *inout_image_size = offset + size;
-   *inout_image_alignment = MAX(*inout_image_alignment,
-                                tile_info->surface_alignment);
-
-   *out_surface = (struct anv_surface) {
-      .offset = offset,
-      .stride = stride,
-      .tiling = tiling,
-      .qpitch = qpitch,
-      .h_align = i,
-      .v_align = j,
-   };
+   assert(ok);
+
+   anv_surf->offset = align_u32(image->size, anv_surf->isl.alignment);
+   image->size = anv_surf->offset + anv_surf->isl.size;
+   image->alignment = MAX(image->alignment, anv_surf->isl.alignment);
 
    return VK_SUCCESS;
 }
 
+/**
+ * Parameter @a format is required and overrides VkImageCreateInfo::format.
+ */
 static VkImageUsageFlags
-anv_image_get_full_usage(const VkImageCreateInfo *info)
+anv_image_get_full_usage(const VkImageCreateInfo *info,
+                         const struct anv_format *format)
 {
    VkImageUsageFlags usage = info->usage;
 
+   if (info->samples > 1 &&
+       (usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)) {
+      /* Meta will resolve the image by binding it as a texture. */
+      usage |= VK_IMAGE_USAGE_SAMPLED_BIT;
+   }
+
    if (usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) {
       /* Meta will transfer from the image by binding it as a texture. */
       usage |= VK_IMAGE_USAGE_SAMPLED_BIT;
    }
 
    if (usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) {
-      /* Meta will transfer to the image by binding it as a color attachment,
-       * even if the image format is not a color format.
+      /* For non-clear transfer operations, meta will transfer to the image by
+       * binding it as a color attachment, even if the image format is not
+       * a color format.
        */
       usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+
+      if (anv_format_is_depth_or_stencil(format)) {
+         /* vkCmdClearDepthStencilImage() only requires that
+          * VK_IMAGE_USAGE_TRANSFER_SRC_BIT be set. In particular, it does
+          * not require VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT. Meta
+          * clears the image, though, by binding it as a depthstencil
+          * attachment.
+          */
+         usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+      }
    }
 
    return usage;
@@ -292,77 +212,56 @@ anv_image_get_full_usage(const VkImageCreateInfo *info)
 VkResult
 anv_image_create(VkDevice _device,
                  const struct anv_image_create_info *create_info,
+                 const VkAllocationCallbacks* alloc,
                  VkImage *pImage)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
    const VkImageCreateInfo *pCreateInfo = create_info->vk_info;
-   const VkExtent3D *restrict extent = &pCreateInfo->extent;
    struct anv_image *image = NULL;
+   const struct anv_format *format = anv_format_for_vk_format(pCreateInfo->format);
    VkResult r;
 
    assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
 
    anv_assert(pCreateInfo->mipLevels > 0);
-   anv_assert(pCreateInfo->arraySize > 0);
-   anv_assert(pCreateInfo->samples == 1);
+   anv_assert(pCreateInfo->arrayLayers > 0);
+   anv_assert(pCreateInfo->samples > 0);
    anv_assert(pCreateInfo->extent.width > 0);
    anv_assert(pCreateInfo->extent.height > 0);
    anv_assert(pCreateInfo->extent.depth > 0);
 
-   /* TODO(chadv): How should we validate inputs? */
-   const uint8_t surf_type =
-      anv_surf_type_from_image_type[pCreateInfo->imageType];
-
-   const struct anv_surf_type_limits *limits =
-      &anv_surf_type_limits[surf_type];
-
-   /* Errors should be caught by VkImageFormatProperties. */
-   assert(extent->width <= limits->width);
-   assert(extent->height <= limits->height);
-   assert(extent->depth <= limits->depth);
-
-   image = anv_device_alloc(device, sizeof(*image), 8,
-                            VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
+   image = anv_alloc2(&device->alloc, alloc, sizeof(*image), 8,
+                      VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
    if (!image)
       return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
    memset(image, 0, sizeof(*image));
    image->type = pCreateInfo->imageType;
    image->extent = pCreateInfo->extent;
-   image->format = anv_format_for_vk_format(pCreateInfo->format);
+   image->vk_format = pCreateInfo->format;
+   image->format = format;
    image->levels = pCreateInfo->mipLevels;
-   image->array_size = pCreateInfo->arraySize;
-   image->usage = anv_image_get_full_usage(pCreateInfo);
-   image->surface_type = surf_type;
-
-   if (image->usage & (VK_IMAGE_USAGE_SAMPLED_BIT |
-                       VK_IMAGE_USAGE_STORAGE_BIT)) {
-      image->needs_nonrt_surface_state = true;
-   }
-
-   if (image->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
-      image->needs_color_rt_surface_state = true;
-   }
-
-   if (likely(anv_format_is_color(image->format))) {
-      r = anv_image_make_surface(device, create_info, image->format,
-                                 &image->size, &image->alignment,
-                                 &image->color_surface);
+   image->array_size = pCreateInfo->arrayLayers;
+   image->samples = pCreateInfo->samples;
+   image->usage = anv_image_get_full_usage(pCreateInfo, format);
+   image->tiling = pCreateInfo->tiling;
+
+   if (likely(anv_format_is_color(format))) {
+      r = make_surface(device, image, create_info,
+                       VK_IMAGE_ASPECT_COLOR_BIT);
       if (r != VK_SUCCESS)
          goto fail;
    } else {
-      if (image->format->depth_format) {
-         r = anv_image_make_surface(device, create_info, image->format,
-                                    &image->size, &image->alignment,
-                                    &image->depth_surface);
+      if (image->format->has_depth) {
+         r = make_surface(device, image, create_info,
+                          VK_IMAGE_ASPECT_DEPTH_BIT);
          if (r != VK_SUCCESS)
             goto fail;
       }
 
       if (image->format->has_stencil) {
-         r = anv_image_make_surface(device, create_info, anv_format_s8_uint,
-                                    &image->size, &image->alignment,
-                                    &image->stencil_surface);
+         r = make_surface(device, image, create_info,
+                          VK_IMAGE_ASPECT_STENCIL_BIT);
          if (r != VK_SUCCESS)
             goto fail;
       }
@@ -374,7 +273,7 @@ anv_image_create(VkDevice _device,
 
 fail:
    if (image)
-      anv_device_free(device, image);
+      anv_free2(&device->alloc, alloc, image);
 
    return r;
 }
@@ -382,21 +281,25 @@ fail:
 VkResult
 anv_CreateImage(VkDevice device,
                 const VkImageCreateInfo *pCreateInfo,
+                const VkAllocationCallbacks *pAllocator,
                 VkImage *pImage)
 {
    return anv_image_create(device,
       &(struct anv_image_create_info) {
          .vk_info = pCreateInfo,
+         .isl_tiling_flags = ISL_TILING_ANY_MASK,
       },
+      pAllocator,
       pImage);
 }
 
 void
-anv_DestroyImage(VkDevice _device, VkImage _image)
+anv_DestroyImage(VkDevice _device, VkImage _image,
+                 const VkAllocationCallbacks *pAllocator)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
 
-   anv_device_free(device, anv_image_from_handle(_image));
+   anv_free2(&device->alloc, pAllocator, anv_image_from_handle(_image));
 }
 
 static void
@@ -412,17 +315,13 @@ anv_surface_get_subresource_layout(struct anv_image *image,
    anv_assert(subresource->arrayLayer == 0);
 
    layout->offset = surface->offset;
-   layout->rowPitch = surface->stride;
-   layout->depthPitch = surface->qpitch;
-
-   /* FINISHME: We really shouldn't be doing this calculation here */
-   if (image->array_size > 1)
-      layout->size = surface->qpitch * image->array_size;
-   else
-      layout->size = surface->stride * image->extent.height;
+   layout->rowPitch = surface->isl.row_pitch;
+   layout->depthPitch = isl_surf_get_array_pitch(&surface->isl);
+   layout->arrayPitch = isl_surf_get_array_pitch(&surface->isl);
+   layout->size = surface->isl.size;
 }
 
-VkResult anv_GetImageSubresourceLayout(
+void anv_GetImageSubresourceLayout(
     VkDevice                                    device,
     VkImage                                     _image,
     const VkImageSubresource*                   pSubresource,
@@ -430,34 +329,34 @@ VkResult anv_GetImageSubresourceLayout(
 {
    ANV_FROM_HANDLE(anv_image, image, _image);
 
-   switch (pSubresource->aspect) {
-   case VK_IMAGE_ASPECT_COLOR:
+   assert(__builtin_popcount(pSubresource->aspectMask) == 1);
+
+   switch (pSubresource->aspectMask) {
+   case VK_IMAGE_ASPECT_COLOR_BIT:
       anv_surface_get_subresource_layout(image, &image->color_surface,
                                          pSubresource, pLayout);
       break;
-   case VK_IMAGE_ASPECT_DEPTH:
+   case VK_IMAGE_ASPECT_DEPTH_BIT:
       anv_surface_get_subresource_layout(image, &image->depth_surface,
                                          pSubresource, pLayout);
       break;
-   case VK_IMAGE_ASPECT_STENCIL:
+   case VK_IMAGE_ASPECT_STENCIL_BIT:
       anv_surface_get_subresource_layout(image, &image->stencil_surface,
                                          pSubresource, pLayout);
       break;
    default:
-      return vk_error(VK_UNSUPPORTED);
+      assert(!"Invalid image aspect");
    }
-
-   return VK_SUCCESS;
 }
 
 VkResult
 anv_validate_CreateImageView(VkDevice _device,
                              const VkImageViewCreateInfo *pCreateInfo,
+                             const VkAllocationCallbacks *pAllocator,
                              VkImageView *pView)
 {
    ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image);
    const VkImageSubresourceRange *subresource;
-   const struct anv_image_view_info *view_info;
    const struct anv_format *view_format_info;
 
    /* Validate structure type before dereferencing it. */
@@ -468,7 +367,6 @@ anv_validate_CreateImageView(VkDevice _device,
    /* Validate viewType is in range before using it. */
    assert(pCreateInfo->viewType >= VK_IMAGE_VIEW_TYPE_BEGIN_RANGE);
    assert(pCreateInfo->viewType <= VK_IMAGE_VIEW_TYPE_END_RANGE);
-   view_info = &anv_image_view_info_table[pCreateInfo->viewType];
 
    /* Validate format is in range before using it. */
    assert(pCreateInfo->format >= VK_FORMAT_BEGIN_RANGE);
@@ -476,39 +374,34 @@ anv_validate_CreateImageView(VkDevice _device,
    view_format_info = anv_format_for_vk_format(pCreateInfo->format);
 
    /* Validate channel swizzles. */
-   assert(pCreateInfo->channels.r >= VK_CHANNEL_SWIZZLE_BEGIN_RANGE);
-   assert(pCreateInfo->channels.r <= VK_CHANNEL_SWIZZLE_END_RANGE);
-   assert(pCreateInfo->channels.g >= VK_CHANNEL_SWIZZLE_BEGIN_RANGE);
-   assert(pCreateInfo->channels.g <= VK_CHANNEL_SWIZZLE_END_RANGE);
-   assert(pCreateInfo->channels.b >= VK_CHANNEL_SWIZZLE_BEGIN_RANGE);
-   assert(pCreateInfo->channels.b <= VK_CHANNEL_SWIZZLE_END_RANGE);
-   assert(pCreateInfo->channels.a >= VK_CHANNEL_SWIZZLE_BEGIN_RANGE);
-   assert(pCreateInfo->channels.a <= VK_CHANNEL_SWIZZLE_END_RANGE);
+   assert(pCreateInfo->components.r >= VK_COMPONENT_SWIZZLE_BEGIN_RANGE);
+   assert(pCreateInfo->components.r <= VK_COMPONENT_SWIZZLE_END_RANGE);
+   assert(pCreateInfo->components.g >= VK_COMPONENT_SWIZZLE_BEGIN_RANGE);
+   assert(pCreateInfo->components.g <= VK_COMPONENT_SWIZZLE_END_RANGE);
+   assert(pCreateInfo->components.b >= VK_COMPONENT_SWIZZLE_BEGIN_RANGE);
+   assert(pCreateInfo->components.b <= VK_COMPONENT_SWIZZLE_END_RANGE);
+   assert(pCreateInfo->components.a >= VK_COMPONENT_SWIZZLE_BEGIN_RANGE);
+   assert(pCreateInfo->components.a <= VK_COMPONENT_SWIZZLE_END_RANGE);
 
    /* Validate subresource. */
    assert(subresource->aspectMask != 0);
-   assert(subresource->mipLevels > 0);
-   assert(subresource->arraySize > 0);
+   assert(subresource->levelCount > 0);
+   assert(subresource->layerCount > 0);
    assert(subresource->baseMipLevel < image->levels);
-   assert(subresource->baseMipLevel + subresource->mipLevels <= image->levels);
+   assert(subresource->baseMipLevel + subresource->levelCount <= image->levels);
    assert(subresource->baseArrayLayer < image->array_size);
-   assert(subresource->baseArrayLayer + subresource->arraySize <= image->array_size);
+   assert(subresource->baseArrayLayer + subresource->layerCount <= image->array_size);
    assert(pView);
 
-   if (view_info->is_cube) {
-      assert(subresource->baseArrayLayer % 6 == 0);
-      assert(subresource->arraySize % 6 == 0);
-   }
-
    const VkImageAspectFlags ds_flags = VK_IMAGE_ASPECT_DEPTH_BIT
                                      | VK_IMAGE_ASPECT_STENCIL_BIT;
 
    /* Validate format. */
    if (subresource->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) {
       assert(subresource->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT);
-      assert(!image->format->depth_format);
+      assert(!image->format->has_depth);
       assert(!image->format->has_stencil);
-      assert(!view_format_info->depth_format);
+      assert(!view_format_info->has_depth);
       assert(!view_format_info->has_stencil);
       assert(view_format_info->isl_layout->bs ==
              image->format->isl_layout->bs);
@@ -516,13 +409,13 @@ anv_validate_CreateImageView(VkDevice _device,
       assert((subresource->aspectMask & ~ds_flags) == 0);
 
       if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {
-         assert(image->format->depth_format);
-         assert(view_format_info->depth_format);
+         assert(image->format->has_depth);
+         assert(view_format_info->has_depth);
          assert(view_format_info->isl_layout->bs ==
                 image->format->isl_layout->bs);
       }
 
-      if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL) {
+      if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {
          /* FINISHME: Is it legal to have an R8 view of S8? */
          assert(image->format->has_stencil);
          assert(view_format_info->has_stencil);
@@ -531,19 +424,99 @@ anv_validate_CreateImageView(VkDevice _device,
       assert(!"bad VkImageSubresourceRange::aspectFlags");
    }
 
-   return anv_CreateImageView(_device, pCreateInfo, pView);
+   return anv_CreateImageView(_device, pCreateInfo, pAllocator, pView);
+}
+
+void
+anv_fill_image_surface_state(struct anv_device *device, struct anv_state state,
+                             struct anv_image_view *iview,
+                             const VkImageViewCreateInfo *pCreateInfo,
+                             VkImageUsageFlagBits usage)
+{
+   switch (device->info.gen) {
+   case 7:
+      if (device->info.is_haswell)
+         gen75_fill_image_surface_state(device, state.map, iview,
+                                        pCreateInfo, usage);
+      else
+         gen7_fill_image_surface_state(device, state.map, iview,
+                                       pCreateInfo, usage);
+      break;
+   case 8:
+      gen8_fill_image_surface_state(device, state.map, iview,
+                                    pCreateInfo, usage);
+      break;
+   case 9:
+      gen9_fill_image_surface_state(device, state.map, iview,
+                                    pCreateInfo, usage);
+      break;
+   default:
+      unreachable("unsupported gen\n");
+   }
+
+   if (!device->info.has_llc)
+      anv_state_clflush(state);
+}
+
+static struct anv_state
+alloc_surface_state(struct anv_device *device,
+                    struct anv_cmd_buffer *cmd_buffer)
+{
+      if (cmd_buffer) {
+         return anv_cmd_buffer_alloc_surface_state(cmd_buffer);
+      } else {
+         return anv_state_pool_alloc(&device->surface_state_pool, 64, 64);
+      }
+}
+
+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 VkComponentSwizzle
+remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component,
+              struct anv_format_swizzle format_swizzle)
+{
+   if (swizzle == VK_COMPONENT_SWIZZLE_IDENTITY)
+      swizzle = component;
+
+   switch (swizzle) {
+   case VK_COMPONENT_SWIZZLE_ZERO:
+      return VK_COMPONENT_SWIZZLE_ZERO;
+   case VK_COMPONENT_SWIZZLE_ONE:
+      return VK_COMPONENT_SWIZZLE_ONE;
+   case VK_COMPONENT_SWIZZLE_R:
+      return VK_COMPONENT_SWIZZLE_R + format_swizzle.r;
+   case VK_COMPONENT_SWIZZLE_G:
+      return VK_COMPONENT_SWIZZLE_R + format_swizzle.g;
+   case VK_COMPONENT_SWIZZLE_B:
+      return VK_COMPONENT_SWIZZLE_R + format_swizzle.b;
+   case VK_COMPONENT_SWIZZLE_A:
+      return VK_COMPONENT_SWIZZLE_R + format_swizzle.a;
+   default:
+      unreachable("Invalid swizzle");
+   }
 }
 
 void
 anv_image_view_init(struct anv_image_view *iview,
                     struct anv_device *device,
                     const VkImageViewCreateInfo* pCreateInfo,
-                    struct anv_cmd_buffer *cmd_buffer)
+                    struct anv_cmd_buffer *cmd_buffer,
+                    uint32_t offset)
 {
    ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image);
    const VkImageSubresourceRange *range = &pCreateInfo->subresourceRange;
+   VkImageViewCreateInfo mCreateInfo;
+   memcpy(&mCreateInfo, pCreateInfo, sizeof(VkImageViewCreateInfo));
 
-   assert(range->arraySize > 0);
+   assert(range->layerCount > 0);
    assert(range->baseMipLevel < image->levels);
    assert(image->usage & (VK_IMAGE_USAGE_SAMPLED_BIT |
                           VK_IMAGE_USAGE_STORAGE_BIT |
@@ -555,76 +528,227 @@ anv_image_view_init(struct anv_image_view *iview,
       unreachable("bad VkImageType");
    case VK_IMAGE_TYPE_1D:
    case VK_IMAGE_TYPE_2D:
-      assert(range->baseArrayLayer + range->arraySize - 1 <= image->array_size);
+      assert(range->baseArrayLayer + range->layerCount - 1 <= image->array_size);
       break;
    case VK_IMAGE_TYPE_3D:
-      assert(range->baseArrayLayer + range->arraySize - 1
+      assert(range->baseArrayLayer + range->layerCount - 1
              <= anv_minify(image->extent.depth, range->baseMipLevel));
       break;
    }
 
-   switch (device->info.gen) {
-   case 7:
-      if (device->info.is_haswell)
-         gen75_image_view_init(iview, device, pCreateInfo, cmd_buffer);
+   struct anv_surface *surface =
+      anv_image_get_surface_for_aspect_mask(image, range->aspectMask);
+
+   iview->image = image;
+   iview->bo = image->bo;
+   iview->offset = image->offset + surface->offset + offset;
+
+   iview->aspect_mask = pCreateInfo->subresourceRange.aspectMask;
+   iview->vk_format = pCreateInfo->format;
+
+   struct anv_format_swizzle swizzle;
+   iview->format = anv_get_isl_format(pCreateInfo->format, iview->aspect_mask,
+                                      image->tiling, &swizzle);
+   iview->swizzle.r = remap_swizzle(pCreateInfo->components.r,
+                                    VK_COMPONENT_SWIZZLE_R, swizzle);
+   iview->swizzle.g = remap_swizzle(pCreateInfo->components.g,
+                                    VK_COMPONENT_SWIZZLE_G, swizzle);
+   iview->swizzle.b = remap_swizzle(pCreateInfo->components.b,
+                                    VK_COMPONENT_SWIZZLE_B, swizzle);
+   iview->swizzle.a = remap_swizzle(pCreateInfo->components.a,
+                                    VK_COMPONENT_SWIZZLE_A, swizzle);
+
+   iview->base_layer = range->baseArrayLayer;
+   iview->base_mip = range->baseMipLevel;
+
+   if (!isl_format_is_compressed(iview->format) &&
+       isl_format_is_compressed(image->format->isl_format)) {
+      /* Scale the ImageView extent by the backing Image. This is used
+       * internally when an uncompressed ImageView is created on a
+       * compressed Image. The ImageView can therefore be used for copying
+       * data from a source Image to a destination Image.
+       */
+      const struct isl_format_layout * isl_layout = image->format->isl_layout;
+
+      iview->level_0_extent.depth  = anv_minify(image->extent.depth, range->baseMipLevel);
+      iview->level_0_extent.depth  = DIV_ROUND_UP(iview->level_0_extent.depth, isl_layout->bd);
+
+      iview->level_0_extent.height = isl_surf_get_array_pitch_el_rows(&surface->isl) * image->array_size;
+      iview->level_0_extent.width  = isl_surf_get_row_pitch_el(&surface->isl);
+      mCreateInfo.subresourceRange.baseMipLevel = 0;
+      mCreateInfo.subresourceRange.baseArrayLayer = 0;
+   } else {
+      iview->level_0_extent.width  = image->extent.width;
+      iview->level_0_extent.height = image->extent.height;
+      iview->level_0_extent.depth  = image->extent.depth;
+   }
+
+   iview->extent = (VkExtent3D) {
+      .width  = anv_minify(iview->level_0_extent.width , range->baseMipLevel),
+      .height = anv_minify(iview->level_0_extent.height, range->baseMipLevel),
+      .depth  = anv_minify(iview->level_0_extent.depth , range->baseMipLevel),
+   };
+
+   if (image->usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
+      iview->sampler_surface_state = alloc_surface_state(device, cmd_buffer);
+
+      anv_fill_image_surface_state(device, iview->sampler_surface_state,
+                                   iview, &mCreateInfo,
+                                   VK_IMAGE_USAGE_SAMPLED_BIT);
+   } else {
+      iview->sampler_surface_state.alloc_size = 0;
+   }
+
+   if (image->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
+      iview->color_rt_surface_state = alloc_surface_state(device, cmd_buffer);
+
+      anv_fill_image_surface_state(device, iview->color_rt_surface_state,
+                                   iview, &mCreateInfo,
+                                   VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+   } else {
+      iview->color_rt_surface_state.alloc_size = 0;
+   }
+
+   if (image->usage & VK_IMAGE_USAGE_STORAGE_BIT) {
+      iview->storage_surface_state = alloc_surface_state(device, cmd_buffer);
+
+      if (has_matching_storage_typed_format(device, iview->format))
+         anv_fill_image_surface_state(device, iview->storage_surface_state,
+                                      iview, &mCreateInfo,
+                                      VK_IMAGE_USAGE_STORAGE_BIT);
       else
-         gen7_image_view_init(iview, device, pCreateInfo, cmd_buffer);
-      break;
-   case 8:
-      gen8_image_view_init(iview, device, pCreateInfo, cmd_buffer);
-      break;
-   case 9:
-      gen9_image_view_init(iview, device, pCreateInfo, cmd_buffer);
-      break;
-   default:
-      unreachable("unsupported gen\n");
+         anv_fill_buffer_surface_state(device, iview->storage_surface_state,
+                                       ISL_FORMAT_RAW,
+                                       iview->offset,
+                                       iview->bo->size - iview->offset, 1);
+
+   } else {
+      iview->storage_surface_state.alloc_size = 0;
    }
 }
 
 VkResult
 anv_CreateImageView(VkDevice _device,
                     const VkImageViewCreateInfo *pCreateInfo,
+                    const VkAllocationCallbacks *pAllocator,
                     VkImageView *pView)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
    struct anv_image_view *view;
 
-   view = anv_device_alloc(device, sizeof(*view), 8,
-                           VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
+   view = anv_alloc2(&device->alloc, pAllocator, sizeof(*view), 8,
+                     VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
    if (view == NULL)
       return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
-   anv_image_view_init(view, device, pCreateInfo, NULL);
+   anv_image_view_init(view, device, pCreateInfo, NULL, 0);
 
    *pView = anv_image_view_to_handle(view);
 
    return VK_SUCCESS;
 }
 
-static void
-anv_image_view_destroy(struct anv_device *device,
-                       struct anv_image_view *iview)
+void
+anv_DestroyImageView(VkDevice _device, VkImageView _iview,
+                     const VkAllocationCallbacks *pAllocator)
 {
-   if (iview->image->needs_color_rt_surface_state) {
+   ANV_FROM_HANDLE(anv_device, device, _device);
+   ANV_FROM_HANDLE(anv_image_view, iview, _iview);
+
+   if (iview->color_rt_surface_state.alloc_size > 0) {
       anv_state_pool_free(&device->surface_state_pool,
                           iview->color_rt_surface_state);
    }
 
-   if (iview->image->needs_nonrt_surface_state) {
+   if (iview->sampler_surface_state.alloc_size > 0) {
+      anv_state_pool_free(&device->surface_state_pool,
+                          iview->sampler_surface_state);
+   }
+
+   if (iview->storage_surface_state.alloc_size > 0) {
       anv_state_pool_free(&device->surface_state_pool,
-                          iview->nonrt_surface_state);
+                          iview->storage_surface_state);
    }
 
-   anv_device_free(device, iview);
+   anv_free2(&device->alloc, pAllocator, iview);
+}
+
+VkResult
+anv_CreateBufferView(VkDevice _device,
+                     const VkBufferViewCreateInfo *pCreateInfo,
+                     const VkAllocationCallbacks *pAllocator,
+                     VkBufferView *pView)
+{
+   ANV_FROM_HANDLE(anv_device, device, _device);
+   ANV_FROM_HANDLE(anv_buffer, buffer, pCreateInfo->buffer);
+   struct anv_buffer_view *view;
+
+   view = anv_alloc2(&device->alloc, pAllocator, sizeof(*view), 8,
+                     VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+   if (!view)
+      return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
+
+   const struct anv_format *format =
+      anv_format_for_vk_format(pCreateInfo->format);
+
+   view->format = format->isl_format;
+   view->bo = buffer->bo;
+   view->offset = buffer->offset + pCreateInfo->offset;
+   view->range = pCreateInfo->range == VK_WHOLE_SIZE ?
+                 buffer->size - view->offset : pCreateInfo->range;
+
+   if (buffer->usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) {
+      view->surface_state =
+         anv_state_pool_alloc(&device->surface_state_pool, 64, 64);
+
+      anv_fill_buffer_surface_state(device, view->surface_state,
+                                    view->format,
+                                    view->offset, view->range,
+                                    format->isl_layout->bs);
+   } else {
+      view->surface_state = (struct anv_state){ 0 };
+   }
+
+   if (buffer->usage & VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) {
+      view->storage_surface_state =
+         anv_state_pool_alloc(&device->surface_state_pool, 64, 64);
+
+      enum isl_format storage_format =
+         has_matching_storage_typed_format(device, view->format) ?
+         isl_lower_storage_image_format(&device->isl_dev, view->format) :
+         ISL_FORMAT_RAW;
+
+      anv_fill_buffer_surface_state(device, view->storage_surface_state,
+                                    storage_format,
+                                    view->offset, view->range,
+                                    (storage_format == ISL_FORMAT_RAW ? 1 :
+                                     format->isl_layout->bs));
+
+   } else {
+      view->storage_surface_state = (struct anv_state){ 0 };
+   }
+
+   *pView = anv_buffer_view_to_handle(view);
+
+   return VK_SUCCESS;
 }
 
 void
-anv_DestroyImageView(VkDevice _device, VkImageView _iview)
+anv_DestroyBufferView(VkDevice _device, VkBufferView bufferView,
+                      const VkAllocationCallbacks *pAllocator)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
-   ANV_FROM_HANDLE(anv_image_view, iview, _iview);
+   ANV_FROM_HANDLE(anv_buffer_view, view, bufferView);
 
-   anv_image_view_destroy(device, iview);
+   if (view->surface_state.alloc_size > 0)
+      anv_state_pool_free(&device->surface_state_pool,
+                          view->surface_state);
+
+   if (view->storage_surface_state.alloc_size > 0)
+      anv_state_pool_free(&device->surface_state_pool,
+                          view->storage_surface_state);
+
+   anv_free2(&device->alloc, pAllocator, view);
 }
 
 struct anv_surface *
@@ -637,10 +761,9 @@ anv_image_get_surface_for_aspect_mask(struct anv_image *image, VkImageAspectFlag
        * Meta attaches all destination surfaces as color render targets. Guess
        * what surface the Meta Dragons really want.
        */
-      if (image->format->depth_format && image->format->has_stencil) {
-         anv_finishme("combined depth stencil formats");
+      if (image->format->has_depth && image->format->has_stencil) {
          return &image->depth_surface;
-      } else if (image->format->depth_format) {
+      } else if (image->format->has_depth) {
          return &image->depth_surface;
       } else if (image->format->has_stencil) {
          return &image->stencil_surface;
@@ -649,22 +772,26 @@ anv_image_get_surface_for_aspect_mask(struct anv_image *image, VkImageAspectFlag
       }
       break;
    case VK_IMAGE_ASPECT_DEPTH_BIT:
-      assert(image->format->depth_format);
+      assert(image->format->has_depth);
       return &image->depth_surface;
    case VK_IMAGE_ASPECT_STENCIL_BIT:
       assert(image->format->has_stencil);
       return &image->stencil_surface;
    case VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT:
-      if (image->format->depth_format && image->format->has_stencil) {
-         /* FINISHME: The Vulkan spec (git a511ba2) requires support for combined
-          * depth stencil formats. Specifically, it states:
+      if (image->format->has_depth && image->format->has_stencil) {
+         /* FINISHME: The Vulkan spec (git a511ba2) requires support for
+          * combined depth stencil formats. Specifically, it states:
           *
           *    At least one of ename:VK_FORMAT_D24_UNORM_S8_UINT or
           *    ename:VK_FORMAT_D32_SFLOAT_S8_UINT must be supported.
+          *
+          * Image views with both depth and stencil aspects are only valid for
+          * render target attachments, in which case
+          * cmd_buffer_emit_depth_stencil() will pick out both the depth and
+          * stencil surfaces from the underlying surface.
           */
-         anv_finishme("combined depthstencil aspect");
          return &image->depth_surface;
-      } else if (image->format->depth_format) {
+      } else if (image->format->has_depth) {
          return &image->depth_surface;
       } else if (image->format->has_stencil) {
          return &image->stencil_surface;
@@ -676,34 +803,109 @@ anv_image_get_surface_for_aspect_mask(struct anv_image *image, VkImageAspectFlag
    }
 }
 
-#if 0
-   VkImageAspectFlags aspect_mask = 0;
-   if (format->depth_format)
-      aspect_mask |= VK_IMAGE_ASPECT_DEPTH_BIT;
-   if (format->has_stencil)
-      aspect_mask |= VK_IMAGE_ASPECT_STENCIL_BIT;
-   if (!aspect_mask)
-      aspect_mask |= VK_IMAGE_ASPECT_COLOR_BIT;
-
-   anv_image_view_init(iview, device,
-      &(VkImageViewCreateInfo) {
-         .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
-         .image = info->image,
-         .viewType = VK_IMAGE_VIEW_TYPE_2D,
-         .format = info->format,
-         .channels = {
-            .r = VK_CHANNEL_SWIZZLE_R,
-            .g = VK_CHANNEL_SWIZZLE_G,
-            .b = VK_CHANNEL_SWIZZLE_B,
-            .a = VK_CHANNEL_SWIZZLE_A,
-         },
-         .subresourceRange = {
-            .aspectMask = aspect_mask,
-            .baseMipLevel = info->mipLevel,
-            .mipLevels = 1,
-            .baseArrayLayer = info->baseArraySlice,
-            .arraySize = info->arraySize,
-         },
-      },
-      NULL);
-#endif
+static void
+image_param_defaults(struct brw_image_param *param)
+{
+   memset(param, 0, sizeof *param);
+   /* Set the swizzling shifts to all-ones to effectively disable swizzling --
+    * See emit_address_calculation() in brw_fs_surface_builder.cpp for a more
+    * detailed explanation of these parameters.
+    */
+   param->swizzling[0] = 0xff;
+   param->swizzling[1] = 0xff;
+}
+
+void
+anv_image_view_fill_image_param(struct anv_device *device,
+                                struct anv_image_view *view,
+                                struct brw_image_param *param)
+{
+   image_param_defaults(param);
+
+   const struct isl_surf *surf = &view->image->color_surface.isl;
+   const int cpp = isl_format_get_layout(surf->format)->bs;
+   const struct isl_extent3d image_align_sa =
+      isl_surf_get_image_alignment_sa(surf);
+
+   param->size[0] = view->extent.width;
+   param->size[1] = view->extent.height;
+   if (surf->dim == ISL_SURF_DIM_3D) {
+      param->size[2] = view->extent.depth;
+   } else {
+      param->size[2] = surf->logical_level0_px.array_len - view->base_layer;
+   }
+
+   isl_surf_get_image_offset_el(surf, view->base_mip, view->base_layer, 0,
+                                &param->offset[0],  &param->offset[1]);
+
+   param->stride[0] = cpp;
+   param->stride[1] = surf->row_pitch / cpp;
+
+   if (device->info.gen < 9 && surf->dim == ISL_SURF_DIM_3D) {
+      param->stride[2] = util_align_npot(param->size[0], image_align_sa.w);
+      param->stride[3] = util_align_npot(param->size[1], image_align_sa.h);
+   } else {
+      param->stride[2] = 0;
+      param->stride[3] = isl_surf_get_array_pitch_el_rows(surf);
+   }
+
+   switch (surf->tiling) {
+   case ISL_TILING_LINEAR:
+      /* image_param_defaults is good enough */
+      break;
+
+   case ISL_TILING_X:
+      /* An X tile is a rectangular block of 512x8 bytes. */
+      param->tiling[0] = util_logbase2(512 / cpp);
+      param->tiling[1] = util_logbase2(8);
+
+      if (device->isl_dev.has_bit6_swizzling) {
+         /* Right shifts required to swizzle bits 9 and 10 of the memory
+          * address with bit 6.
+          */
+         param->swizzling[0] = 3;
+         param->swizzling[1] = 4;
+      }
+      break;
+
+   case ISL_TILING_Y0:
+      /* The layout of a Y-tiled surface in memory isn't really fundamentally
+       * different to the layout of an X-tiled surface, we simply pretend that
+       * the surface is broken up in a number of smaller 16Bx32 tiles, each
+       * one arranged in X-major order just like is the case for X-tiling.
+       */
+      param->tiling[0] = util_logbase2(16 / cpp);
+      param->tiling[1] = util_logbase2(32);
+
+      if (device->isl_dev.has_bit6_swizzling) {
+         /* Right shift required to swizzle bit 9 of the memory address with
+          * bit 6.
+          */
+         param->swizzling[0] = 3;
+         param->swizzling[1] = 0xff;
+      }
+      break;
+
+   default:
+      assert(!"Unhandled storage image tiling");
+   }
+
+   /* 3D textures are arranged in 2D in memory with 2^lod slices per row.  The
+    * address calculation algorithm (emit_address_calculation() in
+    * brw_fs_surface_builder.cpp) handles this as a sort of tiling with
+    * modulus equal to the LOD.
+    */
+   param->tiling[2] = (device->info.gen < 9 && surf->dim == ISL_SURF_DIM_3D ?
+                       view->base_mip : 0);
+}
+
+void
+anv_buffer_view_fill_image_param(struct anv_device *device,
+                                 struct anv_buffer_view *view,
+                                 struct brw_image_param *param)
+{
+   image_param_defaults(param);
+
+   param->stride[0] = isl_format_layouts[view->format].bs;
+   param->size[0] = view->range / param->stride[0];
+}