diff options
author | Emma Anholt <emma@anholt.net> | 2021-06-16 09:47:12 -0700 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-06-18 18:18:35 +0000 |
commit | ecf807c900f0412627eb21db92bc30a43e4e46b4 (patch) | |
tree | d45f32f9be831f0dc593d5009d670b25a4ecb4cf /src/gallium | |
parent | caf69b5b778667dbd5d777ac15cc1246ddb16c75 (diff) |
freedreno: Move some driver debug printfs to mesa_logd.
This means the logging will work on Android, and won't get mixed up in
application stdout on Linux.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9262>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_query.c | 18 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_vsc.c | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_query.c b/src/gallium/drivers/freedreno/a6xx/fd6_query.c index cb02ffeea5f..30c68e97185 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_query.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_query.c @@ -290,28 +290,28 @@ log_counters(struct fd6_primitives_sample *ps) "ras_primitives_in", "x", }; - printf(" counter\t\tstart\t\t\tstop\t\t\tdiff\n"); + mesa_logd(" counter\t\tstart\t\t\tstop\t\t\tdiff"); for (int i = 0; i < ARRAY_SIZE(labels); i++) { int register_idx = i + (counter_base - REG_A6XX_RBBM_PRIMCTR_0_LO) / 2; - printf(" RBBM_PRIMCTR_%d\t0x%016" PRIx64 "\t0x%016" PRIx64 "\t%" PRIi64 - "\t%s\n", + mesa_logd(" RBBM_PRIMCTR_%d\t0x%016" PRIx64 "\t0x%016" PRIx64 "\t%" PRIi64 + "\t%s", register_idx, ps->prim_start[i], ps->prim_stop[i], ps->prim_stop[i] - ps->prim_start[i], labels[register_idx]); } - printf(" so counts\n"); + mesa_logd(" so counts"); for (int i = 0; i < ARRAY_SIZE(ps->start); i++) { - printf(" CHANNEL %d emitted\t0x%016" PRIx64 "\t0x%016" PRIx64 - "\t%" PRIi64 "\n", + mesa_logd(" CHANNEL %d emitted\t0x%016" PRIx64 "\t0x%016" PRIx64 + "\t%" PRIi64, i, ps->start[i].generated, ps->stop[i].generated, ps->stop[i].generated - ps->start[i].generated); - printf(" CHANNEL %d generated\t0x%016" PRIx64 "\t0x%016" PRIx64 - "\t%" PRIi64 "\n", + mesa_logd(" CHANNEL %d generated\t0x%016" PRIx64 "\t0x%016" PRIx64 + "\t%" PRIi64, i, ps->start[i].emitted, ps->stop[i].emitted, ps->stop[i].emitted - ps->start[i].emitted); } - printf("generated %" PRIu64 ", emitted %" PRIu64 "\n", ps->result.generated, + mesa_logd("generated %" PRIu64 ", emitted %" PRIu64, ps->result.generated, ps->result.emitted); } diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.c b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.c index 86727179b4b..1331c2a463b 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.c @@ -151,12 +151,12 @@ fd6_vsc_update_sizes(struct fd_batch *batch, const struct pipe_draw_info *info, draw_stream_size_bits(info, batch->num_bins_per_pipe, prim_strm_bits); #if 0 - printf("vsc: prim_strm_bits=%d, draw_strm_bits=%d, nb=%u, ic=%u, c=%u, pc=%u (%s)\n", - prim_strm_bits, draw_strm_bits, batch->num_bins_per_pipe, - info->instance_count, info->count, - (info->count * info->instance_count) / - u_vertices_per_prim(info->mode), - u_prim_name(info->mode)); + mesa_logd("vsc: prim_strm_bits=%d, draw_strm_bits=%d, nb=%u, ic=%u, c=%u, pc=%u (%s)", + prim_strm_bits, draw_strm_bits, batch->num_bins_per_pipe, + info->instance_count, info->count, + (info->count * info->instance_count) / + u_vertices_per_prim(info->mode), + u_prim_name(info->mode)); #endif batch->prim_strm_bits += prim_strm_bits; |