commit 382489d723fd0d3935da0dc7e1021c56c7b721d3
author Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Apr 10 08:34:15 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:48:19 2015 +0800
tree 21dfb4fec0a8769c6e65a4fe04dea8c555dd1b00
parent 10ec96277b441ea55078a3dd87402c726a805f86

vulkan: beautification changes

TODO: verify vk-layer-generate.py

TODO: need to rename object tracker generator

v2: fix "python3 vulkan.py"
    fix dead cod in tri introduced by rebase
    beautify wsi_null.c (olv)

icd/intel/view.h

diff --git a/icd/intel/view.h b/icd/intel/view.h
index 3f9ab4b..19e1cc2 100644
--- a/icd/intel/view.h
+++ b/icd/intel/view.h
@@ -59,7 +59,7 @@
     struct intel_img *img;
 
     float min_lod;
-    VK_CHANNEL_MAPPING shader_swizzles;
+    VkChannelMapping shader_swizzles;
 
     /* SURFACE_STATE */
     uint32_t cmd[8];
@@ -95,7 +95,7 @@
     bool has_hiz;
 };
 
-static inline struct intel_buf_view *intel_buf_view(VK_BUFFER_VIEW view)
+static inline struct intel_buf_view *intel_buf_view(VkBufferView view)
 {
     return (struct intel_buf_view *) view;
 }
@@ -105,7 +105,7 @@
     return (struct intel_buf_view *) obj;
 }
 
-static inline struct intel_img_view *intel_img_view(VK_IMAGE_VIEW view)
+static inline struct intel_img_view *intel_img_view(VkImageView view)
 {
     return (struct intel_img_view *) view;
 }
@@ -115,7 +115,7 @@
     return (struct intel_img_view *) obj;
 }
 
-static inline struct intel_rt_view *intel_rt_view(VK_COLOR_ATTACHMENT_VIEW view)
+static inline struct intel_rt_view *intel_rt_view(VkColorAttachmentView view)
 {
     return (struct intel_rt_view *) view;
 }
@@ -125,7 +125,7 @@
     return (struct intel_rt_view *) obj;
 }
 
-static inline struct intel_ds_view *intel_ds_view(VK_DEPTH_STENCIL_VIEW view)
+static inline struct intel_ds_view *intel_ds_view(VkDepthStencilView view)
 {
     return (struct intel_ds_view *) view;
 }
@@ -138,24 +138,24 @@
 void intel_null_view_init(struct intel_null_view *view,
                           struct intel_dev *dev);
 
-VK_RESULT intel_buf_view_create(struct intel_dev *dev,
+VkResult intel_buf_view_create(struct intel_dev *dev,
                                  const VkBufferViewCreateInfo *info,
                                  struct intel_buf_view **view_ret);
 
 void intel_buf_view_destroy(struct intel_buf_view *view);
 
-VK_RESULT intel_img_view_create(struct intel_dev *dev,
-                                 const VK_IMAGE_VIEW_CREATE_INFO *info,
+VkResult intel_img_view_create(struct intel_dev *dev,
+                                 const VkImageViewCreateInfo *info,
                                  struct intel_img_view **view_ret);
 void intel_img_view_destroy(struct intel_img_view *view);
 
-VK_RESULT intel_rt_view_create(struct intel_dev *dev,
-                                const VK_COLOR_ATTACHMENT_VIEW_CREATE_INFO *info,
+VkResult intel_rt_view_create(struct intel_dev *dev,
+                                const VkColorAttachmentViewCreateInfo *info,
                                 struct intel_rt_view **view_ret);
 void intel_rt_view_destroy(struct intel_rt_view *view);
 
-VK_RESULT intel_ds_view_create(struct intel_dev *dev,
-                                const VK_DEPTH_STENCIL_VIEW_CREATE_INFO *info,
+VkResult intel_ds_view_create(struct intel_dev *dev,
+                                const VkDepthStencilViewCreateInfo *info,
                                 struct intel_ds_view **view_ret);
 void intel_ds_view_destroy(struct intel_ds_view *view);