From 5710854b03979d3d2d31682d2da1239d336f8d71 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Wed, 16 Sep 2015 16:23:55 -0600
Subject: bug 14640: add pNext/sType to VkDeviceQueueCreateInfo

---
 demos/cube.c          | 2 ++
 demos/tri.c           | 2 ++
 demos/vulkaninfo.c    | 2 ++
 icd/nulldrv/nulldrv.c | 4 ++--
 include/vulkan.h      | 7 +++++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 49eb5835..6507438a 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2297,6 +2297,8 @@ static void demo_init_vk(struct demo *demo)
         .ppEnabledExtensionNames = (const char *const*) extension_names,
     };
     const VkDeviceQueueCreateInfo queue = {
+        .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
+        .pNext = NULL,
         .queueFamilyIndex = 0,
         .queueCount = 1,
     };
diff --git a/demos/tri.c b/demos/tri.c
index 2f6b81e8..69f3d64c 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1823,6 +1823,8 @@ static void demo_init_vk(struct demo *demo)
         .ppEnabledExtensionNames = (const char *const*) extension_names,
     };
     const VkDeviceQueueCreateInfo queue = {
+        .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
+        .pNext = NULL,
         .queueFamilyIndex = 0,
         .queueCount = 1,
     };
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index fc2a33ba..ee5597cb 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -668,6 +668,8 @@ static void app_gpu_init(struct app_gpu *gpu, uint32_t id, VkPhysicalDevice obj)
     if (!gpu->queue_reqs)
         ERR_EXIT(VK_ERROR_OUT_OF_HOST_MEMORY);
     for (i = 0; i < gpu->queue_count; i++) {
+        gpu->queue_reqs[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+        gpu->queue_reqs[i].pNext = NULL;
         gpu->queue_reqs[i].queueFamilyIndex = i;
         gpu->queue_reqs[i].queueCount = gpu->queue_props[i].queueCount;
     }
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 12015e39..0fb52bef 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -126,8 +126,8 @@ static VkResult nulldrv_queue_create(struct nulldrv_dev *dev,
 }
 
 static VkResult dev_create_queues(struct nulldrv_dev *dev,
-                                    const VkDeviceQueueCreateInfo *queues,
-                                    uint32_t count)
+                                  const VkDeviceQueueCreateInfo *queues,
+                                  uint32_t count)
 {
     uint32_t i;
 
diff --git a/include/vulkan.h b/include/vulkan.h
index e63841fd..cd7bf257 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -216,9 +216,10 @@ typedef enum {
     VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY = 48,
     VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO = 49,
     VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO = 50,
+    VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO = 51,
     VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
-    VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO,
-    VK_STRUCTURE_TYPE_NUM = (VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1),
+    VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
+    VK_STRUCTURE_TYPE_NUM = (VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1),
     VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkStructureType;
 
@@ -1339,6 +1340,8 @@ typedef struct {
 } VkPhysicalDeviceMemoryProperties;
 
 typedef struct {
+    VkStructureType                             sType;
+    const void*                                 pNext;
     uint32_t                                    queueFamilyIndex;
     uint32_t                                    queueCount;
 } VkDeviceQueueCreateInfo;
-- 
cgit v1.2.3