OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: ignore pInheritanceInfo if not secondary command buffer

Browse Source 
TEST: no segfault in dEQP-VK.api.command_buffers.bad_inheritance_info_random

Fixes: 6f5289df53 ("venus: refactor VkCommandBufferBeginInfo fixups to function")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18583>
(cherry picked from commit e9b995ecf4)
This commit is contained in:
Yiwei Zhang
2022-09-13 22:19:28 +00:00
committed by Dylan Baker
parent 4698093aff
commit 6e574e2c81
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -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"
},

1
src/virtio/vulkan/vn_command_buffer.c
View File

@@ -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