diff options
| author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2007-06-11 22:43:01 -0400 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2007-06-11 22:43:01 -0400 |
| commit | eb2d7fe02f9cbca57b462bba05498e2d59316fbc (patch) | |
| tree | d7ea1879f6bd5d739ea132f319e95dd7d65e23c6 /fb/fbwindow.c | |
| parent | f52ae237d3eec79ccd64cdd77271aeacc37af70c (diff) | |
Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch]
Diffstat (limited to 'fb/fbwindow.c')
| -rw-r--r-- | fb/fbwindow.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 5b3f446b1..fc036d3bb 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -30,10 +30,6 @@ #include "fb.h" -#ifdef USE_MMX -#include "fbmmx.h" -#endif - Bool fbCreateWindow(WindowPtr pWin) { @@ -222,22 +218,22 @@ fbFillRegionSolid (DrawablePtr pDrawable, int n = REGION_NUM_RECTS(pRegion); BoxPtr pbox = REGION_RECTS(pRegion); -#ifdef USE_MMX - int has_mmx = 0; - if (!and && fbHaveMMX()) - has_mmx = 1; +#ifndef FB_ACCESS_WRAPPER + int try_mmx = 0; + if (!and) + try_mmx = 1; #endif fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff); while (n--) { -#ifdef USE_MMX - if (!has_mmx || !fbFillmmx (dst, dstStride, dstBpp, - pbox->x1 + dstXoff, pbox->y1 + dstYoff, - (pbox->x2 - pbox->x1), - (pbox->y2 - pbox->y1), - xor)) +#ifndef FB_ACCESS_WRAPPER + if (!try_mmx || !pixman_fill (dst, dstStride, dstBpp, + pbox->x1 + dstXoff, pbox->y1 + dstYoff, + (pbox->x2 - pbox->x1), + (pbox->y2 - pbox->y1), + xor)) { #endif fbSolid (dst + (pbox->y1 + dstYoff) * dstStride, @@ -247,7 +243,7 @@ fbFillRegionSolid (DrawablePtr pDrawable, (pbox->x2 - pbox->x1) * dstBpp, pbox->y2 - pbox->y1, and, xor); -#ifdef USE_MMX +#ifndef FB_ACCESS_WRAPPER } #endif fbValidateDrawable (pDrawable); |