tu: Use cmd->rp_trace u_trace for draw calls

Fixes: 707c97f634 ("tu: Add tracepoints around draws, with shader sha1s.")

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38240>
This commit is contained in:
Danylo Piliaiev 2025-11-04 13:50:42 +01:00 committed by Marge Bot
parent 4ec2a921d3
commit c04e375588

View file

@ -7646,7 +7646,7 @@ tu6_draw_common(struct tu_cmd_buffer *cmd,
struct tu_render_pass_state *rp = &cmd->state.rp;
trace_start_draw(
&cmd->trace, &cmd->draw_cs, cmd, draw_count,
&cmd->rp_trace, &cmd->draw_cs, cmd, draw_count,
cmd->state.program.stage_sha1[MESA_SHADER_VERTEX],
cmd->state.program.stage_sha1[MESA_SHADER_TESS_CTRL],
cmd->state.program.stage_sha1[MESA_SHADER_TESS_EVAL],
@ -8094,7 +8094,7 @@ tu_CmdDraw(VkCommandBuffer commandBuffer,
tu_cs_emit(cs, instanceCount);
tu_cs_emit(cs, vertexCount);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDraw);
@ -8143,7 +8143,7 @@ tu_CmdDrawMultiEXT(VkCommandBuffer commandBuffer,
}
if (i != 0)
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawMultiEXT);
@ -8171,7 +8171,7 @@ tu_CmdDrawIndexed(VkCommandBuffer commandBuffer,
tu_cs_emit_qw(cs, cmd->state.index_va);
tu_cs_emit(cs, cmd->state.max_index_count);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndexed);
@ -8225,7 +8225,7 @@ tu_CmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer,
}
if (i != 0)
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawMultiIndexedEXT);
@ -8270,7 +8270,7 @@ tu_CmdDrawIndirect(VkCommandBuffer commandBuffer,
tu_cs_emit_qw(cs, vk_buffer_address(&buf->vk, offset));
tu_cs_emit(cs, stride);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndirect);
@ -8303,7 +8303,7 @@ tu_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer,
tu_cs_emit_qw(cs, vk_buffer_address(&buf->vk, offset));
tu_cs_emit(cs, stride);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndexedIndirect);
@ -8342,7 +8342,7 @@ tu_CmdDrawIndirectCount(VkCommandBuffer commandBuffer,
tu_cs_emit_qw(cs, vk_buffer_address(&count_buf->vk, countBufferOffset));
tu_cs_emit(cs, stride);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndirectCount);
@ -8378,7 +8378,7 @@ tu_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer,
tu_cs_emit_qw(cs, vk_buffer_address(&count_buf->vk, countBufferOffset));
tu_cs_emit(cs, stride);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndexedIndirectCount);
@ -8420,7 +8420,7 @@ tu_CmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer,
tu_cs_emit(cs, counterOffset);
tu_cs_emit(cs, vertexStride);
trace_end_draw(&cmd->trace, cs);
trace_end_draw(&cmd->rp_trace, cs);
}
TU_GENX(tu_CmdDrawIndirectByteCountEXT);