diff options
| author | Nicolai Hähnle <[email protected]> | 2017-08-07 11:05:20 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-08-22 09:53:35 +0200 |
| commit | a6e7693882483bc64d003908874f84956b1c79a9 (patch) | |
| tree | 1c02d1c3f9aa3d1b676415e03872204c7a6d92c2 | |
| parent | 635a930ad3c0415a2855a3d9b958d4f34304225f (diff) | |
gallium: remove unused PIPE_DUMP_* defines
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/ddebug/dd_draw.c | 21 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_debug.c | 8 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 3 |
3 files changed, 7 insertions, 25 deletions
diff --git a/src/gallium/drivers/ddebug/dd_draw.c b/src/gallium/drivers/ddebug/dd_draw.c index aa38c561c57..4bf13bd7e46 100644 --- a/src/gallium/drivers/ddebug/dd_draw.c +++ b/src/gallium/drivers/ddebug/dd_draw.c @@ -620,10 +620,7 @@ dd_flush_and_handle_hang(struct dd_context *dctx, if (f) { fprintf(f, "dd: %s.\n", cause); dd_dump_driver_state(dctx, f, - PIPE_DUMP_DEVICE_STATUS_REGISTERS | - PIPE_DUMP_CURRENT_STATES | - PIPE_DUMP_CURRENT_SHADERS | - PIPE_DUMP_LAST_COMMAND_BUFFER); + PIPE_DUMP_DEVICE_STATUS_REGISTERS); dd_dump_dmesg(f); dd_close_file_stream(f); } @@ -1118,10 +1115,7 @@ dd_after_draw(struct dd_context *dctx, struct dd_call *call) if (!dscreen->no_flush && dd_flush_and_check_hang(dctx, NULL, 0)) { dd_write_report(dctx, call, - PIPE_DUMP_DEVICE_STATUS_REGISTERS | - PIPE_DUMP_CURRENT_STATES | - PIPE_DUMP_CURRENT_SHADERS | - PIPE_DUMP_LAST_COMMAND_BUFFER, + PIPE_DUMP_DEVICE_STATUS_REGISTERS, true); /* Terminate the process to prevent future hangs. */ @@ -1136,19 +1130,12 @@ dd_after_draw(struct dd_context *dctx, struct dd_call *call) case DD_DUMP_ALL_CALLS: if (!dscreen->no_flush) pipe->flush(pipe, NULL, 0); - dd_write_report(dctx, call, - PIPE_DUMP_CURRENT_STATES | - PIPE_DUMP_CURRENT_SHADERS | - PIPE_DUMP_LAST_COMMAND_BUFFER, - false); + dd_write_report(dctx, call, 0, false); break; case DD_DUMP_APITRACE_CALL: if (dscreen->apitrace_dump_call == dctx->draw_state.apitrace_call_number) { - dd_write_report(dctx, call, - PIPE_DUMP_CURRENT_STATES | - PIPE_DUMP_CURRENT_SHADERS, - false); + dd_write_report(dctx, call, 0, false); /* No need to continue. */ exit(0); } else { diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 278887c7063..b6bddc52160 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -1061,11 +1061,9 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f, if (flags & PIPE_DUMP_DEVICE_STATUS_REGISTERS) { 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); - } + 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); } } diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 8609aefb986..da7d5da7347 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -358,9 +358,6 @@ enum pipe_flush_flags * Flags for pipe_context::dump_debug_state. */ #define PIPE_DUMP_DEVICE_STATUS_REGISTERS (1 << 0) -#define PIPE_DUMP_CURRENT_STATES (1 << 1) -#define PIPE_DUMP_CURRENT_SHADERS (1 << 2) -#define PIPE_DUMP_LAST_COMMAND_BUFFER (1 << 3) /** * Create a compute-only context. Use in pipe_screen::context_create. |