commit ef72e2a7cf4fa5708fdbfbc1c972a24ad0dbf809
author Cody Northrop <cody@lunarg.com> Mon Aug 03 17:04:53 2015 -0600
committer Cody Northrop <cody@lunarg.com> Tue Aug 04 17:37:03 2015 -0600
tree 99151244b95a947be86808ddf6a1449840c78940
parent c8aa4a5cf5902e22b99d0107164ac43c6c7c4e5d

v140: Bug 14251 - Inconsistencies in the definition of queries

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 5ec9683..a848bcc 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -316,7 +316,7 @@
     VkQueue queue;
     uint32_t graphics_queue_node_index;
     VkPhysicalDeviceProperties gpu_props;
-    VkPhysicalDeviceQueueProperties *queue_props;
+    VkQueueFamilyProperties *queue_props;
     VkPhysicalDeviceMemoryProperties memory_properties;
 
     VkFramebuffer framebuffer;
@@ -2407,12 +2407,13 @@
     err = vkGetPhysicalDeviceProperties(demo->gpu, &demo->gpu_props);
     assert(!err);
 
-    err = vkGetPhysicalDeviceQueueCount(demo->gpu, &demo->queue_count);
+    /* Call with NULL data to get count */
+    err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, NULL);
     assert(!err);
     assert(demo->queue_count >= 1);
 
-    demo->queue_props = (VkPhysicalDeviceQueueProperties *) malloc(demo->queue_count * sizeof(VkPhysicalDeviceQueueProperties));
-    err = vkGetPhysicalDeviceQueueProperties(demo->gpu, demo->queue_count, demo->queue_props);
+    demo->queue_props = (VkQueueFamilyProperties *) malloc(demo->queue_count * sizeof(VkQueueFamilyProperties));
+    err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, demo->queue_props);
     assert(!err);
     assert(demo->queue_count >= 1);
 }