diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 11:09:16 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 11:41:17 +0100 |
commit | b11bc37684181390fc1400afb44054785104ca15 (patch) | |
tree | aa6847b9ba6ebc3baa280161372114804bbfc146 /src/sna/sna_trapezoids.c | |
parent | 21798a88676e91049917fafd3196dd4374b94226 (diff) |
sna: Simplify the DBG incarnation
It was only ever used in conjunction with HAS_DEBUG_FULL. For debug
purposes it is as easy to redefine DBG locally. By simplifying the DBG
macro we can create it consistently and so reduce the number of compiler
warnings.
Long term, this has to be dynamic. Sigh.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_trapezoids.c')
-rw-r--r-- | src/sna/sna_trapezoids.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c index 56c6a3e9..744818f5 100644 --- a/src/sna/sna_trapezoids.c +++ b/src/sna/sna_trapezoids.c @@ -38,11 +38,6 @@ #include <mipict.h> -#if DEBUG_TRAPEZOIDS -#undef DBG -#define DBG(x) ErrorF x -#endif - #if 0 #define __DBG(x) ErrorF x #else @@ -79,7 +74,7 @@ typedef void (*span_func_t)(struct sna *sna, const BoxRec *box, int coverage); -#if DEBUG_TRAPEZOIDS +#if HAS_DEBUG_FULL static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char *function) { if (box->x1 < 0 || box->y1 < 0 || @@ -2000,7 +1995,7 @@ mono_merge_unsorted_edges(struct mono_edge *head, struct mono_edge *unsorted) return mono_merge_sorted_edges(head, unsorted); } -#if DEBUG_TRAPEZOIDS +#if 0 static inline void __dbg_mono_edges(const char *function, struct mono_edge *edges) { |