mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-31 07:40:11 +01:00
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> (cherry picked from commitc04e375588)
This commit is contained in:
parent
70fd7c41b5
commit
aa1dd15b2c
2 changed files with 11 additions and 11 deletions
|
|
@ -1574,7 +1574,7 @@
|
|||
"description": "tu: Use cmd->rp_trace u_trace for draw calls",
|
||||
"nominated": true,
|
||||
"nomination_type": 2,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "707c97f6340d6e909a350ee354eef386bc2b44db",
|
||||
"notes": null
|
||||
|
|
|
|||
|
|
@ -6632,7 +6632,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],
|
||||
|
|
@ -7080,7 +7080,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);
|
||||
|
||||
|
|
@ -7129,7 +7129,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);
|
||||
|
||||
|
|
@ -7157,7 +7157,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);
|
||||
|
||||
|
|
@ -7211,7 +7211,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);
|
||||
|
||||
|
|
@ -7256,7 +7256,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);
|
||||
|
||||
|
|
@ -7289,7 +7289,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);
|
||||
|
||||
|
|
@ -7328,7 +7328,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);
|
||||
|
||||
|
|
@ -7364,7 +7364,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);
|
||||
|
||||
|
|
@ -7408,7 +7408,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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue