commit fabd2f5c8f31b352a87c6d22228a6c6b5614522a
author Ian Elliott <ianelliott@google.com> Fri Oct 20 20:18:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 20:18:54 2017 +0000
tree 2fb53bb61cfa534f9298a31a5a68f59368f91c1b
parent 0c0da3814ef72a5986e927ebfd06e4e5ca380433
parent bb240b98c3fd8b3a6ab2bedc2faf51b495410270

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

Change-Id: I2059141c1df064ce91eb1cd651837f9445b5efb2

vulkan/nulldrv/null_driver.cpp

diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
index c701d48..e2d5c83 100644
--- a/vulkan/nulldrv/null_driver.cpp
+++ b/vulkan/nulldrv/null_driver.cpp
@@ -344,9 +344,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;
 }