From ab225a1e36d4062df62e53bdeea9ddffb12658bc Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 31 Mar 2022 04:23:16 +0800 Subject: [PATCH] util: Rename pipe_debug_type to util_debug_type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/gallium/auxiliary/util/u_async_debug.c | 2 +- src/gallium/auxiliary/util/u_async_debug.h | 2 +- src/gallium/frontends/clover/core/queue.cpp | 2 +- src/gallium/include/pipe/p_state.h | 2 +- src/mesa/main/debug_output.c | 2 +- src/util/macros.h | 2 +- src/util/u_debug.c | 2 +- src/util/u_debug.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/auxiliary/util/u_async_debug.c b/src/gallium/auxiliary/util/u_async_debug.c index a08b938..a556ff6 100644 --- a/src/gallium/auxiliary/util/u_async_debug.c +++ b/src/gallium/auxiliary/util/u_async_debug.c @@ -32,7 +32,7 @@ #include "util/u_string.h" static void -u_async_debug_message(void *data, unsigned *id, enum pipe_debug_type type, +u_async_debug_message(void *data, unsigned *id, enum util_debug_type type, const char *fmt, va_list args) { struct util_async_debug_callback *adbg = data; diff --git a/src/gallium/auxiliary/util/u_async_debug.h b/src/gallium/auxiliary/util/u_async_debug.h index f1c7706..c009d53 100644 --- a/src/gallium/auxiliary/util/u_async_debug.h +++ b/src/gallium/auxiliary/util/u_async_debug.h @@ -43,7 +43,7 @@ extern "C" { struct util_debug_message { unsigned *id; - enum pipe_debug_type type; + enum util_debug_type type; char *msg; }; diff --git a/src/gallium/frontends/clover/core/queue.cpp b/src/gallium/frontends/clover/core/queue.cpp index b4a4b95..a1962ea 100644 --- a/src/gallium/frontends/clover/core/queue.cpp +++ b/src/gallium/frontends/clover/core/queue.cpp @@ -32,7 +32,7 @@ namespace { void debug_notify_callback(void *data, unsigned *id, - enum pipe_debug_type type, + enum util_debug_type type, const char *fmt, va_list args) { const command_queue *queue = (const command_queue *)data; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 8cf8f8c..071b61f 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -1025,7 +1025,7 @@ struct util_debug_callback */ void (*debug_message)(void *data, unsigned *id, - enum pipe_debug_type type, + enum util_debug_type type, const char *fmt, va_list args); void *data; diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c index 3e7ed84..e5b4599 100644 --- a/src/mesa/main/debug_output.c +++ b/src/mesa/main/debug_output.c @@ -687,7 +687,7 @@ debug_pop_group(struct gl_debug_state *debug) static void _debug_message(void *data, unsigned *id, - enum pipe_debug_type ptype, + enum util_debug_type ptype, const char *fmt, va_list args) { diff --git a/src/util/macros.h b/src/util/macros.h index 35ffa80..4aa499c 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -428,7 +428,7 @@ u_uintN_max(unsigned bit_size) /* TODO: In future we should try to move this to u_debug.h once header * dependencies are reorganised to allow this. */ -enum pipe_debug_type +enum util_debug_type { PIPE_DEBUG_TYPE_OUT_OF_MEMORY = 1, PIPE_DEBUG_TYPE_ERROR, diff --git a/src/util/u_debug.c b/src/util/u_debug.c index bff7254..9cf1ec7 100644 --- a/src/util/u_debug.c +++ b/src/util/u_debug.c @@ -68,7 +68,7 @@ _debug_vprintf(const char *format, va_list ap) void _util_debug_message(struct util_debug_callback *cb, unsigned *id, - enum pipe_debug_type type, + enum util_debug_type type, const char *fmt, ...) { va_list args; diff --git a/src/util/u_debug.h b/src/util/u_debug.h index f907e01..08328ba 100644 --- a/src/util/u_debug.h +++ b/src/util/u_debug.h @@ -281,7 +281,7 @@ void _util_debug_message( struct util_debug_callback *cb, unsigned *id, - enum pipe_debug_type type, + enum util_debug_type type, const char *fmt, ...) _util_printf_format(4, 5); -- 2.7.4