commit 8205d901f17b1c76d89c956be235cf4e7a20a546
author Tony Barbour <tony@LunarG.com> Thu Apr 16 15:59:00 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Apr 16 19:34:59 2015 -0600
tree b61bc0efb64f6fb76676dbc2629fd08eef00a871
parent 07b309a0cdfca1532ad14038682716ea7f77538d

Bug 13632 Header 84 Assorted questions and comments on vulkan.h

icd/intel/instance.c

diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index fd7265d..a515e2c 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -121,7 +121,7 @@
         return NULL;
 
     instance = icd_instance_alloc(icd, sizeof(*instance), 0,
-            VK_SYSTEM_ALLOC_API_OBJECT);
+            VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
     if (!instance) {
         icd_instance_destroy(icd);
         return NULL;
@@ -150,7 +150,7 @@
 
     instance = intel_instance_create(pCreateInfo);
     if (!instance)
-        return VK_ERROR_OUT_OF_MEMORY;
+        return VK_ERROR_OUT_OF_HOST_MEMORY;
 
     *pInstance = (VkInstance) instance;
 
@@ -170,7 +170,7 @@
 ICD_EXPORT VkResult VKAPI vkEnumeratePhysicalDevices(
     VkInstance                                instance_,
     uint32_t*                                 pPhysicalDeviceCount,
-    VkPhysicalGpu*                            pPhysicalDevices)
+    VkPhysicalDevice*                            pPhysicalDevices)
 {
     struct intel_instance *instance = intel_instance(instance_);
     struct icd_drm_device *devices, *dev;
@@ -205,7 +205,7 @@
         if (ret == VK_SUCCESS) {
             intel_instance_add_gpu(instance, gpu);
 
-            pPhysicalDevices[count++] = (VkPhysicalGpu) gpu;
+            pPhysicalDevices[count++] = (VkPhysicalDevice) gpu;
             if (count >= *pPhysicalDeviceCount)
                 break;
         }