From b2ece67f11cede6d052cda4d81c9aa946c15cad7 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 31 Mar 2022 04:23:56 +0800 Subject: [PATCH] util: Rename PIPE_DEBUG_TYPE to UTIL_DEBUG_TYPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/crocus/crocus_screen.c | 4 ++-- src/gallium/drivers/iris/iris_screen.c | 4 ++-- src/gallium/include/pipe/p_state.h | 2 +- src/mesa/main/debug_output.c | 14 +++++++------- src/util/macros.h | 14 +++++++------- src/util/u_debug.h | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index c9471da5c9d..2a3f0ffe457 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -687,7 +687,7 @@ crocus_shader_debug_log(void *data, unsigned *id, const char *fmt, ...) return; va_start(args, fmt); - dbg->debug_message(dbg->data, id, PIPE_DEBUG_TYPE_SHADER_INFO, fmt, args); + dbg->debug_message(dbg->data, id, UTIL_DEBUG_TYPE_SHADER_INFO, fmt, args); va_end(args); } @@ -706,7 +706,7 @@ crocus_shader_perf_log(void *data, unsigned *id, const char *fmt, ...) } if (dbg->debug_message) { - dbg->debug_message(dbg->data, id, PIPE_DEBUG_TYPE_PERF_INFO, fmt, args); + dbg->debug_message(dbg->data, id, UTIL_DEBUG_TYPE_PERF_INFO, fmt, args); } va_end(args); diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index 7d6e24ad9b2..1b19fded66b 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -695,7 +695,7 @@ iris_shader_debug_log(void *data, unsigned *id, const char *fmt, ...) return; va_start(args, fmt); - dbg->debug_message(dbg->data, id, PIPE_DEBUG_TYPE_SHADER_INFO, fmt, args); + dbg->debug_message(dbg->data, id, UTIL_DEBUG_TYPE_SHADER_INFO, fmt, args); va_end(args); } @@ -714,7 +714,7 @@ iris_shader_perf_log(void *data, unsigned *id, const char *fmt, ...) } if (dbg->debug_message) { - dbg->debug_message(dbg->data, id, PIPE_DEBUG_TYPE_PERF_INFO, fmt, args); + dbg->debug_message(dbg->data, id, UTIL_DEBUG_TYPE_PERF_INFO, fmt, args); } va_end(args); diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 071b61f2233..b2ab438677e 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -1019,7 +1019,7 @@ struct util_debug_callback * \param data user-supplied data pointer * \param id message type identifier, if pointed value is 0, then a * new id is assigned - * \param type PIPE_DEBUG_TYPE_* + * \param type UTIL_DEBUG_TYPE_* * \param format printf-style format string * \param args args for format string */ diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c index e5b459965da..fbf414ffbf1 100644 --- a/src/mesa/main/debug_output.c +++ b/src/mesa/main/debug_output.c @@ -697,37 +697,37 @@ _debug_message(void *data, enum mesa_debug_severity severity; switch (ptype) { - case PIPE_DEBUG_TYPE_OUT_OF_MEMORY: + case UTIL_DEBUG_TYPE_OUT_OF_MEMORY: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_ERROR; severity = MESA_DEBUG_SEVERITY_MEDIUM; break; - case PIPE_DEBUG_TYPE_ERROR: + case UTIL_DEBUG_TYPE_ERROR: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_ERROR; severity = MESA_DEBUG_SEVERITY_MEDIUM; break; - case PIPE_DEBUG_TYPE_SHADER_INFO: + case UTIL_DEBUG_TYPE_SHADER_INFO: source = MESA_DEBUG_SOURCE_SHADER_COMPILER; type = MESA_DEBUG_TYPE_OTHER; severity = MESA_DEBUG_SEVERITY_NOTIFICATION; break; - case PIPE_DEBUG_TYPE_PERF_INFO: + case UTIL_DEBUG_TYPE_PERF_INFO: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_PERFORMANCE; severity = MESA_DEBUG_SEVERITY_NOTIFICATION; break; - case PIPE_DEBUG_TYPE_INFO: + case UTIL_DEBUG_TYPE_INFO: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_OTHER; severity = MESA_DEBUG_SEVERITY_NOTIFICATION; break; - case PIPE_DEBUG_TYPE_FALLBACK: + case UTIL_DEBUG_TYPE_FALLBACK: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_PERFORMANCE; severity = MESA_DEBUG_SEVERITY_NOTIFICATION; break; - case PIPE_DEBUG_TYPE_CONFORMANCE: + case UTIL_DEBUG_TYPE_CONFORMANCE: source = MESA_DEBUG_SOURCE_API; type = MESA_DEBUG_TYPE_OTHER; severity = MESA_DEBUG_SEVERITY_NOTIFICATION; diff --git a/src/util/macros.h b/src/util/macros.h index 4aa499cc664..fc0c4f3413c 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -430,13 +430,13 @@ u_uintN_max(unsigned bit_size) */ enum util_debug_type { - PIPE_DEBUG_TYPE_OUT_OF_MEMORY = 1, - PIPE_DEBUG_TYPE_ERROR, - PIPE_DEBUG_TYPE_SHADER_INFO, - PIPE_DEBUG_TYPE_PERF_INFO, - PIPE_DEBUG_TYPE_INFO, - PIPE_DEBUG_TYPE_FALLBACK, - PIPE_DEBUG_TYPE_CONFORMANCE, + UTIL_DEBUG_TYPE_OUT_OF_MEMORY = 1, + UTIL_DEBUG_TYPE_ERROR, + UTIL_DEBUG_TYPE_SHADER_INFO, + UTIL_DEBUG_TYPE_PERF_INFO, + UTIL_DEBUG_TYPE_INFO, + UTIL_DEBUG_TYPE_FALLBACK, + UTIL_DEBUG_TYPE_CONFORMANCE, }; #if !defined(alignof) && !defined(__cplusplus) diff --git a/src/util/u_debug.h b/src/util/u_debug.h index 08328ba15e5..1e0b9ee5623 100644 --- a/src/util/u_debug.h +++ b/src/util/u_debug.h @@ -270,7 +270,7 @@ void _debug_assert_fail(const char *expr, static unsigned id = 0; \ if ((cb) && (cb)->debug_message) { \ _util_debug_message(cb, &id, \ - PIPE_DEBUG_TYPE_ ## type, \ + UTIL_DEBUG_TYPE_ ## type, \ fmt, ##__VA_ARGS__); \ } \ } while (0)