From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 1 Dec 2015 01:54:51 +0000 (-0800)
Subject: vk/0.210.0: Don't allow chaining of description structs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ab9f843bc40c54daeb94676131e8323d4f2359f;p=mesa.git

vk/0.210.0: Don't allow chaining of description structs
---

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 28e9b3283ce..2c0c5a53c49 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1927,8 +1927,6 @@ typedef struct VkFramebufferCreateInfo {
 } VkFramebufferCreateInfo;
 
 typedef struct VkAttachmentDescription {
-    VkStructureType                             sType;
-    const void*                                 pNext;
     VkAttachmentDescriptionFlags                flags;
     VkFormat                                    format;
     uint32_t                                    samples;
@@ -1946,8 +1944,6 @@ typedef struct VkAttachmentReference {
 } VkAttachmentReference;
 
 typedef struct VkSubpassDescription {
-    VkStructureType                             sType;
-    const void*                                 pNext;
     VkSubpassDescriptionFlags                   flags;
     VkPipelineBindPoint                         pipelineBindPoint;
     uint32_t                                    inputCount;
@@ -1961,8 +1957,6 @@ typedef struct VkSubpassDescription {
 } VkSubpassDescription;
 
 typedef struct VkSubpassDependency {
-    VkStructureType                             sType;
-    const void*                                 pNext;
     uint32_t                                    srcSubpass;
     uint32_t                                    destSubpass;
     VkPipelineStageFlags                        srcStageMask;
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index 7a9d631e876..877143cd7a0 100644
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -190,7 +190,6 @@ anv_device_init_meta_blit_state(struct anv_device *device)
          .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
          .attachmentCount = 1,
          .pAttachments = &(VkAttachmentDescription) {
-            .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
             .format = VK_FORMAT_UNDEFINED, /* Our shaders don't care */
             .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
             .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -199,7 +198,6 @@ anv_device_init_meta_blit_state(struct anv_device *device)
          },
          .subpassCount = 1,
          .pSubpasses = &(VkSubpassDescription) {
-            .sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION,
             .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
             .inputCount = 0,
             .colorCount = 1,
diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c
index 091f7632e97..99004fd64ca 100644
--- a/src/vulkan/anv_meta_clear.c
+++ b/src/vulkan/anv_meta_clear.c
@@ -728,7 +728,6 @@ void anv_CmdClearColorImage(
                   .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
                   .attachmentCount = 1,
                   .pAttachments = &(VkAttachmentDescription) {
-                     .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
                      .format = iview.format->vk_format,
                      .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
                      .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -737,7 +736,6 @@ void anv_CmdClearColorImage(
                   },
                   .subpassCount = 1,
                   .pSubpasses = &(VkSubpassDescription) {
-                     .sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION,
                      .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
                      .inputCount = 0,
                      .colorCount = 1,