vulkan-1.0.0: Convert pPreserveAttachments to a uint32_t

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 9f4506b580c371eb171fcf63e72ef75c2cc9ce71..5f75865c581ace330f8dff132609f0184da07548 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1995,7 +1995,7 @@ typedef struct VkSubpassDescription {
     const VkAttachmentReference*                pResolveAttachments;
     const VkAttachmentReference*                pDepthStencilAttachment;
     uint32_t                                    preserveAttachmentCount;
-    const VkAttachmentReference*                pPreserveAttachments;
+    const uint32_t*                             pPreserveAttachments;
 } VkSubpassDescription;
 
 typedef struct VkSubpassDependency {

diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index a92eb7fcc97108b06691acff91c3e1566d5a1a6e..18978afd2197585c1de0a89c89a7cfe0d57e947b 100644 (file)
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -215,10 +215,7 @@ anv_device_init_meta_blit_state(struct anv_device *device)
                .layout = VK_IMAGE_LAYOUT_GENERAL,
             },
             .preserveAttachmentCount = 1,
-            .pPreserveAttachments = &(VkAttachmentReference) {
-               .attachment = 0,
-               .layout = VK_IMAGE_LAYOUT_GENERAL,
-            },
+            .pPreserveAttachments = (uint32_t[]) { 0 },
          },
          .dependencyCount = 0,
       }, NULL, &device->meta_state.blit.render_pass);

diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c
index 003e0e023cab073616a710e098e46a1438b18f5e..0469c57dabf080a30fd7ffc14e02e8ba6038d3c1 100644 (file)
--- a/src/vulkan/anv_meta_clear.c
+++ b/src/vulkan/anv_meta_clear.c
@@ -781,10 +781,7 @@ void anv_CmdClearColorImage(
                         .layout = VK_IMAGE_LAYOUT_GENERAL,
                      },
                      .preserveAttachmentCount = 1,
-                     .pPreserveAttachments = &(VkAttachmentReference) {
-                        .attachment = 0,
-                        .layout = VK_IMAGE_LAYOUT_GENERAL,
-                     },
+                     .pPreserveAttachments = (uint32_t[]) { 0 },
                   },
                   .dependencyCount = 0,
                }, &cmd_buffer->pool->alloc, &pass);