fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: fix to handle pipeline flags2 from maint5

Browse source 
Fixes: be6fece6e1 ("venus: enable VK_KHR_maintenance5")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33520>
This commit is contained in:
Yiwei Zhang 2025-02-11 23:32:39 -08:00 • committed by Marge Bot
parent a7adf8db67
commit a7fccbbf85
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/virtio/vulkan/vn_buffer.c
View file

@ -32,6 +32,9 @@ vn_buffer_get_cache_index(const VkBufferCreateInfo *create_info,
*
* Btw, we assume VkBufferCreateFlagBits won't exhaust all 32bits, at least
* no earlier than VkBufferUsageFlagBits.
*
* TODO: extend cache to cover VkBufferUsageFlags2CreateInfo (introduced in
* VK_KHR_maintenance5 and promoted to 1.4).
*/
assert(!(create_info->flags & 0x80000000));

11
src/virtio/vulkan/vn_pipeline.c
View file

@ -221,10 +221,10 @@ struct vn_graphics_pipeline_fix_tmp {
/* Fixing the pNext chain
*
* TODO: extend when below or more extensions are supported:
* - VK_KHR_maintenance5
* - VK_EXT_pipeline_robustness
*/
VkGraphicsPipelineLibraryCreateInfoEXT *gpl_infos;
VkPipelineCreateFlags2CreateInfo *flags2_infos;
VkPipelineCreationFeedbackCreateInfo *feedback_infos;
VkPipelineFragmentShadingRateStateCreateInfoKHR *fsr_infos;
VkPipelineLibraryCreateInfoKHR *library_infos;
@ -641,6 +641,7 @@ vn_graphics_pipeline_fix_tmp_alloc(const VkAllocationCallbacks *alloc,
/* for pNext */
VkGraphicsPipelineLibraryCreateInfoEXT *gpl_infos;
VkPipelineCreateFlags2CreateInfo *flags2_infos;
VkPipelineCreationFeedbackCreateInfo *feedback_infos;
VkPipelineFragmentShadingRateStateCreateInfoKHR *fsr_infos;
VkPipelineLibraryCreateInfoKHR *library_infos;
@ -656,6 +657,8 @@ vn_graphics_pipeline_fix_tmp_alloc(const VkAllocationCallbacks *alloc,
if (alloc_pnext) {
vk_multialloc_add(&ma, &gpl_infos, __typeof__(*gpl_infos), info_count);
vk_multialloc_add(&ma, &flags2_infos, __typeof__(*flags2_infos),
info_count);
vk_multialloc_add(&ma, &feedback_infos, __typeof__(*feedback_infos),
info_count);
vk_multialloc_add(&ma, &fsr_infos, __typeof__(*fsr_infos), info_count);
@ -674,6 +677,7 @@ vn_graphics_pipeline_fix_tmp_alloc(const VkAllocationCallbacks *alloc,
if (alloc_pnext) {
tmp->gpl_infos = gpl_infos;
tmp->flags2_infos = flags2_infos;
tmp->feedback_infos = feedback_infos;
tmp->fsr_infos = fsr_infos;
tmp->library_infos = library_infos;
@ -1393,6 +1397,7 @@ vn_graphics_pipeline_create_info_pnext_init(
uint32_t index)
{
VkGraphicsPipelineLibraryCreateInfoEXT *gpl = &fix_tmp->gpl_infos[index];
VkPipelineCreateFlags2CreateInfo *flags2 = &fix_tmp->flags2_infos[index];
VkPipelineCreationFeedbackCreateInfo *feedback =
&fix_tmp->feedback_infos[index];
VkPipelineFragmentShadingRateStateCreateInfoKHR *fsr =
@ -1410,6 +1415,10 @@ vn_graphics_pipeline_create_info_pnext_init(
memcpy(gpl, src, sizeof(*gpl));
next = gpl;
break;
case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO:
memcpy(flags2, src, sizeof(*flags2));
next = flags2;
break;
case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
memcpy(feedback, src, sizeof(*feedback));
next = feedback;