commit 1856d6f9294c7f9544cb58823fbfddef1546229d
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Sep 01 17:30:39 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Sep 02 11:33:56 2015 -0600
tree e5828116e24f531d62a31e69ed5170daa75f0518
parent a5e344364ad54fdb6774277fb8c374a02e2457a8

Bug 14522: Remove VkAttachmentView

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14522
Several parts of the driver really want an attachment view
so I've included the attachment information in the
intel_img_view structure and initialize both when the
view is created.
Parts of the meta path only need intel_att_view and
I kept that in place.

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index ce589c0..05cc993 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -126,8 +126,8 @@
                                      struct intel_cmd_meta *meta)
 {
     VkImageViewCreateInfo info;
-    struct intel_img_view *view;
-    VkResult ret;
+    struct intel_img_view tmp_view;
+    struct intel_img_view *view = &tmp_view;
 
     memset(&info, 0, sizeof(info));
     info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
@@ -171,11 +171,7 @@
     info.subresourceRange.baseArraySlice = 0;
     info.subresourceRange.arraySize = VK_REMAINING_ARRAY_SLICES;
 
-    ret = intel_img_view_create(cmd->dev, &info, &view);
-    if (ret != VK_SUCCESS) {
-        cmd_fail(cmd, ret);
-        return;
-    }
+    intel_img_view_init(cmd->dev, &info, view);
 
     meta->src.valid = true;
 
@@ -187,7 +183,7 @@
     meta->src.reloc_offset = 0;
     meta->src.reloc_flags = 0;
 
-    intel_img_view_destroy(view);
+    /* Don't need tmp_view anymore */
 }
 
 static void cmd_meta_adjust_compressed_dst(struct intel_cmd *cmd,
@@ -258,23 +254,20 @@
                                      uint32_t lod, uint32_t layer,
                                      struct intel_cmd_meta *meta)
 {
-    VkAttachmentViewCreateInfo info;
-    struct intel_att_view *view;
-    VkResult ret;
+    struct intel_att_view tmp_view;
+    struct intel_att_view *view = &tmp_view;
+    VkImageViewCreateInfo info;
 
     memset(&info, 0, sizeof(info));
-    info.sType = VK_STRUCTURE_TYPE_ATTACHMENT_VIEW_CREATE_INFO;
+    info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
     info.image.handle = (uint64_t) img;
     info.format = format;
-    info.mipLevel = lod;
-    info.baseArraySlice = layer;
-    info.arraySize = 1;
+    info.subresourceRange.baseMipLevel = lod;
+    info.subresourceRange.mipLevels = 1;
+    info.subresourceRange.baseArraySlice = layer;
+    info.subresourceRange.arraySize = 1;
 
-    ret = intel_att_view_create(cmd->dev, &info, &view);
-    if (ret != VK_SUCCESS) {
-        cmd_fail(cmd, ret);
-        return;
-    }
+    intel_att_view_init(cmd->dev, &info, view);
 
     meta->dst.valid = true;
 
@@ -288,8 +281,6 @@
 
     if (icd_format_is_compressed(img->layout.format))
         cmd_meta_adjust_compressed_dst(cmd, img, meta);
-
-    intel_att_view_destroy(view);
 }
 
 static void cmd_meta_set_src_for_writer(struct intel_cmd *cmd,
@@ -328,24 +319,17 @@
                                  uint32_t lod, uint32_t layer,
                                  struct intel_cmd_meta *meta)
 {
-    VkAttachmentViewCreateInfo info;
-    struct intel_att_view *view;
-    VkResult ret;
+    VkImageViewCreateInfo info;
 
     memset(&info, 0, sizeof(info));
-    info.sType = VK_STRUCTURE_TYPE_ATTACHMENT_VIEW_CREATE_INFO;
+    info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
     info.image.handle = (uint64_t)img;
-    info.mipLevel = lod;
-    info.baseArraySlice = layer;
-    info.arraySize = 1;
+    info.subresourceRange.baseMipLevel = lod;
+    info.subresourceRange.mipLevels = 1;
+    info.subresourceRange.baseArraySlice = layer;
+    info.subresourceRange.arraySize = 1;
 
-    ret = intel_att_view_create(cmd->dev, &info, &view);
-    if (ret != VK_SUCCESS) {
-        cmd_fail(cmd, ret);
-        return;
-    }
-
-    meta->ds.view = view;
+    intel_att_view_init(cmd->dev, &info, &meta->ds.view);
 }
 
 static void cmd_meta_set_ds_state(struct intel_cmd *cmd,
@@ -869,8 +853,6 @@
                         meta->clear_val[1], meta);
 
                 cmd_draw_meta(cmd, meta);
-
-                intel_att_view_destroy(meta->ds.view);
             }
 
             meta->dst.layer++;