diff options
| author | Matt Turner <[email protected]> | 2014-11-13 17:35:58 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-12-05 16:43:31 -0800 |
| commit | 5b1e51bfbe6f8b2fa51065bc6e5706c337211d3c (patch) | |
| tree | 2451a3e37af302e58d407fe1f7ed9f492b329d68 /src/mesa/main | |
| parent | befdff81423a1b6a05969dfde59bfa9c521c4621 (diff) | |
mesa: Add a source parameter to _mesa_gl_debug.
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/errors.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/errors.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 7d622bb16cf..4e7853b9066 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -1395,6 +1395,7 @@ should_output(struct gl_context *ctx, GLenum error, const char *fmtString) void _mesa_gl_debug(struct gl_context *ctx, GLuint *id, + enum mesa_debug_source source, enum mesa_debug_type type, enum mesa_debug_severity severity, const char *fmtString, ...) @@ -1409,7 +1410,7 @@ _mesa_gl_debug(struct gl_context *ctx, len = _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); va_end(args); - log_msg(ctx, MESA_DEBUG_SOURCE_API, type, *id, severity, len, s); + log_msg(ctx, source, type, *id, severity, len, s); } diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h index b388138e84d..89d4d58b0da 100644 --- a/src/mesa/main/errors.h +++ b/src/mesa/main/errors.h @@ -72,14 +72,16 @@ _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLI extern void _mesa_gl_debug(struct gl_context *ctx, GLuint *id, + enum mesa_debug_source source, enum mesa_debug_type type, enum mesa_debug_severity severity, - const char *fmtString, ...) PRINTFLIKE(5, 6); + const char *fmtString, ...) PRINTFLIKE(6, 7); #define _mesa_perf_debug(ctx, sev, ...) do { \ static GLuint msg_id = 0; \ if (unlikely(ctx->Const.ContextFlags & GL_CONTEXT_FLAG_DEBUG_BIT)) { \ _mesa_gl_debug(ctx, &msg_id, \ + MESA_DEBUG_SOURCE_API, \ MESA_DEBUG_TYPE_PERFORMANCE, \ sev, \ __VA_ARGS__); \ diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 8283373a4e4..02b76339049 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -599,6 +599,7 @@ fbo_incomplete(struct gl_context *ctx, const char *msg, int index) static GLuint msg_id; _mesa_gl_debug(ctx, &msg_id, + MESA_DEBUG_SOURCE_API, MESA_DEBUG_TYPE_OTHER, MESA_DEBUG_SEVERITY_MEDIUM, "FBO incomplete: %s [%d]\n", msg, index); |