diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /cfb/cfbtile32.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'cfb/cfbtile32.c')
| -rw-r--r-- | cfb/cfbtile32.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index cfa3bd503..b202943e8 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -2,7 +2,7 @@ * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.6 2001/12/14 19:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ /* @@ -234,7 +234,11 @@ MROP_NAME(cfbFillRectTile32) (pDrawable, pGC, nBox, pBox) CfbBits *pbits;/* pointer to start of pixmap */ PixmapPtr tile; /* rotated, expanded tile */ +#if MROP == 0 && PSZ == 24 + DeclareMergeRop() +#else MROP_DECLARE_REG() +#endif MROP_PREBUILT_DECLARE() #if PSZ == 24 CfbBits xtmp; @@ -244,7 +248,11 @@ MROP_NAME(cfbFillRectTile32) (pDrawable, pGC, nBox, pBox) tileHeight = tile->drawable.height; psrc = (CfbBits *)tile->devPrivate.ptr; +#if MROP == 0 && PSZ == 24 + InitializeMergeRop(pGC->alu, pGC->planemask); +#else MROP_INITIALIZE(pGC->alu, pGC->planemask); +#endif cfbGetLongWidthAndPointer (pDrawable, nlwDst, pbits) @@ -346,7 +354,11 @@ MROP_NAME(cfbTile32FS)(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) PixmapPtr tile; CfbBits *psrc; /* pointer to bits in tile */ int tileHeight;/* height of the tile */ - MROP_DECLARE_REG () +#if MROP == 0 && PSZ == 24 + DeclareMergeRop() +#else + MROP_DECLARE_REG() +#endif MROP_PREBUILT_DECLARE() #if PSZ == 24 CfbBits xtmp; @@ -371,7 +383,11 @@ MROP_NAME(cfbTile32FS)(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) tileHeight = tile->drawable.height; psrc = (CfbBits *)tile->devPrivate.ptr; +#if MROP == 0 && PSZ == 24 + InitializeMergeRop(pGC->alu, pGC->planemask); +#else MROP_INITIALIZE(pGC->alu, pGC->planemask); +#endif cfbGetLongWidthAndPointer (pDrawable, nlwDst, pbits) |