[Mesa-dev] [PATCH 1/2] mesa: Add a source parameter to _mesa_gl_debug.

Ian Romanick idr at freedesktop.org
Fri Dec 5 13:23:06 PST 2014


Series is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

I like Eric's suggestions for patch 2, but I think those could be a
follow-on patch.

On 12/03/2014 10:24 AM, Matt Turner wrote:
> ---
>  src/mesa/drivers/dri/i915/intel_context.h | 2 ++
>  src/mesa/drivers/dri/i915/intel_fbo.c     | 1 +
>  src/mesa/drivers/dri/i965/intel_debug.h   | 2 ++
>  src/mesa/drivers/dri/i965/intel_fbo.c     | 1 +
>  src/mesa/main/errors.c                    | 3 ++-
>  src/mesa/main/errors.h                    | 4 +++-
>  src/mesa/main/fbobject.c                  | 1 +
>  7 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
> index c314594..f0773c8 100644
> --- a/src/mesa/drivers/dri/i915/intel_context.h
> +++ b/src/mesa/drivers/dri/i915/intel_context.h
> @@ -367,6 +367,7 @@ extern int INTEL_DEBUG;
>        dbg_printf(__VA_ARGS__);                                  \
>     if (intel->perf_debug)                                       \
>        _mesa_gl_debug(&intel->ctx, &msg_id,                      \
> +                     MESA_DEBUG_SOURCE_API,                     \
>                       MESA_DEBUG_TYPE_PERFORMANCE,               \
>                       MESA_DEBUG_SEVERITY_MEDIUM,                \
>                       __VA_ARGS__);                              \
> @@ -382,6 +383,7 @@ extern int INTEL_DEBUG;
>           _warned = true;                                        \
>                                                                  \
>           _mesa_gl_debug(ctx, &msg_id,                           \
> +                        MESA_DEBUG_SOURCE_API,                  \
>                          MESA_DEBUG_TYPE_OTHER,                  \
>                          MESA_DEBUG_SEVERITY_HIGH, fmt);         \
>        }                                                         \
> diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c
> index b260d16..e138b85 100644
> --- a/src/mesa/drivers/dri/i915/intel_fbo.c
> +++ b/src/mesa/drivers/dri/i915/intel_fbo.c
> @@ -546,6 +546,7 @@ intel_finish_render_texture(struct gl_context * ctx, struct gl_renderbuffer *rb)
>        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_OTHER,                                \
>                          MESA_DEBUG_SEVERITY_MEDIUM,                           \
>                          __VA_ARGS__);                                         \
> diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h
> index e859be1..e693e9c 100644
> --- a/src/mesa/drivers/dri/i965/intel_debug.h
> +++ b/src/mesa/drivers/dri/i965/intel_debug.h
> @@ -86,6 +86,7 @@ extern uint64_t INTEL_DEBUG;
>        dbg_printf(__VA_ARGS__);                                  \
>     if (brw->perf_debug)                                         \
>        _mesa_gl_debug(&brw->ctx, &msg_id,                        \
> +                     MESA_DEBUG_SOURCE_API,                     \
>                       MESA_DEBUG_TYPE_PERFORMANCE,               \
>                       MESA_DEBUG_SEVERITY_MEDIUM,                \
>                       __VA_ARGS__);                              \
> @@ -101,6 +102,7 @@ extern uint64_t INTEL_DEBUG;
>           _warned = true;                                        \
>                                                                  \
>           _mesa_gl_debug(ctx, &msg_id,                           \
> +                        MESA_DEBUG_SOURCE_API,                  \
>                          MESA_DEBUG_TYPE_OTHER,                  \
>                          MESA_DEBUG_SEVERITY_HIGH, fmt);         \
>        }                                                         \
> diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
> index 4a03b57..d56fc5b 100644
> --- a/src/mesa/drivers/dri/i965/intel_fbo.c
> +++ b/src/mesa/drivers/dri/i965/intel_fbo.c
> @@ -638,6 +638,7 @@ intel_render_texture(struct gl_context * ctx,
>        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_OTHER,                                \
>                          MESA_DEBUG_SEVERITY_MEDIUM,                           \
>                          __VA_ARGS__);                                         \
> diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
> index 7d622bb..4e7853b 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 b388138..89d4d58 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 8283373..02b7633 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);
> 



More information about the mesa-dev mailing list