diff options
| author | Jason Ekstrand <[email protected]> | 2015-10-05 20:26:21 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-05 20:26:21 -0700 |
| commit | 757166592e5e26dc226849f94d1460db28a35170 (patch) | |
| tree | cea280033792e3b7db5d4c19eb3309383e2cb80b | |
| parent | 57f500324b8d7b6de1e3d5e0c0b18622b97ecca9 (diff) | |
vk/0.170.2: Rename pointer parameters of VkSubpassDescription
| -rw-r--r-- | include/vulkan/vulkan.h | 8 | ||||
| -rw-r--r-- | src/vulkan/anv_device.c | 8 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 2afe53b6c9d..25d0f829f77 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1885,13 +1885,13 @@ typedef struct { VkPipelineBindPoint pipelineBindPoint; VkSubpassDescriptionFlags flags; uint32_t inputCount; - const VkAttachmentReference* inputAttachments; + const VkAttachmentReference* pInputAttachments; uint32_t colorCount; - const VkAttachmentReference* colorAttachments; - const VkAttachmentReference* resolveAttachments; + const VkAttachmentReference* pColorAttachments; + const VkAttachmentReference* pResolveAttachments; VkAttachmentReference depthStencilAttachment; uint32_t preserveCount; - const VkAttachmentReference* preserveAttachments; + const VkAttachmentReference* pPreserveAttachments; } VkSubpassDescription; typedef struct { diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 5302ee5cd73..fdc6f8e1034 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -2117,7 +2117,7 @@ VkResult anv_CreateRenderPass( for (uint32_t j = 0; j < desc->inputCount; j++) { subpass->input_attachments[j] - = desc->inputAttachments[j].attachment; + = desc->pInputAttachments[j].attachment; } } @@ -2128,18 +2128,18 @@ VkResult anv_CreateRenderPass( for (uint32_t j = 0; j < desc->colorCount; j++) { subpass->color_attachments[j] - = desc->colorAttachments[j].attachment; + = desc->pColorAttachments[j].attachment; } } - if (desc->resolveAttachments) { + if (desc->pResolveAttachments) { subpass->resolve_attachments = anv_device_alloc(device, desc->colorCount * sizeof(uint32_t), 8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT); for (uint32_t j = 0; j < desc->colorCount; j++) { subpass->resolve_attachments[j] - = desc->resolveAttachments[j].attachment; + = desc->pResolveAttachments[j].attachment; } } diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index f6134338fdd..9201167bd98 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -865,17 +865,17 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .inputCount = 0, .colorCount = 1, - .colorAttachments = &(VkAttachmentReference) { + .pColorAttachments = &(VkAttachmentReference) { .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .resolveAttachments = NULL, + .pResolveAttachments = NULL, .depthStencilAttachment = (VkAttachmentReference) { .attachment = VK_ATTACHMENT_UNUSED, .layout = VK_IMAGE_LAYOUT_GENERAL, }, .preserveCount = 1, - .preserveAttachments = &(VkAttachmentReference) { + .pPreserveAttachments = &(VkAttachmentReference) { .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }, @@ -1596,17 +1596,17 @@ void anv_CmdClearColorImage( .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .inputCount = 0, .colorCount = 1, - .colorAttachments = &(VkAttachmentReference) { + .pColorAttachments = &(VkAttachmentReference) { .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .resolveAttachments = NULL, + .pResolveAttachments = NULL, .depthStencilAttachment = (VkAttachmentReference) { .attachment = VK_ATTACHMENT_UNUSED, .layout = VK_IMAGE_LAYOUT_GENERAL, }, .preserveCount = 1, - .preserveAttachments = &(VkAttachmentReference) { + .pPreserveAttachments = &(VkAttachmentReference) { .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }, |