commit 21602aa6ba545baeaca0783cef4c38442debd1f5
author Craig Stout <cstout@google.com> Thu Jun 21 14:14:49 2018 -0700
committer Craig Stout <cstout@google.com> Thu Jun 21 15:41:01 2018 -0700
tree 92db3fd1d3c4be15ad32e90802e0969a4d9db8ee
parent c098c9d12ded20fdd921badedfc89b684d89c606

Rework anv_enumerate_devices

To better match upstream.

MA-193 #done

Change-Id: I4c82aaf0fa16292b1dd53088fd0fc2d8fa8249b8

src/intel/vulkan/anv_device.c

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index ee5a3c2..76f1289 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -564,34 +564,36 @@
 static VkResult
 anv_enumerate_devices(struct anv_instance *instance)
 {
-    struct dirent* de;
-    const char DEV_GPU[] = "/dev/class/gpu";
-    DIR* dir = opendir(DEV_GPU);
-    if (!dir) {
-        printf("Error opening %s\n", DEV_GPU);
-        return VK_ERROR_INITIALIZATION_FAILED;
+   VkResult result = VK_ERROR_INCOMPATIBLE_DRIVER;
+
+   instance->physicalDeviceCount = 0;
+
+   struct dirent* de;
+   const char DEV_GPU[] = "/dev/class/gpu";
+   DIR* dir = opendir(DEV_GPU);
+   if (!dir) {
+      printf("Error opening %s\n", DEV_GPU);
+      return VK_ERROR_INCOMPATIBLE_DRIVER;
     }
-    
-    instance->physicalDeviceCount = 0;
-    VkResult result = VK_SUCCESS;
-    
+
     while ((de = readdir(dir)) != NULL) {
         // extra +1 ensures space for null termination
         char name[sizeof(DEV_GPU) + sizeof('/') + (NAME_MAX + 1) + 1];
         snprintf(name, sizeof(name), "%s/%s", DEV_GPU, de->d_name);
-        
+
         struct stat path_stat;
         stat(name, &path_stat);
         if (!S_ISDIR(path_stat.st_mode)) {
             result = anv_physical_device_init(&instance->physicalDevice, instance, name);
-            if (result == VK_SUCCESS) {
-                instance->physicalDeviceCount = 1;
-                break;
-            }
+            if (result != VK_ERROR_INCOMPATIBLE_DRIVER)
+               break;
         }
     }
-    
     closedir(dir);
+
+    if (result == VK_SUCCESS)
+       instance->physicalDeviceCount = 1;
+
     return result;
 }