diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-07-28 06:35:41 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2017-07-31 12:46:43 +0200 |
| commit | 5d8359ff4d8c379fdf1a78758f405bb4cdf69459 (patch) | |
| tree | 0a425cafd0594860ccc0f6f5de1654ffc4da194c /src/gallium/drivers | |
| parent | ddc32537d6db69198e88ef0dfe19770bf9daa536 (diff) | |
radeonsi: expose MRT-draw-calls to HUD
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index c2fb3690d2..4e3b42a112 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -587,6 +587,7 @@ struct r600_common_context { unsigned num_cs_dw_queries_suspend; /* Misc stats. */ unsigned num_draw_calls; + unsigned num_mrt_draw_calls; unsigned num_prim_restart_calls; unsigned num_spill_draw_calls; unsigned num_compute_calls; diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index db70878d1d..e716d4bf15 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -99,6 +99,9 @@ static bool r600_query_sw_begin(struct r600_common_context *rctx, case R600_QUERY_DRAW_CALLS: query->begin_result = rctx->num_draw_calls; break; + case R600_QUERY_MRT_DRAW_CALLS: + query->begin_result = rctx->num_mrt_draw_calls; + break; case R600_QUERY_PRIM_RESTART_CALLS: query->begin_result = rctx->num_prim_restart_calls; break; @@ -253,6 +256,9 @@ static bool r600_query_sw_end(struct r600_common_context *rctx, case R600_QUERY_DRAW_CALLS: query->end_result = rctx->num_draw_calls; break; + case R600_QUERY_MRT_DRAW_CALLS: + query->end_result = rctx->num_mrt_draw_calls; + break; case R600_QUERY_PRIM_RESTART_CALLS: query->end_result = rctx->num_prim_restart_calls; break; @@ -1851,6 +1857,7 @@ static struct pipe_driver_query_info r600_driver_query_list[] = { X("num-shaders-created", NUM_SHADERS_CREATED, UINT64, CUMULATIVE), X("num-shader-cache-hits", NUM_SHADER_CACHE_HITS, UINT64, CUMULATIVE), X("draw-calls", DRAW_CALLS, UINT64, AVERAGE), + X("MRT-draw-calls", MRT_DRAW_CALLS, UINT64, AVERAGE), X("prim-restart-calls", PRIM_RESTART_CALLS, UINT64, AVERAGE), X("spill-draw-calls", SPILL_DRAW_CALLS, UINT64, AVERAGE), X("compute-calls", COMPUTE_CALLS, UINT64, AVERAGE), diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h index 1bbaa76e58..e176246122 100644 --- a/src/gallium/drivers/radeon/r600_query.h +++ b/src/gallium/drivers/radeon/r600_query.h @@ -42,6 +42,7 @@ struct r600_resource; enum { R600_QUERY_DRAW_CALLS = PIPE_QUERY_DRIVER_SPECIFIC, + R600_QUERY_MRT_DRAW_CALLS, R600_QUERY_PRIM_RESTART_CALLS, R600_QUERY_SPILL_DRAW_CALLS, R600_QUERY_COMPUTE_CALLS, diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index c1edf7f370..a5f5b7f98a 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1392,6 +1392,8 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) } sctx->b.num_draw_calls++; + if (sctx->framebuffer.state.nr_cbufs > 1) + sctx->b.num_mrt_draw_calls++; if (info->primitive_restart) sctx->b.num_prim_restart_calls++; if (G_0286E8_WAVESIZE(sctx->spi_tmpring_size)) |