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

gallium: remove unused PIPE_DUMP_* defines

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-08-07 11:05:20 +02:00
parent 635a930ad3
commit a6e7693882
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gallium/drivers/ddebug/dd_draw.c
View File

@@ -620,10 +620,7 @@ dd_flush_and_handle_hang(struct dd_context *dctx,
if (f) { if (f) {
fprintf(f, "dd: %s.\n", cause); fprintf(f, "dd: %s.\n", cause);
dd_dump_driver_state(dctx, f, dd_dump_driver_state(dctx, f,
PIPE_DUMP_DEVICE_STATUS_REGISTERS | PIPE_DUMP_DEVICE_STATUS_REGISTERS);
PIPE_DUMP_CURRENT_STATES |
PIPE_DUMP_CURRENT_SHADERS |
PIPE_DUMP_LAST_COMMAND_BUFFER);
dd_dump_dmesg(f); dd_dump_dmesg(f);
dd_close_file_stream(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 && if (!dscreen->no_flush &&
dd_flush_and_check_hang(dctx, NULL, 0)) { dd_flush_and_check_hang(dctx, NULL, 0)) {
dd_write_report(dctx, call, dd_write_report(dctx, call,
PIPE_DUMP_DEVICE_STATUS_REGISTERS | PIPE_DUMP_DEVICE_STATUS_REGISTERS,
PIPE_DUMP_CURRENT_STATES |
PIPE_DUMP_CURRENT_SHADERS |
PIPE_DUMP_LAST_COMMAND_BUFFER,
true); true);
/* Terminate the process to prevent future hangs. */ /* 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: case DD_DUMP_ALL_CALLS:
if (!dscreen->no_flush) if (!dscreen->no_flush)
pipe->flush(pipe, NULL, 0); pipe->flush(pipe, NULL, 0);
dd_write_report(dctx, call, dd_write_report(dctx, call, 0, false);
PIPE_DUMP_CURRENT_STATES |
PIPE_DUMP_CURRENT_SHADERS |
PIPE_DUMP_LAST_COMMAND_BUFFER,
false);
break; break;
case DD_DUMP_APITRACE_CALL: case DD_DUMP_APITRACE_CALL:
if (dscreen->apitrace_dump_call == if (dscreen->apitrace_dump_call ==
dctx->draw_state.apitrace_call_number) { dctx->draw_state.apitrace_call_number) {
dd_write_report(dctx, call, dd_write_report(dctx, call, 0, false);
PIPE_DUMP_CURRENT_STATES |
PIPE_DUMP_CURRENT_SHADERS,
false);
/* No need to continue. */ /* No need to continue. */
exit(0); exit(0);
} else { } else {

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

@@ -1061,13 +1061,11 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
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_annotated_shaders(sctx, f);
si_dump_command("Active waves (raw data)", "umr -wa | column -t", 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_command("Wave information", "umr -O bits -wa", f);
} }
} }
}
void si_log_draw_state(struct si_context *sctx, struct u_log_context *log) void si_log_draw_state(struct si_context *sctx, struct u_log_context *log)
{ {

3
src/gallium/include/pipe/p_defines.h
View File

@@ -358,9 +358,6 @@ enum pipe_flush_flags
* Flags for pipe_context::dump_debug_state. * Flags for pipe_context::dump_debug_state.
*/ */
#define PIPE_DUMP_DEVICE_STATUS_REGISTERS (1 << 0) #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. * Create a compute-only context. Use in pipe_screen::context_create.