diff options
| author | Jason Ekstrand <[email protected]> | 2016-01-14 07:29:58 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-01-14 07:30:46 -0800 |
| commit | 7b81637762268f94bdf0576ca83bb2e6896b3565 (patch) | |
| tree | 2440e1da6c655a750ceea8c1157f9db73075f9a1 | |
| parent | 802f00219addb31d6e8b73c818c42212406993eb (diff) | |
vulkan-1.0.0: Convert pPreserveAttachments to a uint32_t
| -rw-r--r-- | include/vulkan/vulkan.h | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 5 | ||||
| -rw-r--r-- | src/vulkan/anv_meta_clear.c | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 9f4506b580c..5f75865c581 100644 --- 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 a92eb7fcc97..18978afd219 100644 --- 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 003e0e023ca..0469c57dabf 100644 --- 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); |