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

diff --git a/icd/intel/query.c b/icd/intel/query.c
index 93e5de6..78709ea 100644
--- a/icd/intel/query.c
+++ b/icd/intel/query.c
@@ -36,18 +36,18 @@
     intel_query_destroy(query);
 }
 
-static VK_RESULT query_get_info(struct intel_base *base, int type,
+static VkResult query_get_info(struct intel_base *base, int type,
                                  size_t *size, void *data)
 {
     struct intel_query *query = intel_query_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;
             mem_req->size = query->slot_stride * query->slot_count;
@@ -63,8 +63,8 @@
     return ret;
 }
 
-VK_RESULT intel_query_create(struct intel_dev *dev,
-                              const VK_QUERY_POOL_CREATE_INFO *info,
+VkResult intel_query_create(struct intel_dev *dev,
+                              const VkQueryPoolCreateInfo *info,
                               struct intel_query **query_ret)
 {
     struct intel_query *query;
@@ -89,7 +89,7 @@
         break;
     case VK_QUERY_PIPELINE_STATISTICS:
         query->slot_stride =
-            u_align(sizeof(VK_PIPELINE_STATISTICS_DATA) * 2, 64);
+            u_align(sizeof(VkPipelineStatisticsData) * 2, 64);
         break;
     default:
         break;
@@ -131,7 +131,7 @@
 static void
 query_process_pipeline_statistics(const struct intel_query *query,
                                   uint32_t count, const uint8_t *raw,
-                                  VK_PIPELINE_STATISTICS_DATA *results)
+                                  VkPipelineStatisticsData *results)
 {
     const uint32_t num_regs = sizeof(results[0]) / sizeof(uint64_t);
     uint32_t i, j;
@@ -148,7 +148,7 @@
     }
 }
 
-VK_RESULT intel_query_get_results(struct intel_query *query,
+VkResult intel_query_get_results(struct intel_query *query,
                                    uint32_t slot_start, uint32_t slot_count,
                                    void *results)
 {
@@ -183,10 +183,10 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkCreateQueryPool(
-    VK_DEVICE                                  device,
-    const VK_QUERY_POOL_CREATE_INFO*           pCreateInfo,
-    VK_QUERY_POOL*                             pQueryPool)
+ICD_EXPORT VkResult VKAPI vkCreateQueryPool(
+    VkDevice                                  device,
+    const VkQueryPoolCreateInfo*           pCreateInfo,
+    VkQueryPool*                             pQueryPool)
 {
     struct intel_dev *dev = intel_dev(device);
 
@@ -194,8 +194,8 @@
             (struct intel_query **) pQueryPool);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkGetQueryPoolResults(
-    VK_QUERY_POOL                              queryPool,
+ICD_EXPORT VkResult VKAPI vkGetQueryPoolResults(
+    VkQueryPool                              queryPool,
     uint32_t                                    startQuery,
     uint32_t                                    queryCount,
     size_t*                                     pDataSize,
@@ -208,7 +208,7 @@
         *pDataSize = sizeof(uint64_t) * queryCount;
         break;
     case VK_QUERY_PIPELINE_STATISTICS:
-        *pDataSize = sizeof(VK_PIPELINE_STATISTICS_DATA) * queryCount;
+        *pDataSize = sizeof(VkPipelineStatisticsData) * queryCount;
         break;
     default:
         return VK_ERROR_INVALID_HANDLE;