commit e6874d21d297a6103b27ec0fb2e77d40094175dc
author Ian Elliott <ianelliott@google.com> Fri Oct 20 20:04:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 20:04:35 2017 +0000
tree e75a4f7134851f3e379dc3f3c947636ed5630fbc
parent ad119fd2ad5a8f93cd476d48a782d94773cd4b87
parent 6fb31e8eb266e80cc2bf0132962272734baa8d66

Merge "Fix Vulkan null_driver's EnumeratePhysicalDevices()" am: 3a0c6aa2c4
am: 6fb31e8eb2

Change-Id: I6d3d7affcf2b478a87392e9f436174789b1a9c99

vulkan/nulldrv/null_driver.cpp

diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
index 6714779..6814ae6 100644
--- a/vulkan/nulldrv/null_driver.cpp
+++ b/vulkan/nulldrv/null_driver.cpp
@@ -343,9 +343,14 @@
 VkResult EnumeratePhysicalDevices(VkInstance instance,
                                   uint32_t* physical_device_count,
                                   VkPhysicalDevice* physical_devices) {
-    if (physical_devices && *physical_device_count >= 1)
+    if (!physical_devices)
+        *physical_device_count = 1;
+    else if (*physical_device_count == 0)
+        return VK_INCOMPLETE;
+    else {
         physical_devices[0] = &instance->physical_device;
-    *physical_device_count = 1;
+        *physical_device_count = 1;
+    }
     return VK_SUCCESS;
 }