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/vulkaninfo.c

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index b6a66fa..b42938d 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -110,7 +110,7 @@
     VkPhysicalDeviceProperties props;
 
     uint32_t queue_count;
-    VkPhysicalDeviceQueueProperties *queue_props;
+    VkQueueFamilyProperties *queue_props;
     VkDeviceQueueCreateInfo *queue_reqs;
 
     VkPhysicalDeviceMemoryProperties memory_props;
@@ -673,7 +673,7 @@
         ERR_EXIT(err);
 
     /* get queue count */
-    err = vkGetPhysicalDeviceQueueCount(gpu->obj, &gpu->queue_count);
+    err = vkGetPhysicalDeviceQueueFamilyProperties(gpu->obj, &gpu->queue_count, NULL);
     if (err)
         ERR_EXIT(err);
 
@@ -682,7 +682,7 @@
 
     if (!gpu->queue_props)
         ERR_EXIT(VK_ERROR_OUT_OF_HOST_MEMORY);
-    err = vkGetPhysicalDeviceQueueProperties(gpu->obj, gpu->queue_count, gpu->queue_props);
+    err = vkGetPhysicalDeviceQueueFamilyProperties(gpu->obj, &gpu->queue_count, gpu->queue_props);
     if (err)
         ERR_EXIT(err);
 
@@ -844,9 +844,9 @@
 
 static void app_gpu_dump_queue_props(const struct app_gpu *gpu, uint32_t id)
 {
-    const VkPhysicalDeviceQueueProperties *props = &gpu->queue_props[id];
+    const VkQueueFamilyProperties *props = &gpu->queue_props[id];
 
-    printf("VkPhysicalDeviceQueueProperties[%d]\n", id);
+    printf("VkQueueFamilyProperties[%d]\n", id);
     printf("\tqueueFlags = %c%c%c%c\n",
             (props->queueFlags & VK_QUEUE_GRAPHICS_BIT) ? 'G' : '.',
             (props->queueFlags & VK_QUEUE_COMPUTE_BIT)  ? 'C' : '.',