commit c278df83ca4958fda8efcf3b52e2f89c8ccd8991
author Chia-I Wu <olv@lunarg.com> Tue Jul 07 11:50:03 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:17 2015 -0600
tree 35d20b066d5eaec66fb9ae5f952dcc0d9b08de92
parent bdeed1546150c8b0584710c77a8c6e62936f21fe

update vulkan.h for multi-pass command buffers (V131, #14075)

Minimal changes to keep everything building and functioning.

TODO: Need to port draw_state to use new VkAttachmentView structure.

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 32490b7..bb76e42 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -254,19 +254,19 @@
                                      uint32_t lod, uint32_t layer,
                                      struct intel_cmd_meta *meta)
 {
-    VkColorAttachmentViewCreateInfo info;
+    VkAttachmentViewCreateInfo info;
     struct intel_att_view *view;
     VkResult ret;
 
     memset(&info, 0, sizeof(info));
-    info.sType = VK_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO;
+    info.sType = VK_STRUCTURE_TYPE_ATTACHMENT_VIEW_CREATE_INFO;
     info.image = (VkImage) img;
     info.format = format;
     info.mipLevel = lod;
     info.baseArraySlice = layer;
     info.arraySize = 1;
 
-    ret = intel_att_view_create_for_color(cmd->dev, &info, &view);
+    ret = intel_att_view_create(cmd->dev, &info, &view);
     if (ret != VK_SUCCESS) {
         cmd_fail(cmd, ret);
         return;
@@ -322,18 +322,18 @@
                                  uint32_t lod, uint32_t layer,
                                  struct intel_cmd_meta *meta)
 {
-    VkDepthStencilViewCreateInfo info;
+    VkAttachmentViewCreateInfo info;
     struct intel_att_view *view;
     VkResult ret;
 
     memset(&info, 0, sizeof(info));
-    info.sType = VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO;
+    info.sType = VK_STRUCTURE_TYPE_ATTACHMENT_VIEW_CREATE_INFO;
     info.image = (VkImage) img;
     info.mipLevel = lod;
     info.baseArraySlice = layer;
     info.arraySize = 1;
 
-    ret = intel_att_view_create_for_ds(cmd->dev, &info, &view);
+    ret = intel_att_view_create(cmd->dev, &info, &view);
     if (ret != VK_SUCCESS) {
         cmd_fail(cmd, ret);
         return;