openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-23 23:41:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavapipe: remove lvp_descriptor_update_template::descriptor_set_layout

Browse Source 
this wasn't used and caused crashes when running with validation enabled
due to violating spec:

This parameter is ignored if templateType is not VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9861>
This commit is contained in:
Mike Blumenkrantz 2021-03-26 14:04:16 -04:00 committed by Marge Bot
parent 71ebcf30e4
commit cca3d1d9a9
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/lavapipe/lvp_descriptor_set.c
View File

@ -543,7 +543,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorUpdateTemplate(VkDevice _devi
VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate)
{
LVP_FROM_HANDLE(lvp_device, device, _device);
LVP_FROM_HANDLE(lvp_descriptor_set_layout, set_layout, pCreateInfo->descriptorSetLayout);
const uint32_t entry_count = pCreateInfo->descriptorUpdateEntryCount;
const size_t size = sizeof(struct lvp_descriptor_update_template) +
sizeof(VkDescriptorUpdateTemplateEntry) * entry_count;
@ -558,7 +557,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorUpdateTemplate(VkDevice _devi
VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE);
templ->type = pCreateInfo->templateType;
templ->descriptor_set_layout = set_layout;
templ->bind_point = pCreateInfo->pipelineBindPoint;
templ->set = pCreateInfo->set;
/* This parameter is ignored if templateType is not VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR */

1
src/gallium/frontends/lavapipe/lvp_private.h
View File

@ -443,7 +443,6 @@ struct lvp_descriptor_update_template {
uint32_t entry_count;
uint32_t set;
VkDescriptorUpdateTemplateType type;
struct lvp_descriptor_set_layout *descriptor_set_layout;
VkPipelineBindPoint bind_point;
struct lvp_pipeline_layout *pipeline_layout;
VkDescriptorUpdateTemplateEntry entry[0];