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/buf.c

diff --git a/icd/intel/buf.c b/icd/intel/buf.c
index a6a3c76..b670b7c 100644
--- a/icd/intel/buf.c
+++ b/icd/intel/buf.c
@@ -36,18 +36,18 @@
     intel_buf_destroy(buf);
 }
 
-static VK_RESULT buf_get_info(struct intel_base *base, int type,
+static VkResult buf_get_info(struct intel_base *base, int type,
                                size_t *size, void *data)
 {
     struct intel_buf *buf = intel_buf_from_base(base);
-    VK_RESULT ret = VK_SUCCESS;
+    VkResult ret = VK_SUCCESS;
 
     switch (type) {
     case VK_INFO_TYPE_MEMORY_REQUIREMENTS:
         {
-            VK_MEMORY_REQUIREMENTS *mem_req = data;
+            VkMemoryRequirements *mem_req = data;
 
-            *size = sizeof(VK_MEMORY_REQUIREMENTS);
+            *size = sizeof(VkMemoryRequirements);
             if (data == NULL)
                 return ret;
 
@@ -70,9 +70,9 @@
         break;
         case VK_INFO_TYPE_BUFFER_MEMORY_REQUIREMENTS:
         {
-            VK_BUFFER_MEMORY_REQUIREMENTS *buf_req = data;
+            VkBufferMemoryRequirements *buf_req = data;
 
-            *size = sizeof(VK_BUFFER_MEMORY_REQUIREMENTS);
+            *size = sizeof(VkBufferMemoryRequirements);
             if (data == NULL)
                 return ret;
             buf_req->usage = buf->usage;
@@ -86,7 +86,7 @@
     return ret;
 }
 
-VK_RESULT intel_buf_create(struct intel_dev *dev,
+VkResult intel_buf_create(struct intel_dev *dev,
                             const VkBufferCreateInfo *info,
                             struct intel_buf **buf_ret)
 {
@@ -113,10 +113,10 @@
     intel_base_destroy(&buf->obj.base);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkCreateBuffer(
-    VK_DEVICE                                  device,
+ICD_EXPORT VkResult VKAPI vkCreateBuffer(
+    VkDevice                                  device,
     const VkBufferCreateInfo*               pCreateInfo,
-    VK_BUFFER*                                 pBuffer)
+    VkBuffer*                                 pBuffer)
 {
     struct intel_dev *dev = intel_dev(device);