[Mesa-dev] [PATCH] i965: Move perf_debug and WARN_ONCE back to brw_context.h.

[Lionel Landwerlin]

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

On 26/11/17 10:09, Kenneth Graunke wrote:
> These were moved to src/intel/common/gen_debug.h, but they are not
> common code.  They assume that brw_context or gl_context variables
> exist, named brw or ctx.  That isn't remotely true outside of i965.
> ---
>   src/intel/common/gen_debug.h            | 29 -----------------------------
>   src/mesa/drivers/dri/i965/brw_context.h | 29 +++++++++++++++++++++++++++++
>   2 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/src/intel/common/gen_debug.h b/src/intel/common/gen_debug.h
> index e418e3fb166..a069d6b238a 100644
> --- a/src/intel/common/gen_debug.h
> +++ b/src/intel/common/gen_debug.h
> @@ -100,35 +100,6 @@ extern uint64_t INTEL_DEBUG;
>   		dbg_printf(__VA_ARGS__);			\
>   } while(0)
>   
> -#define perf_debug(...) do {					\
> -   static GLuint msg_id = 0;                                    \
> -   if (unlikely(INTEL_DEBUG & DEBUG_PERF))                      \
> -      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__);                              \
> -} while(0)
> -
> -#define WARN_ONCE(cond, fmt...) do {                            \
> -   if (unlikely(cond)) {                                        \
> -      static bool _warned = false;                              \
> -      static GLuint msg_id = 0;                                 \
> -      if (!_warned) {                                           \
> -         fprintf(stderr, "WARNING: ");                          \
> -         fprintf(stderr, fmt);                                  \
> -         _warned = true;                                        \
> -                                                                \
> -         _mesa_gl_debug(ctx, &msg_id,                           \
> -                        MESA_DEBUG_SOURCE_API,                  \
> -                        MESA_DEBUG_TYPE_OTHER,                  \
> -                        MESA_DEBUG_SEVERITY_HIGH, fmt);         \
> -      }                                                         \
> -   }                                                            \
> -} while (0)
> -
>   extern uint64_t intel_debug_flag_for_shader_stage(gl_shader_stage stage);
>   
>   extern void brw_process_intel_debug_variable(void);
> diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
> index b3d7c6baf8a..c68e2aff348 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.h
> +++ b/src/mesa/drivers/dri/i965/brw_context.h
> @@ -375,6 +375,35 @@ struct brw_cache {
>      uint32_t next_offset;
>   };
>   
> +#define perf_debug(...) do {					\
> +   static GLuint msg_id = 0;                                    \
> +   if (unlikely(INTEL_DEBUG & DEBUG_PERF))                      \
> +      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__);                              \
> +} while(0)
> +
> +#define WARN_ONCE(cond, fmt...) do {                            \
> +   if (unlikely(cond)) {                                        \
> +      static bool _warned = false;                              \
> +      static GLuint msg_id = 0;                                 \
> +      if (!_warned) {                                           \
> +         fprintf(stderr, "WARNING: ");                          \
> +         fprintf(stderr, fmt);                                  \
> +         _warned = true;                                        \
> +                                                                \
> +         _mesa_gl_debug(ctx, &msg_id,                           \
> +                        MESA_DEBUG_SOURCE_API,                  \
> +                        MESA_DEBUG_TYPE_OTHER,                  \
> +                        MESA_DEBUG_SEVERITY_HIGH, fmt);         \
> +      }                                                         \
> +   }                                                            \
> +} while (0)
> +
>   /* Considered adding a member to this struct to document which flags
>    * an update might raise so that ordering of the state atoms can be
>    * checked or derived at runtime.  Dropped the idea in favor of having