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

zink: strip format list when disabling mutable during image creation

Browse Source 
drivers shouldn't be getting a format list if it won't be used

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23514>
This commit is contained in:
Mike Blumenkrantz
2023-06-13 11:35:04 -04:00
committed by Marge Bot
parent 0c17eadac0
commit ff1e667e45
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gallium/drivers/zink/zink_resource.c
View File

@@ -461,11 +461,26 @@ double_check_ici(struct zink_screen *screen, VkImageCreateInfo *ici, VkImageUsag
if (check_ici(screen, ici, *mod))
return true;
if (pNext) {
ici->pNext = NULL;
VkBaseOutStructure *prev = NULL;
VkBaseOutStructure *fmt_list = NULL;
vk_foreach_struct(strct, (void*)ici->pNext) {
if (strct->sType == VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO) {
fmt_list = strct;
if (prev) {
prev->pNext = strct->pNext;
} else {
ici->pNext = strct->pNext;
}
fmt_list->pNext = NULL;
break;
}
prev = strct;
}
ici->flags &= ~VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
if (check_ici(screen, ici, *mod))
return true;
ici->pNext = pNext;
fmt_list->pNext = (void*)ici->pNext;
ici->pNext = fmt_list;
ici->flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
}
return false;