bug 14640: add pNext/sType to VkDeviceQueueCreateInfo

diff --git a/demos/cube.c b/demos/cube.c
index 49eb5835003fc691ef23c64cc6ae0b203f1529c8..6507438aa2a0878a394b132ed43df9fd1e10810b 100644 (file)
--- 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 2f6b81e89f49323bc89b8dab661e6ee15663635f..69f3d64c4d3a806b3f7d52cc237973435ee45149 100644 (file)
--- 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 fc2a33baf5185de3cf130ca0315a0f14900e3132..ee5597cbfa23bf333465daa2e3b434e4e17f83be 100644 (file)
--- 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 12015e39eb2c54c0809ecbbbd626e9e89a479dfc..0fb52befab07de20c1e534daf1c5a69226a594c6 100644 (file)
--- 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 e63841fd3b6b0f3754018e32e71d36b1276912f5..cd7bf257a2c05f009a508e04fb653a5128b40615 100644 (file)
--- 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;