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/common/icd-instance.c

diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c
index fed138e..6d6c2cf 100644
--- a/icd/common/icd-instance.c
+++ b/icd/common/icd-instance.c
@@ -33,7 +33,7 @@
 
 static void * VKAPI default_alloc(void *user_data, size_t size,
                                    size_t alignment,
-                                   VK_SYSTEM_ALLOC_TYPE allocType)
+                                   VkSystemAllocType allocType)
 {
     if (alignment <= 1) {
         return malloc(size);
@@ -61,10 +61,10 @@
     free(ptr);
 }
 
-struct icd_instance *icd_instance_create(const VK_APPLICATION_INFO *app_info,
-                                         const VK_ALLOC_CALLBACKS *alloc_cb)
+struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info,
+                                         const VkAllocCallbacks *alloc_cb)
 {
-    static const VK_ALLOC_CALLBACKS default_alloc_cb = {
+    static const VkAllocCallbacks default_alloc_cb = {
         .pfnAlloc = default_alloc,
         .pfnFree = default_free,
     };
@@ -114,10 +114,10 @@
     icd_instance_free(instance, instance);
 }
 
-VK_RESULT icd_instance_set_bool(struct icd_instance *instance,
+VkResult icd_instance_set_bool(struct icd_instance *instance,
                                  VK_DBG_GLOBAL_OPTION option, bool yes)
 {
-    VK_RESULT res = VK_SUCCESS;
+    VkResult res = VK_SUCCESS;
 
     switch (option) {
     case VK_DBG_OPTION_DEBUG_ECHO_ENABLE:
@@ -137,7 +137,7 @@
     return res;
 }
 
-VK_RESULT icd_instance_add_logger(struct icd_instance *instance,
+VkResult icd_instance_add_logger(struct icd_instance *instance,
                                    VK_DBG_MSG_CALLBACK_FUNCTION func,
                                    void *user_data)
 {
@@ -164,7 +164,7 @@
     return VK_SUCCESS;
 }
 
-VK_RESULT icd_instance_remove_logger(struct icd_instance *instance,
+VkResult icd_instance_remove_logger(struct icd_instance *instance,
                                       VK_DBG_MSG_CALLBACK_FUNCTION func)
 {
     struct icd_instance_logger *logger, *prev;
@@ -190,8 +190,8 @@
 
 void icd_instance_log(const struct icd_instance *instance,
                       VK_DBG_MSG_TYPE msg_type,
-                      VK_VALIDATION_LEVEL validation_level,
-                      VK_BASE_OBJECT src_object,
+                      VkValidationLevel validation_level,
+                      VkBaseObject src_object,
                       size_t location, int32_t msg_code,
                       const char *msg)
 {