tu: Fill render pass state when resuming

We forgot to call tu_fill_render_pass_state when resuming because it was
mixed in with emitting commands for the start of the subpass. Fix that
by pulling it out. This adds some duplication, but I think it's better
than mixing command emission and CPU-side state setup in the same
function.

Fixes: cb0f414b2a ("tu: Add support for suspending and resuming renderpasses")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38873>
This commit is contained in:
Connor Abbott 2025-12-09 15:00:09 -05:00 committed by Marge Bot
parent 2fab8fc297
commit f734dff419

View file

@ -6738,8 +6738,6 @@ template <chip CHIP>
static void
tu_emit_subpass_begin(struct tu_cmd_buffer *cmd)
{
tu_fill_render_pass_state(&cmd->state.vk_rp, cmd->state.pass, cmd->state.subpass);
struct tu_resolve_group resolve_group = {};
tu_emit_subpass_custom_resolve<CHIP>(cmd);
@ -6859,6 +6857,7 @@ tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer,
tu_lrz_begin_renderpass<CHIP>(cmd);
tu_fill_render_pass_state(&cmd->state.vk_rp, pass, cmd->state.subpass);
tu_emit_renderpass_begin(cmd);
tu_emit_subpass_begin<CHIP>(cmd);
@ -7040,6 +7039,8 @@ tu_CmdBeginRendering(VkCommandBuffer commandBuffer,
cmd->state.suspended_pass.gmem_layout = cmd->state.gmem_layout;
}
tu_fill_render_pass_state(&cmd->state.vk_rp, cmd->state.pass, cmd->state.subpass);
if (!resuming) {
tu_emit_renderpass_begin(cmd);
tu_emit_subpass_begin<CHIP>(cmd);
@ -7229,6 +7230,7 @@ tu_CmdNextSubpass2(VkCommandBuffer commandBuffer,
TU_CMD_FLAG_WAIT_FOR_IDLE;
}
tu_fill_render_pass_state(&cmd->state.vk_rp, cmd->state.pass, new_subpass);
tu_emit_subpass_begin<CHIP>(cmd);
}
TU_GENX(tu_CmdNextSubpass2);
@ -7247,6 +7249,7 @@ tu_CmdBeginCustomResolveEXT(VkCommandBuffer commandBuffer,
tu_next_subpass_lrz(cmd, subpass, new_subpass);
tu_fill_render_pass_state(&cmd->state.vk_rp, cmd->state.pass, new_subpass);
tu_emit_subpass_begin<CHIP>(cmd);
}
TU_GENX(tu_CmdBeginCustomResolveEXT);