Module: Mesa Branch: staging/22.2 Commit: 6e574e2c81181132347edfbb1e81551da13df5e6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e574e2c81181132347edfbb1e81551da13df5e6
Author: Yiwei Zhang <[email protected]> Date: Tue Sep 13 22:19:28 2022 +0000 venus: ignore pInheritanceInfo if not secondary command buffer TEST: no segfault in dEQP-VK.api.command_buffers.bad_inheritance_info_random Fixes: 6f5289df533 ("venus: refactor VkCommandBufferBeginInfo fixups to function") Signed-off-by: Yiwei Zhang <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18583> (cherry picked from commit e9b995ecf4b1590023083580133a4c5e4ab72416) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_command_buffer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 0587b926a7c..74f938ca979 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -454,7 +454,7 @@ "description": "venus: ignore pInheritanceInfo if not secondary command buffer", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6f5289df53302ca3ca64c0bd6ce775b80a92c457" }, diff --git a/src/virtio/vulkan/vn_command_buffer.c b/src/virtio/vulkan/vn_command_buffer.c index 2d89fbadbef..31e16470cf8 100644 --- a/src/virtio/vulkan/vn_command_buffer.c +++ b/src/virtio/vulkan/vn_command_buffer.c @@ -654,6 +654,7 @@ vn_fix_command_buffer_begin_info(struct vn_command_buffer *cmd, const bool has_continue = begin_info->flags & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT; const bool has_renderpass = + is_cmd_secondary && begin_info->pInheritanceInfo->renderPass != VK_NULL_HANDLE; /* Can early-return if dynamic rendering is used and no structures need to
