From: Chad Versace <chad.versace@intel.com>
Date: Thu, 9 Jul 2015 22:51:06 +0000 (-0700)
Subject: vk/device: Fix vkEnumeratePhysicalDevices()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5b75dffd040210aa6968e4543b15162869d0127d;p=mesa.git

vk/device: Fix vkEnumeratePhysicalDevices()

The Vulkan spec says that pPhysicalDeviceCount is an out parameter if
pPhysicalDevices is NULL; otherwise it's an inout parameter.

Mesa incorrectly treated it unconditionally as an inout parameter, which
could have lead to reading unitialized data.
---

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index bbe4ff1c87e..85f1cba23dd 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -168,12 +168,34 @@ VkResult anv_EnumeratePhysicalDevices(
       if (result != VK_SUCCESS)
          return result;
 
-      instance->physicalDeviceCount++;
-   }
-
-   if (*pPhysicalDeviceCount >= 1)
+      instance->physicalDeviceCount = 1;
+   }
+
+   /* pPhysicalDeviceCount is an out parameter if pPhysicalDevices is NULL;
+    * otherwise it's an inout parameter.
+    *
+    * The Vulkan spec (git aaed022) says:
+    *
+    *    pPhysicalDeviceCount is a pointer to an unsigned integer variable
+    *    that is initialized with the number of devices the application is
+    *    prepared to receive handles to. pname:pPhysicalDevices is pointer to
+    *    an array of at least this many VkPhysicalDevice handles [...].
+    *
+    *    Upon success, if pPhysicalDevices is NULL, vkEnumeratePhysicalDevices
+    *    overwrites the contents of the variable pointed to by
+    *    pPhysicalDeviceCount with the number of physical devices in in the
+    *    instance; otherwise, vkEnumeratePhysicalDevices overwrites
+    *    pPhysicalDeviceCount with the number of physical handles written to
+    *    pPhysicalDevices.
+    */
+   if (!pPhysicalDevices) {
+      *pPhysicalDeviceCount = instance->physicalDeviceCount;
+   } else if (*pPhysicalDeviceCount >= 1) {
       pPhysicalDevices[0] = (VkPhysicalDevice) &instance->physicalDevice;
-   *pPhysicalDeviceCount = instance->physicalDeviceCount;
+      *pPhysicalDeviceCount = 1;
+   } else {
+      *pPhysicalDeviceCount = 0;
+   }
 
    return VK_SUCCESS;
 }