diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-10 18:22:46 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-10 18:23:16 -0800 |
| commit | b53977f4c53c7c8f562f909e985b8d5a7b2526f3 (patch) | |
| tree | c0695cf61d294e78b9c78633dc1222f30ce87707 /uxa | |
| parent | 5212ec6515c6562f66b86fc16928b601bf04e49b (diff) | |
uxa: Fix failure to --amend in further changes in previous commit.
Diffstat (limited to 'uxa')
| -rw-r--r-- | uxa/uxa-render.c | 10 | ||||
| -rw-r--r-- | uxa/uxa-unaccel.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c index 13635f83..60022cc4 100644 --- a/uxa/uxa-render.c +++ b/uxa/uxa-render.c @@ -33,13 +33,11 @@ #ifdef RENDER #include "mipict.h" -#if DEBUG_TRACE_FALL static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string, int n) { char format[20]; char size[20]; char loc; - int temp; if (!pict) { snprintf(string, n, "None"); @@ -71,7 +69,7 @@ static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string, int break; } - loc = uxa_get_drawable_pixmap(pict->pDrawable, &temp, &temp) ? 's' : 'm'; + loc = uxa_get_drawable_pixmap(pict->pDrawable) ? 's' : 'm'; snprintf(size, 20, "%dx%d%s", pict->pDrawable->width, pict->pDrawable->height, pict->repeat ? @@ -112,7 +110,6 @@ uxa_print_composite_fallback(CARD8 op, " dst %s, \n", sop, srcdesc, maskdesc, dstdesc); } -#endif /* DEBUG_TRACE_FALL */ Bool uxa_op_reads_destination (CARD8 op) @@ -775,9 +772,8 @@ uxa_composite(CARD8 op, } fallback: -#if DEBUG_TRACE_FALL - uxa_print_composite_fallback (op, pSrc, pMask, pDst); -#endif + if (uxa_screen->fallback_debug) + uxa_print_composite_fallback (op, pSrc, pMask, pDst); uxa_check_composite (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height); diff --git a/uxa/uxa-unaccel.c b/uxa/uxa-unaccel.c index d2c5de03..8f864688 100644 --- a/uxa/uxa-unaccel.c +++ b/uxa/uxa-unaccel.c @@ -68,13 +68,11 @@ uxa_finish_access_gc(GCPtr pGC) uxa_finish_access(&pGC->stipple->drawable); } -#if DEBUG_TRACE_FALL char uxa_drawable_location(DrawablePtr pDrawable) { return uxa_drawable_is_offscreen(pDrawable) ? 's' : 'm'; } -#endif /* DEBUG_TRACE_FALL */ void uxa_check_fill_spans (DrawablePtr pDrawable, GCPtr pGC, int nspans, |