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

radeonsi: re-order debug state dumping

Browse Source 
Keep together the parts that won't use the deferred logging mechanism.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-08-04 15:42:15 +02:00
parent 40697e8678
commit ad33f2ddd8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/drivers/radeonsi/si_debug.c
View File

@@ -815,9 +815,16 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
{ {
struct si_context *sctx = (struct si_context*)ctx; struct si_context *sctx = (struct si_context*)ctx;
if (flags & PIPE_DUMP_DEVICE_STATUS_REGISTERS) if (flags & PIPE_DUMP_DEVICE_STATUS_REGISTERS) {
si_dump_debug_registers(sctx, f); si_dump_debug_registers(sctx, f);
if (flags & PIPE_DUMP_CURRENT_SHADERS) {
si_dump_annotated_shaders(sctx, f);
si_dump_command("Active waves (raw data)", "umr -wa | column -t", f);
si_dump_command("Wave information", "umr -O bits -wa", f);
}
}
if (flags & PIPE_DUMP_CURRENT_STATES) if (flags & PIPE_DUMP_CURRENT_STATES)
si_dump_framebuffer(sctx, f); si_dump_framebuffer(sctx, f);
@@ -829,12 +836,6 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
si_dump_gfx_shader(sctx->screen, &sctx->ps_shader, f); si_dump_gfx_shader(sctx->screen, &sctx->ps_shader, f);
si_dump_compute_shader(sctx->screen, &sctx->cs_shader_state, f); si_dump_compute_shader(sctx->screen, &sctx->cs_shader_state, f);
if (flags & PIPE_DUMP_DEVICE_STATUS_REGISTERS) {
si_dump_annotated_shaders(sctx, f);
si_dump_command("Active waves (raw data)", "umr -wa | column -t", f);
si_dump_command("Wave information", "umr -O bits -wa", f);
}
si_dump_descriptor_list(&sctx->descriptors[SI_DESCS_RW_BUFFERS], si_dump_descriptor_list(&sctx->descriptors[SI_DESCS_RW_BUFFERS],
"", "RW buffers", 4, SI_NUM_RW_BUFFERS, "", "RW buffers", 4, SI_NUM_RW_BUFFERS,
si_identity, f); si_identity, f);