seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #73622 from ChibiDenDen/patch-2

Browse Source 
Fix use-after-free for VkAttachmentReference
This commit is contained in:
Rémi Verschelde
2023-02-21 21:15:43 +01:00
parent 5e57205365 d104d8447b
commit ae21832823
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/vulkan/vulkan_context.cpp
View File

@ -101,6 +101,7 @@ VkResult VulkanContext::vkCreateRenderPass2KHR(VkDevice p_device, const VkRender
attachments.push_back(att); attachments.push_back(att);
} }
Vector<Vector<VkAttachmentReference>> attachment_references;
Vector<VkSubpassDescription> subpasses; Vector<VkSubpassDescription> subpasses;
for (uint32_t i = 0; i < p_create_info->subpassCount; i++) { for (uint32_t i = 0; i < p_create_info->subpassCount; i++) {
// Here we need to do more, again it's just stripping out type and next // Here we need to do more, again it's just stripping out type and next
@ -124,6 +125,10 @@ VkResult VulkanContext::vkCreateRenderPass2KHR(VkDevice p_device, const VkRender
p_create_info->pSubpasses[i].preserveAttachmentCount, /* preserveAttachmentCount */ p_create_info->pSubpasses[i].preserveAttachmentCount, /* preserveAttachmentCount */
p_create_info->pSubpasses[i].pPreserveAttachments /* pPreserveAttachments */ p_create_info->pSubpasses[i].pPreserveAttachments /* pPreserveAttachments */
}; };
attachment_references.push_back(input_attachments);
attachment_references.push_back(color_attachments);
attachment_references.push_back(resolve_attachments);
attachment_references.push_back(depth_attachments);
subpasses.push_back(subpass); subpasses.push_back(subpass);
} }