Module: Mesa Branch: main Commit: 33e791bc02ab53d2182076ab7021b991cfb22542 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33e791bc02ab53d2182076ab7021b991cfb22542
Author: Chad Versace <[email protected]> Date: Mon Jul 25 14:50:55 2022 -0700 venus/pipeline: Ignore basePipelineHandle Signed-off-by: Chad Versace <[email protected]> Reviewed-by: Yiwei Zhang <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16681> --- src/virtio/vulkan/vn_pipeline.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/virtio/vulkan/vn_pipeline.c b/src/virtio/vulkan/vn_pipeline.c index 156a7c94b2f..6be5a7a5b72 100644 --- a/src/virtio/vulkan/vn_pipeline.c +++ b/src/virtio/vulkan/vn_pipeline.c @@ -255,6 +255,7 @@ struct vn_graphics_pipeline_create_info_fix { bool ignore_multisample_state; bool ignore_depth_stencil_state; bool ignore_color_blend_state; + bool ignore_base_pipeline_handle; }; /** Temporary storage for fixes in vkCreateGraphicsPipelines. */ @@ -483,6 +484,15 @@ vn_fix_graphics_pipeline_create_info( } } + /* Ignore basePipelineHandle? + * VUID-VkGraphicsPipelineCreateInfo-flags-00722 + */ + if (!(info->flags & VK_PIPELINE_CREATE_DERIVATIVE_BIT) || + info->basePipelineIndex != -1) { + fix.ignore_base_pipeline_handle = true; + any_fix = true; + } + if (!any_fix) continue; @@ -524,6 +534,9 @@ vn_fix_graphics_pipeline_create_info( if (fix.ignore_color_blend_state) fixes->create_infos[i].pColorBlendState = NULL; + + if (fix.ignore_base_pipeline_handle) + fixes->create_infos[i].basePipelineHandle = VK_NULL_HANDLE; } if (!fixes)
