Module: Mesa
Branch: main
Commit: e9b995ecf4b1590023083580133a4c5e4ab72416
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9b995ecf4b1590023083580133a4c5e4ab72416

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>

---

 src/virtio/vulkan/vn_command_buffer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/virtio/vulkan/vn_command_buffer.c 
b/src/virtio/vulkan/vn_command_buffer.c
index 0276aff4dad..bd9f1362858 100644
--- a/src/virtio/vulkan/vn_command_buffer.c
+++ b/src/virtio/vulkan/vn_command_buffer.c
@@ -656,6 +656,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

Reply via email to