commit 07b309a0cdfca1532ad14038682716ea7f77538d
author Jon Ashburn <jon@lunarg.com> Wed Apr 15 11:31:12 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Apr 16 19:34:59 2015 -0600
tree 612d3b5c0a9f138779ccae22cf1fb4aa01acde9b
parent c99cb0dac2af06e428dc85e8a1a47823133dd460

misc: Change vkEnumerateGpus to vkEnumeratePhysicalDevices

Conflicts:
	loader/loader.h

icd/intel/instance.c

diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index 34e06f9..fd7265d 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -167,24 +167,23 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkEnumerateGpus(
+ICD_EXPORT VkResult VKAPI vkEnumeratePhysicalDevices(
     VkInstance                                instance_,
-    uint32_t                                    maxGpus,
-    uint32_t*                                   pGpuCount,
-    VkPhysicalGpu*                           pGpus)
+    uint32_t*                                 pPhysicalDeviceCount,
+    VkPhysicalGpu*                            pPhysicalDevices)
 {
     struct intel_instance *instance = intel_instance(instance_);
     struct icd_drm_device *devices, *dev;
     VkResult ret;
     uint32_t count;
 
-    intel_instance_remove_gpus(instance);
-
-    if (!maxGpus) {
-        *pGpuCount = 0;
+    if (pPhysicalDevices == NULL) {
+        *pPhysicalDeviceCount = 1;
         return VK_SUCCESS;
     }
 
+    intel_instance_remove_gpus(instance);
+
     devices = icd_drm_enumerate(instance->icd, 0x8086);
 
     count = 0;
@@ -206,8 +205,8 @@
         if (ret == VK_SUCCESS) {
             intel_instance_add_gpu(instance, gpu);
 
-            pGpus[count++] = (VkPhysicalGpu) gpu;
-            if (count >= maxGpus)
+            pPhysicalDevices[count++] = (VkPhysicalGpu) gpu;
+            if (count >= *pPhysicalDeviceCount)
                 break;
         }
 
@@ -216,7 +215,7 @@
 
     icd_drm_release(instance->icd, devices);
 
-    *pGpuCount = count;
+    *pPhysicalDeviceCount = count;
 
     return (count > 0) ? VK_SUCCESS : VK_ERROR_UNAVAILABLE;
 }