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

venus: cleanup vn_cmd_begin_render_pass usage

Browse source 
For secondary command buffers, vn_cmd_begin_render_pass was only used to
track inherited render pass previously. So we clean it up.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24103>
This commit is contained in:
Yiwei Zhang 2023-07-07 00:14:07 -07:00 • committed by Marge Bot
parent 81b69f8e8b
commit 311a0eeb21
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/virtio/vulkan/vn_command_buffer.c
View file

@ -583,17 +583,17 @@ vn_cmd_begin_render_pass(struct vn_command_buffer *cmd,
const struct vn_framebuffer *fb,
const VkRenderPassBeginInfo *begin_info)
{
assert(begin_info);
assert(cmd->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY);
cmd->builder.render_pass = pass;
if (begin_info) {
cmd->in_render_pass = true;
cmd->render_pass = pass;
cmd->subpass_index = 0;
cmd->view_mask = cmd->render_pass->subpasses[0].view_mask;
}
cmd->in_render_pass = true;
cmd->render_pass = pass;
cmd->subpass_index = 0;
cmd->view_mask = cmd->render_pass->subpasses[0].view_mask;
if (!pass->present_count ||
cmd->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY)
if (!pass->present_count)
return;
/* find fb attachments */
@ -1033,15 +1033,17 @@ vn_BeginCommandBuffer(VkCommandBuffer commandBuffer,
if (inheritance_info) {
cmd->in_render_pass = local_begin_info.in_render_pass;
if (local_begin_info.has_inherited_pass) {
vn_cmd_begin_render_pass(
cmd, vn_render_pass_from_handle(inheritance_info->renderPass),
vn_framebuffer_from_handle(inheritance_info->framebuffer), NULL);
const struct vn_render_pass *pass =
vn_render_pass_from_handle(inheritance_info->renderPass);
/* Track the inherited render pass in the secondary cmd to fix wsi
* image ownership and layout transitions.
*/
cmd->builder.render_pass = pass;
/* Store the viewMask from the inherited render pass subpass for
* query feedback.
*/
const struct vn_render_pass *pass =
vn_render_pass_from_handle(inheritance_info->renderPass);
cmd->view_mask =
pass->subpasses[inheritance_info->subpass].view_mask;
} else {