vk: Merge anv_attachment_view into anv_image_view

This prepares for merging VkAttachmentView into VkImageView.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c
index 64f10ffe74e..470ea11df6f 100644
--- a/src/vulkan/anv_cmd_buffer.c
+++ b/src/vulkan/anv_cmd_buffer.c
@@ -431,11 +431,8 @@ anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
     * put the color attachments into the binding table.
     */
    for (uint32_t a = 0; a < attachments; a++) {
-      const struct anv_attachment_view *aview =
+      const struct anv_image_view *iview =
          fb->attachments[subpass->color_attachments[a]];
-      const struct anv_image_view *iview = &aview->image_view;
-
-      assert(aview->attachment_type == ANV_ATTACHMENT_VIEW_TYPE_COLOR);
 
       bt_map[a] = iview->surface_state.offset + state_offset;
       add_surface_state_reloc(cmd_buffer, iview->surface_state,
@@ -814,7 +811,7 @@ VkResult anv_ResetCommandPool(
 /**
  * Return NULL if the current subpass has no depthstencil attachment.
  */
-const struct anv_attachment_view *
+const struct anv_image_view *
 anv_cmd_buffer_get_depth_stencil_view(const struct anv_cmd_buffer *cmd_buffer)
 {
    const struct anv_subpass *subpass = cmd_buffer->state.subpass;
@@ -823,10 +820,10 @@ anv_cmd_buffer_get_depth_stencil_view(const struct anv_cmd_buffer *cmd_buffer)
    if (subpass->depth_stencil_attachment == VK_ATTACHMENT_UNUSED)
       return NULL;
 
-   const struct anv_attachment_view *aview =
+   const struct anv_image_view *iview =
       fb->attachments[subpass->depth_stencil_attachment];
 
-   assert(aview->attachment_type == ANV_ATTACHMENT_VIEW_TYPE_DEPTH_STENCIL);
+   assert(anv_format_is_depth_or_stencil(iview->format));
 
-   return aview;
+   return iview;
 }