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

diff --git a/icd/intel/mem.c b/icd/intel/mem.c
index 81a120a..e998514 100644
--- a/icd/intel/mem.c
+++ b/icd/intel/mem.c
@@ -28,7 +28,7 @@
 #include "dev.h"
 #include "mem.h"
 
-VK_RESULT intel_mem_alloc(struct intel_dev *dev,
+VkResult intel_mem_alloc(struct intel_dev *dev,
                            const VkMemoryAllocInfo *info,
                            struct intel_mem **mem_ret)
 {
@@ -62,7 +62,7 @@
     intel_base_destroy(&mem->base);
 }
 
-VK_RESULT intel_mem_import_userptr(struct intel_dev *dev,
+VkResult intel_mem_import_userptr(struct intel_dev *dev,
                                     const void *userptr,
                                     size_t size,
                                     struct intel_mem **mem_ret)
@@ -92,25 +92,25 @@
     return VK_SUCCESS;
 }
 
-VK_RESULT intel_mem_set_priority(struct intel_mem *mem,
-                                  VK_MEMORY_PRIORITY priority)
+VkResult intel_mem_set_priority(struct intel_mem *mem,
+                                  VkMemoryPriority priority)
 {
     /* pin the bo when VK_MEMORY_PRIORITY_VERY_HIGH? */
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkAllocMemory(
-    VK_DEVICE                                  device,
+ICD_EXPORT VkResult VKAPI vkAllocMemory(
+    VkDevice                                  device,
     const VkMemoryAllocInfo*                pAllocInfo,
-    VK_GPU_MEMORY*                             pMem)
+    VkGpuMemory*                             pMem)
 {
     struct intel_dev *dev = intel_dev(device);
 
     return intel_mem_alloc(dev, pAllocInfo, (struct intel_mem **) pMem);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkFreeMemory(
-    VK_GPU_MEMORY                              mem_)
+ICD_EXPORT VkResult VKAPI vkFreeMemory(
+    VkGpuMemory                              mem_)
 {
     struct intel_mem *mem = intel_mem(mem_);
 
@@ -119,18 +119,18 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkSetMemoryPriority(
-    VK_GPU_MEMORY                              mem_,
-    VK_MEMORY_PRIORITY                         priority)
+ICD_EXPORT VkResult VKAPI vkSetMemoryPriority(
+    VkGpuMemory                              mem_,
+    VkMemoryPriority                         priority)
 {
     struct intel_mem *mem = intel_mem(mem_);
 
     return intel_mem_set_priority(mem, priority);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkMapMemory(
-    VK_GPU_MEMORY                              mem_,
-    VK_FLAGS                                   flags,
+ICD_EXPORT VkResult VKAPI vkMapMemory(
+    VkGpuMemory                              mem_,
+    VkFlags                                   flags,
     void**                                      ppData)
 {
     struct intel_mem *mem = intel_mem(mem_);
@@ -141,8 +141,8 @@
     return (ptr) ? VK_SUCCESS : VK_ERROR_UNKNOWN;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkUnmapMemory(
-    VK_GPU_MEMORY                              mem_)
+ICD_EXPORT VkResult VKAPI vkUnmapMemory(
+    VkGpuMemory                              mem_)
 {
     struct intel_mem *mem = intel_mem(mem_);
 
@@ -151,11 +151,11 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkPinSystemMemory(
-    VK_DEVICE                                  device,
+ICD_EXPORT VkResult VKAPI vkPinSystemMemory(
+    VkDevice                                  device,
     const void*                                 pSysMem,
     size_t                                      memSize,
-    VK_GPU_MEMORY*                             pMem)
+    VkGpuMemory*                             pMem)
 {
     struct intel_dev *dev = intel_dev(device);
 
@@ -163,18 +163,18 @@
             (struct intel_mem **) pMem);
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkOpenSharedMemory(
-    VK_DEVICE                                  device,
-    const VK_MEMORY_OPEN_INFO*                 pOpenInfo,
-    VK_GPU_MEMORY*                             pMem)
+ICD_EXPORT VkResult VKAPI vkOpenSharedMemory(
+    VkDevice                                  device,
+    const VkMemoryOpenInfo*                 pOpenInfo,
+    VkGpuMemory*                             pMem)
 {
     return VK_ERROR_UNAVAILABLE;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkOpenPeerMemory(
-    VK_DEVICE                                  device,
-    const VK_PEER_MEMORY_OPEN_INFO*            pOpenInfo,
-    VK_GPU_MEMORY*                             pMem)
+ICD_EXPORT VkResult VKAPI vkOpenPeerMemory(
+    VkDevice                                  device,
+    const VkPeerMemoryOpenInfo*            pOpenInfo,
+    VkGpuMemory*                             pMem)
 {
     return VK_ERROR_UNAVAILABLE;
 }