OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tu: Do not dereference descriptorSetLayout in push descriptors tmpl

Browse Source 
Fixes crash when capturing with RenderDoc.

From VK spec:

 descriptorSetLayout [...] This parameter is ignored if templateType
 is not VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17751>
This commit is contained in:
Danylo Piliaiev
2022-07-26 15:49:41 +03:00
committed by Marge Bot
parent 2f00a04f3b
commit 4ba129cd86
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/freedreno/vulkan/tu_descriptor_set.c
View File

@@ -1151,8 +1151,7 @@ tu_CreateDescriptorUpdateTemplate(
VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate)
{
TU_FROM_HANDLE(tu_device, device, _device);
TU_FROM_HANDLE(tu_descriptor_set_layout, set_layout,
pCreateInfo->descriptorSetLayout);
struct tu_descriptor_set_layout *set_layout = NULL;
const uint32_t entry_count = pCreateInfo->descriptorUpdateEntryCount;
const size_t size =
sizeof(struct tu_descriptor_update_template) +
@@ -1176,6 +1175,10 @@ tu_CreateDescriptorUpdateTemplate(
set_layout = pipeline_layout->set[pCreateInfo->set].layout;
templ->bind_point = pCreateInfo->pipelineBindPoint;
} else {
TU_FROM_HANDLE(tu_descriptor_set_layout, _set_layout,
pCreateInfo->descriptorSetLayout);
set_layout = _set_layout;
}
for (uint32_t i = 0; i < entry_count; i++) {