KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk/0.170.2: Rename pointer parameters of VkSubpassDescription

This commit is contained in:
Jason Ekstrand 2015-10-05 20:26:21 -07:00
parent 57f500324b
commit 757166592e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/vulkan/vulkan.h
View File

@ -1885,13 +1885,13 @@ typedef struct {
VkPipelineBindPoint pipelineBindPoint; VkPipelineBindPoint pipelineBindPoint;
VkSubpassDescriptionFlags flags; VkSubpassDescriptionFlags flags;
uint32_t inputCount; uint32_t inputCount;
const VkAttachmentReference* inputAttachments; const VkAttachmentReference* pInputAttachments;
uint32_t colorCount; uint32_t colorCount;
const VkAttachmentReference* colorAttachments; const VkAttachmentReference* pColorAttachments;
const VkAttachmentReference* resolveAttachments; const VkAttachmentReference* pResolveAttachments;
VkAttachmentReference depthStencilAttachment; VkAttachmentReference depthStencilAttachment;
uint32_t preserveCount; uint32_t preserveCount;
const VkAttachmentReference* preserveAttachments; const VkAttachmentReference* pPreserveAttachments;
} VkSubpassDescription; } VkSubpassDescription;
typedef struct { typedef struct {

8
src/vulkan/anv_device.c
View File

@ -2117,7 +2117,7 @@ VkResult anv_CreateRenderPass(
for (uint32_t j = 0; j < desc->inputCount; j++) { for (uint32_t j = 0; j < desc->inputCount; j++) {
subpass->input_attachments[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++) { for (uint32_t j = 0; j < desc->colorCount; j++) {
subpass->color_attachments[j] subpass->color_attachments[j]
= desc->colorAttachments[j].attachment; = desc->pColorAttachments[j].attachment;
} }
} }
if (desc->resolveAttachments) { if (desc->pResolveAttachments) {
subpass->resolve_attachments = subpass->resolve_attachments =
anv_device_alloc(device, desc->colorCount * sizeof(uint32_t), anv_device_alloc(device, desc->colorCount * sizeof(uint32_t),
8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT); 8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
for (uint32_t j = 0; j < desc->colorCount; j++) { for (uint32_t j = 0; j < desc->colorCount; j++) {
subpass->resolve_attachments[j] subpass->resolve_attachments[j]
= desc->resolveAttachments[j].attachment; = desc->pResolveAttachments[j].attachment;
} }
} }

12
src/vulkan/anv_meta.c
View File

@ -865,17 +865,17 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer,
.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
.inputCount = 0, .inputCount = 0,
.colorCount = 1, .colorCount = 1,
.colorAttachments = &(VkAttachmentReference) { .pColorAttachments = &(VkAttachmentReference) {
.attachment = 0, .attachment = 0,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },
.resolveAttachments = NULL, .pResolveAttachments = NULL,
.depthStencilAttachment = (VkAttachmentReference) { .depthStencilAttachment = (VkAttachmentReference) {
.attachment = VK_ATTACHMENT_UNUSED, .attachment = VK_ATTACHMENT_UNUSED,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },
.preserveCount = 1, .preserveCount = 1,
.preserveAttachments = &(VkAttachmentReference) { .pPreserveAttachments = &(VkAttachmentReference) {
.attachment = 0, .attachment = 0,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },
@ -1596,17 +1596,17 @@ void anv_CmdClearColorImage(
.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
.inputCount = 0, .inputCount = 0,
.colorCount = 1, .colorCount = 1,
.colorAttachments = &(VkAttachmentReference) { .pColorAttachments = &(VkAttachmentReference) {
.attachment = 0, .attachment = 0,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },
.resolveAttachments = NULL, .pResolveAttachments = NULL,
.depthStencilAttachment = (VkAttachmentReference) { .depthStencilAttachment = (VkAttachmentReference) {
.attachment = VK_ATTACHMENT_UNUSED, .attachment = VK_ATTACHMENT_UNUSED,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },
.preserveCount = 1, .preserveCount = 1,
.preserveAttachments = &(VkAttachmentReference) { .pPreserveAttachments = &(VkAttachmentReference) {
.attachment = 0, .attachment = 0,
.layout = VK_IMAGE_LAYOUT_GENERAL, .layout = VK_IMAGE_LAYOUT_GENERAL,
}, },