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

tu: Fix issues with render_pass tracepoint

Browse Source 
cmd->state.attachments was accessed out of bounds, which somehow instead
of crash caused the tracepoint to be skipped.

drawcall_bandwidth_per_sample_sum was divided by 0 when there were no
draw calls in a renderpass.

Fixes: 1aab0fc4f5
("tu: Add attachments' UBWC info to renderpass tracepoint")

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29752>
This commit is contained in:
Danylo Piliaiev
2024-06-17 17:04:43 +02:00
committed by Marge Bot
parent 887f0e0af6
commit 37ddf572b1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/freedreno/vulkan/tu_cmd_buffer.cc
View File

@@ -1750,7 +1750,7 @@ tu_trace_start_render_pass(struct tu_cmd_buffer *cmd)
uint32_t store_cpp = 0; uint32_t store_cpp = 0;
uint32_t clear_cpp = 0; uint32_t clear_cpp = 0;
bool has_depth = false; bool has_depth = false;
char ubwc[12]; char ubwc[MAX_RTS + 3];
for (uint32_t i = 0; i < cmd->state.pass->attachment_count; i++) { for (uint32_t i = 0; i < cmd->state.pass->attachment_count; i++) {
const struct tu_render_pass_attachment *attachment = const struct tu_render_pass_attachment *attachment =
&cmd->state.pass->attachments[i]; &cmd->state.pass->attachments[i];
@@ -1773,8 +1773,10 @@ tu_trace_start_render_pass(struct tu_cmd_buffer *cmd)
const struct tu_subpass *subpass = &cmd->state.pass->subpasses[0]; const struct tu_subpass *subpass = &cmd->state.pass->subpasses[0];
for (uint32_t i = 0; i < subpass->color_count; i++) { for (uint32_t i = 0; i < subpass->color_count; i++) {
uint32_t att = subpass->color_attachments[i].attachment; uint32_t att = subpass->color_attachments[i].attachment;
ubwc[ubwc_len++] = ubwc[ubwc_len++] = att == VK_ATTACHMENT_UNUSED ? '-'
cmd->state.attachments[att]->view.ubwc_enabled ? 'y' : 'n'; : cmd->state.attachments[att]->view.ubwc_enabled
? 'y'
: 'n';
} }
if (subpass->depth_used) { if (subpass->depth_used) {
ubwc[ubwc_len++] = '|'; ubwc[ubwc_len++] = '|';
@@ -2103,7 +2105,7 @@ tu_cmd_render_tiles(struct tu_cmd_buffer *cmd,
trace_end_render_pass(&cmd->trace, &cmd->cs, true, trace_end_render_pass(&cmd->trace, &cmd->cs, true,
cmd->state.rp.drawcall_count, cmd->state.rp.drawcall_count,
cmd->state.rp.drawcall_bandwidth_per_sample_sum / cmd->state.rp.drawcall_bandwidth_per_sample_sum /
cmd->state.rp.drawcall_count, MAX2(cmd->state.rp.drawcall_count, 1),
cmd->state.lrz.valid, cmd->state.lrz.valid,
cmd->state.rp.lrz_disable_reason); cmd->state.rp.lrz_disable_reason);
@@ -2145,7 +2147,7 @@ tu_cmd_render_sysmem(struct tu_cmd_buffer *cmd,
trace_end_render_pass(&cmd->trace, &cmd->cs, false, trace_end_render_pass(&cmd->trace, &cmd->cs, false,
cmd->state.rp.drawcall_count, cmd->state.rp.drawcall_count,
cmd->state.rp.drawcall_bandwidth_per_sample_sum / cmd->state.rp.drawcall_bandwidth_per_sample_sum /
cmd->state.rp.drawcall_count, MAX2(cmd->state.rp.drawcall_count, 1),
cmd->state.lrz.valid, cmd->state.lrz.valid,
cmd->state.rp.lrz_disable_reason); cmd->state.rp.lrz_disable_reason);
} }