fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Rename PIPE_DEBUG_TYPE to UTIL_DEBUG_TYPE

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15657>
This commit is contained in:
Yonggang Luo 2022-03-31 04:23:56 +08:00 • committed by Marge Bot
parent ab225a1e36
commit b2ece67f11
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/crocus/crocus_screen.c
View file

@ -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);

4
src/gallium/drivers/iris/iris_screen.c
View file

@ -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);

2
src/gallium/include/pipe/p_state.h
View file

@ -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
*/

14
src/mesa/main/debug_output.c
View file

@ -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;

14
src/util/macros.h
View file

@ -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)

2
src/util/u_debug.h
View file

@ -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)