From b0ad3ce4e7b9a23ab8fad4823e3c1094d6cf42a6 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 18 Apr 2015 12:23:33 -0700 Subject: [PATCH] mesa: Add a va_args variant of _mesa_gl_debug(). This will be useful for wrapper functions. Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand Reviewed-by: Chris Forbes --- src/mesa/main/errors.c | 29 +++++++++++++++++++++-------- src/mesa/main/errors.h | 9 +++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 16f10ddb694..b3406665d94 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -1412,6 +1412,26 @@ should_output(struct gl_context *ctx, GLenum error, const char *fmtString) } +void +_mesa_gl_vdebug(struct gl_context *ctx, + GLuint *id, + enum mesa_debug_source source, + enum mesa_debug_type type, + enum mesa_debug_severity severity, + const char *fmtString, + va_list args) +{ + char s[MAX_DEBUG_MESSAGE_LENGTH]; + int len; + + debug_get_id(id); + + len = _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + + log_msg(ctx, source, type, *id, severity, len, s); +} + + void _mesa_gl_debug(struct gl_context *ctx, GLuint *id, @@ -1420,17 +1440,10 @@ _mesa_gl_debug(struct gl_context *ctx, enum mesa_debug_severity severity, const char *fmtString, ...) { - char s[MAX_DEBUG_MESSAGE_LENGTH]; - int len; va_list args; - - debug_get_id(id); - va_start(args, fmtString); - len = _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + _mesa_gl_vdebug(ctx, id, source, type, severity, fmtString, args); va_end(args); - - log_msg(ctx, source, type, *id, severity, len, s); } diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h index e6dc9b5f1b9..24f234f7f10 100644 --- a/src/mesa/main/errors.h +++ b/src/mesa/main/errors.h @@ -75,6 +75,15 @@ _mesa_log(const char *fmtString, ...) PRINTFLIKE(1, 2); extern FILE * _mesa_get_log_file(void); +extern void +_mesa_gl_vdebug(struct gl_context *ctx, + GLuint *id, + enum mesa_debug_source source, + enum mesa_debug_type type, + enum mesa_debug_severity severity, + const char *fmtString, + va_list args); + extern void _mesa_gl_debug(struct gl_context *ctx, GLuint *id, -- 2.30.2