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

diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index ad3f6db..34e06f9 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -142,9 +142,9 @@
     return instance;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkCreateInstance(
+ICD_EXPORT VkResult VKAPI vkCreateInstance(
     const VkInstanceCreateInfo*             pCreateInfo,
-    VK_INSTANCE*                               pInstance)
+    VkInstance*                               pInstance)
 {
     struct intel_instance *instance;
 
@@ -152,13 +152,13 @@
     if (!instance)
         return VK_ERROR_OUT_OF_MEMORY;
 
-    *pInstance = (VK_INSTANCE) instance;
+    *pInstance = (VkInstance) instance;
 
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkDestroyInstance(
-    VK_INSTANCE                                pInstance)
+ICD_EXPORT VkResult VKAPI vkDestroyInstance(
+    VkInstance                                pInstance)
 {
     struct intel_instance *instance = intel_instance(pInstance);
 
@@ -167,15 +167,15 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkEnumerateGpus(
-    VK_INSTANCE                                instance_,
+ICD_EXPORT VkResult VKAPI vkEnumerateGpus(
+    VkInstance                                instance_,
     uint32_t                                    maxGpus,
     uint32_t*                                   pGpuCount,
-    VK_PHYSICAL_GPU*                           pGpus)
+    VkPhysicalGpu*                           pGpus)
 {
     struct intel_instance *instance = intel_instance(instance_);
     struct icd_drm_device *devices, *dev;
-    VK_RESULT ret;
+    VkResult ret;
     uint32_t count;
 
     intel_instance_remove_gpus(instance);
@@ -206,7 +206,7 @@
         if (ret == VK_SUCCESS) {
             intel_instance_add_gpu(instance, gpu);
 
-            pGpus[count++] = (VK_PHYSICAL_GPU) gpu;
+            pGpus[count++] = (VkPhysicalGpu) gpu;
             if (count >= maxGpus)
                 break;
         }
@@ -221,8 +221,8 @@
     return (count > 0) ? VK_SUCCESS : VK_ERROR_UNAVAILABLE;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkDbgRegisterMsgCallback(
-    VK_INSTANCE                                instance_,
+ICD_EXPORT VkResult VKAPI vkDbgRegisterMsgCallback(
+    VkInstance                                instance_,
     VK_DBG_MSG_CALLBACK_FUNCTION               pfnMsgCallback,
     void*                                       pUserData)
 {
@@ -231,8 +231,8 @@
     return icd_instance_add_logger(instance->icd, pfnMsgCallback, pUserData);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkDbgUnregisterMsgCallback(
-    VK_INSTANCE                                instance_,
+ICD_EXPORT VkResult VKAPI vkDbgUnregisterMsgCallback(
+    VkInstance                                instance_,
     VK_DBG_MSG_CALLBACK_FUNCTION               pfnMsgCallback)
 {
     struct intel_instance *instance = intel_instance(instance_);
@@ -240,14 +240,14 @@
     return icd_instance_remove_logger(instance->icd, pfnMsgCallback);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkDbgSetGlobalOption(
-    VK_INSTANCE                                instance_,
+ICD_EXPORT VkResult VKAPI vkDbgSetGlobalOption(
+    VkInstance                                instance_,
     VK_DBG_GLOBAL_OPTION                       dbgOption,
     size_t                                      dataSize,
     const void*                                 pData)
 {
     struct intel_instance *instance = intel_instance(instance_);
-    VK_RESULT res = VK_SUCCESS;
+    VkResult res = VK_SUCCESS;
 
     if (dataSize == 0)
         return VK_ERROR_INVALID_VALUE;