diff options
| author | Eric Anholt <[email protected]> | 2013-02-22 15:57:25 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-03-05 14:25:00 -0800 |
| commit | c72cf538173329f639c2b64ef091dbd4a71e0bf6 (patch) | |
| tree | 193a70e5dac656ee98100e85bd738e8c2d7836f2 /src/mesa | |
| parent | f0a191ca0ff197f0f0c00be0b4b94169ec81f71f (diff) | |
mesa: Report ARB_debug_output for both shader errors and warnings.
This ends up reusing the dynamic ID support, so a silly enum gets to go
away. We don't assign good IDs to different messages yet, but at least
that's tractable now.
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/errors.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/errors.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 3c720bc5500..9dcf4ebee9e 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -1009,12 +1009,14 @@ _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) * \param len The length of 'msg'. If negative, 'msg' must be null-terminated. */ void -_mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint id, +_mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint *id, const char *msg, int len ) { enum mesa_debug_source source = MESA_DEBUG_SOURCE_SHADER_COMPILER; enum mesa_debug_severity severity = MESA_DEBUG_SEVERITY_HIGH; + debug_get_id(id); + if (len < 0) len = strlen(msg); @@ -1022,7 +1024,7 @@ _mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint id, if (len >= MAX_DEBUG_MESSAGE_LENGTH) len = MAX_DEBUG_MESSAGE_LENGTH - 1; - _mesa_log_msg(ctx, source, type, id, severity, len, msg); + _mesa_log_msg(ctx, source, type, *id, severity, len, msg); } /*@}*/ diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h index aa69931a815..7d8be5aca76 100644 --- a/src/mesa/main/errors.h +++ b/src/mesa/main/errors.h @@ -74,7 +74,8 @@ _mesa_gl_debug(struct gl_context *ctx, const char *fmtString, ...) PRINTFLIKE(5, 6); extern void -_mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint id, const char *msg, int len ); +_mesa_shader_debug(struct gl_context *ctx, GLenum type, GLuint *id, + const char *msg, int len); void GLAPIENTRY _mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, |