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/view.h

diff --git a/icd/intel/view.h b/icd/intel/view.h
index 1fc4da6..dda9d3d 100644
--- a/icd/intel/view.h
+++ b/icd/intel/view.h
@@ -111,12 +111,7 @@
     return (struct intel_img_view *) obj;
 }
 
-static inline struct intel_att_view *intel_att_view_from_color(VkColorAttachmentView view)
-{
-    return (struct intel_att_view *) view;
-}
-
-static inline struct intel_att_view *intel_att_view_from_ds(VkDepthStencilView view)
+static inline struct intel_att_view *intel_att_view(VkAttachmentView view)
 {
     return (struct intel_att_view *) view;
 }
@@ -140,12 +135,9 @@
                                  struct intel_img_view **view_ret);
 void intel_img_view_destroy(struct intel_img_view *view);
 
-VkResult intel_att_view_create_for_color(struct intel_dev *dev,
-                                         const VkColorAttachmentViewCreateInfo *info,
-                                         struct intel_att_view **view_ret);
-VkResult intel_att_view_create_for_ds(struct intel_dev *dev,
-                                      const VkDepthStencilViewCreateInfo *info,
-                                      struct intel_att_view **view_ret);
+VkResult intel_att_view_create(struct intel_dev *dev,
+                               const VkAttachmentViewCreateInfo *info,
+                               struct intel_att_view **view_ret);
 void intel_att_view_destroy(struct intel_att_view *view);
 
 #endif /* VIEW_H */