Index: Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile,v retrieving revision 1.2 diff -u -r1.2 Imakefile --- Imakefile 23 Apr 2004 19:48:50 -0000 1.2 +++ Imakefile 31 Aug 2004 19:18:37 -0000 @@ -6,19 +6,19 @@ #define IHaveModules #include -SRCS = leo_driver.c leo_accel.c leo_bcopy.c leo_checks.c leo_frect.c \ - leo_frectsp.c leo_fspans.c leo_fspanssp.c leo_gc.c leo_glyph.c \ - leo_stubs.c leo_cursor.c -OBJS = leo_driver.o leo_accel.o leo_bcopy.o leo_checks.o leo_frect.o \ - leo_frectsp.o leo_fspans.o leo_fspanssp.o leo_gc.o leo_glyph.o \ - leo_stubs.o leo_cursor.o +SRCS = leo_driver.c leo_accel.c leo_checks.c leo_frect.c \ + leo_frectsp.c leo_fspans.c leo_fspanssp.c leo_glyph.c \ + leo_cursor.c +OBJS = leo_driver.o leo_accel.o leo_checks.o leo_frect.o \ + leo_frectsp.o leo_fspans.o leo_fspanssp.o leo_glyph.o \ + leo_cursor.o #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ - -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \ + -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ + -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) Index: leo_accel.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v retrieving revision 1.2 diff -u -r1.2 leo_accel.c --- leo_accel.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_accel.c 31 Aug 2004 19:18:37 -0000 @@ -30,15 +30,10 @@ #include "mistruct.h" #include "fontstruct.h" #include "dixfontstr.h" -#include "cfb.h" -#include "cfbmskbits.h" -#include "cfb8bit.h" +#include "fb.h" #include "mibstore.h" #include "mifillarc.h" #include "miwideline.h" -#include "fastblt.h" -#include "mergerop.h" -#include "migc.h" #include "mi.h" #include "leo.h" @@ -162,9 +157,12 @@ pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF); if (!pLeo->NoAccel) { + /* XXX fill this in with XAA goodness */ +#if 0 /* Replace various screen functions. */ pScreen->CreateGC = LeoCreateGC; pScreen->CopyWindow = LeoCopyWindow; +#endif } /* We will now clear the screen: we'll draw a rectangle covering all the Index: leo_bcopy.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_bcopy.c,v retrieving revision 1.2 diff -u -r1.2 leo_bcopy.c --- leo_bcopy.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_bcopy.c 31 Aug 2004 19:18:37 -0000 @@ -30,7 +30,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" +#include "fb.h" void LeoDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, @@ -171,8 +171,8 @@ GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty) { if (pSrcDrawable->type != DRAWABLE_WINDOW) - return cfbCopyArea (pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty); - return cfbBitBlt (pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, (void (*)())LeoDoBitblt, 0); + return fbCopyArea (pSrcDrawable, pDstDrawable, + pGC, srcx, srcy, width, height, dstx, dsty); + return fbBitBlt (pSrcDrawable, pDstDrawable, + pGC, srcx, srcy, width, height, dstx, dsty, (void (*)())LeoDoBitblt, 0); } Index: leo_checks.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c,v retrieving revision 1.2 diff -u -r1.2 leo_checks.c --- leo_checks.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_checks.c 31 Aug 2004 19:18:37 -0000 @@ -29,7 +29,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" +#include "fb.h" int LeoCheckTile (PixmapPtr pPixmap, LeoStipplePtr stipple, int ox, int oy) Index: leo_driver.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v retrieving revision 1.2 diff -u -r1.2 leo_driver.c --- leo_driver.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_driver.c 31 Aug 2004 19:18:37 -0000 @@ -31,9 +31,7 @@ #include "mibstore.h" #include "micmap.h" -#define PSZ 32 -#include "cfb.h" -#undef PSZ +#include "fb.h" #include "xf86cmap.h" #include "leo.h" @@ -414,7 +412,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); } - if (xf86LoadSubModule(pScrn, "cfb32") == NULL) { + if (xf86LoadSubModule(pScrn, "fb") == NULL) { LeoFreeRec(pScrn); return FALSE; } @@ -502,9 +500,9 @@ * pScreen fields. */ - ret = cfb32ScreenInit(pScreen, pLeo->fb, pScrn->virtualX, - pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, - 2048); + ret = fbScreenInit(pScreen, pLeo->fb, pScrn->virtualX, + pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, + 2048, pScrn->bitsPerPixel); if (!ret) return FALSE; Index: leo_frect.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v retrieving revision 1.2 diff -u -r1.2 leo_frect.c --- leo_frect.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_frect.c 31 Aug 2004 19:18:37 -0000 @@ -30,8 +30,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" -#include "cfbmskbits.h" +#include "fb.h" void LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit) @@ -50,7 +49,7 @@ if(nrectFill <= 0) return; - prgnClip = cfbGetCompositeClip(pGC); + prgnClip = fbGetCompositeClip(pGC); prect = prectInit; xorg = pDrawable->x; @@ -178,7 +177,7 @@ if(nrectFill <= 0) return; - prgnClip = cfbGetCompositeClip(pGC); + prgnClip = fbGetCompositeClip(pGC); prect = prectInit; xorg = pDrawable->x; Index: leo_frectsp.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v retrieving revision 1.2 diff -u -r1.2 leo_frectsp.c --- leo_frectsp.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_frectsp.c 31 Aug 2004 19:18:37 -0000 @@ -30,8 +30,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" -#include "cfbmskbits.h" +#include "fb.h" void LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit) @@ -53,7 +52,7 @@ if(nrectFill <= 0) return; - prgnClip = cfbGetCompositeClip(pGC); + prgnClip = fbGetCompositeClip(pGC); prect = prectInit; xorg = pDrawable->x; Index: leo_fspans.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c,v retrieving revision 1.2 diff -u -r1.2 leo_fspans.c --- leo_fspans.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_fspans.c 31 Aug 2004 19:18:37 -0000 @@ -29,7 +29,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" +#include "fb.h" #include "mi.h" #include "mispans.h" @@ -48,7 +48,7 @@ int fg; int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0; - clip = cfbGetCompositeClip(pGC); + clip = fbGetCompositeClip(pGC); numRects = REGION_NUM_RECTS(clip); if (!numRects) Index: leo_fspanssp.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c,v retrieving revision 1.2 diff -u -r1.2 leo_fspanssp.c --- leo_fspanssp.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_fspanssp.c 31 Aug 2004 19:18:37 -0000 @@ -29,7 +29,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" +#include "fb.h" #include "mi.h" #include "mispans.h" @@ -49,7 +49,7 @@ unsigned int *bits, msk; int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0; - clip = cfbGetCompositeClip(pGC); + clip = fbGetCompositeClip(pGC); numRects = REGION_NUM_RECTS(clip); if (!numRects) Index: leo_gc.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.c,v retrieving revision 1.2 diff -u -r1.2 leo_gc.c --- leo_gc.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_gc.c 31 Aug 2004 19:18:37 -0000 @@ -31,7 +31,7 @@ #include "X.h" #include "Xmd.h" #include "Xproto.h" -#include "cfb.h" +#include "fb.h" #include "fontstruct.h" #include "dixfontstr.h" #include "gcstruct.h" @@ -42,10 +42,6 @@ #include "mistruct.h" #include "mibstore.h" -#include "migc.h" - -#include "cfbmskbits.h" -#include "cfb8bit.h" void LeoValidateGC(GCPtr, unsigned long, DrawablePtr); static void LeoDestroyGC(GCPtr); @@ -61,111 +57,111 @@ }; GCOps LeoTEOps1Rect = { - cfbSolidSpansCopy, - cfbSetSpans, - cfbPutImage, + fbSolidSpansCopy, + fbSetSpans, + fbPutImage, LeoCopyArea, - cfbCopyPlane, - cfbPolyPoint, - cfb8LineSS1Rect, - cfb8SegmentSS1Rect, + fbCopyPlane, + fbPolyPoint, + fb8LineSS1Rect, + fb8SegmentSS1Rect, miPolyRectangle, - cfbZeroPolyArcSS8Copy, - cfbFillPoly1RectCopy, + fbZeroPolyArcSS8Copy, + fbFillPoly1RectCopy, LeoPolyFillRect1Rect, - cfbPolyFillArcSolidCopy, + fbPolyFillArcSolidCopy, miPolyText8, miPolyText16, miImageText8, miImageText16, LeoTEGlyphBlt, LeoPolyTEGlyphBlt, - mfbPushPixels + fbPushPixels #ifdef NEED_LINEHELPER ,NULL #endif }; GCOps LeoNonTEOps1Rect = { - cfbSolidSpansCopy, - cfbSetSpans, - cfbPutImage, + fbSolidSpansCopy, + fbSetSpans, + fbPutImage, LeoCopyArea, - cfbCopyPlane, - cfbPolyPoint, - cfb8LineSS1Rect, - cfb8SegmentSS1Rect, + fbCopyPlane, + fbPolyPoint, + fb8LineSS1Rect, + fb8SegmentSS1Rect, miPolyRectangle, - cfbZeroPolyArcSS8Copy, - cfbFillPoly1RectCopy, + fbZeroPolyArcSS8Copy, + fbFillPoly1RectCopy, LeoPolyFillRect1Rect, - cfbPolyFillArcSolidCopy, + fbPolyFillArcSolidCopy, miPolyText8, miPolyText16, miImageText8, miImageText16, - cfbImageGlyphBlt8, + fbImageGlyphBlt8, LeoPolyGlyphBlt, - mfbPushPixels + fbPushPixels #ifdef NEED_LINEHELPER ,NULL #endif }; GCOps LeoTEOps = { - cfbSolidSpansCopy, - cfbSetSpans, - cfbPutImage, + fbSolidSpansCopy, + fbSetSpans, + fbPutImage, LeoCopyArea, - cfbCopyPlane, - cfbPolyPoint, - cfbLineSS, - cfbSegmentSS, + fbCopyPlane, + fbPolyPoint, + fbLineSS, + fbSegmentSS, miPolyRectangle, - cfbZeroPolyArcSS8Copy, + fbZeroPolyArcSS8Copy, miFillPolygon, LeoPolyFillRect, - cfbPolyFillArcSolidCopy, + fbPolyFillArcSolidCopy, miPolyText8, miPolyText16, miImageText8, miImageText16, LeoTEGlyphBlt, LeoPolyTEGlyphBlt, - mfbPushPixels + fbPushPixels #ifdef NEED_LINEHELPER ,NULL #endif }; GCOps LeoNonTEOps = { - cfbSolidSpansCopy, - cfbSetSpans, - cfbPutImage, + fbSolidSpansCopy, + fbSetSpans, + fbPutImage, LeoCopyArea, - cfbCopyPlane, - cfbPolyPoint, - cfbLineSS, - cfbSegmentSS, + fbCopyPlane, + fbPolyPoint, + fbLineSS, + fbSegmentSS, miPolyRectangle, - cfbZeroPolyArcSS8Copy, + fbZeroPolyArcSS8Copy, miFillPolygon, LeoPolyFillRect, - cfbPolyFillArcSolidCopy, + fbPolyFillArcSolidCopy, miPolyText8, miPolyText16, miImageText8, miImageText16, - cfbImageGlyphBlt8, + fbImageGlyphBlt8, LeoPolyGlyphBlt, - mfbPushPixels + fbPushPixels #ifdef NEED_LINEHELPER ,NULL #endif }; GCOps * -LeoMatchCommon (GCPtr pGC, cfbPrivGCPtr devPriv) +LeoMatchCommon (GCPtr pGC, fbPrivGCPtr devPriv) { if (pGC->lineWidth != 0) return 0; @@ -199,8 +195,8 @@ LeoPrivGCPtr gcPriv; if (pGC->depth == 1) - return mfbCreateGC (pGC); - if (!cfbCreateGC (pGC)) + return fbCreateGC (pGC); + if (!fbCreateGC (pGC)) return FALSE; pGC->ops = & LeoNonTEOps; @@ -232,7 +228,7 @@ int xrot, yrot; /* flags for changing the proc vector */ LeoPrivGCPtr gcPriv; - cfbPrivGCPtr devPriv; + fbPrivGCPtr devPriv; int oneRect, type; LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen); @@ -240,15 +236,15 @@ type = pLeo->vtSema ? -1 : pDrawable->type; if (type != DRAWABLE_WINDOW) { if (gcPriv->type == DRAWABLE_WINDOW) { - extern GCOps cfbNonTEOps; + extern GCOps fbNonTEOps; miDestroyGCOps (pGC->ops); - pGC->ops = &cfbNonTEOps; + pGC->ops = &fbNonTEOps; changes = (1 << (GCLastBit+1)) - 1; pGC->stateChanges = changes; gcPriv->type = type; } - cfbValidateGC (pGC, changes, pDrawable); + fbValidateGC (pGC, changes, pDrawable); return; } @@ -262,7 +258,7 @@ pGC->lastWinOrg.x = pDrawable->x; pGC->lastWinOrg.y = pDrawable->y; - devPriv = cfbGetGCPrivate(pGC); + devPriv = fbGetGCPrivate(pGC); new_rrop = FALSE; new_line = FALSE; @@ -279,7 +275,7 @@ if ((changes & (GCClipXOrigin|GCClipYOrigin|GCClipMask|GCSubwindowMode)) || (pDrawable->serialNumber != (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) { miComputeCompositeClip (pGC, pDrawable); - oneRect = REGION_NUM_RECTS(cfbGetCompositeClip(pGC)) == 1; + oneRect = REGION_NUM_RECTS(fbGetCompositeClip(pGC)) == 1; if (oneRect != devPriv->oneRect) new_line = TRUE; devPriv->oneRect = oneRect; @@ -335,8 +331,8 @@ PixmapPtr nstipple; if ((width <= PGSZ) && !(width & (width - 1)) && - (nstipple = cfbCopyPixmap(pGC->stipple))) { - cfbPadPixmap(nstipple); + (nstipple = fbCopyPixmap(pGC->stipple))) { + fbPadPixmap(nstipple); (*pGC->pScreen->DestroyPixmap)(pGC->stipple); pGC->stipple = nstipple; } @@ -399,7 +395,7 @@ int width = pGC->tile.pixmap->drawable.width * PSZ; if ((width <= 32) && !(width & (width - 1))) { - cfbCopyRotatePixmap(pGC->tile.pixmap, + fbCopyRotatePixmap(pGC->tile.pixmap, &pGC->pRotatedPixmap, xrot, yrot); new_pix = TRUE; @@ -429,7 +425,7 @@ } old_rrop = devPriv->rop; - devPriv->rop = cfbReduceRasterOp (pGC->alu, pGC->fgPixel, + devPriv->rop = fbReduceRasterOp (pGC->alu, pGC->fgPixel, pGC->planemask, &devPriv->and, &devPriv->xor); if (old_rrop == devPriv->rop) @@ -465,7 +461,7 @@ if (devPriv->oneRect && pGC->fillStyle == FillSolid) { switch (devPriv->rop) { case GXcopy: - pGC->ops->FillPolygon = cfbFillPoly1RectCopy; + pGC->ops->FillPolygon = fbFillPoly1RectCopy; break; default: pGC->ops->FillPolygon = LeoFillPoly1RectGeneral; @@ -476,7 +472,7 @@ if ((pGC->lineStyle == LineSolid) && (pGC->fillStyle == FillSolid)) { switch (devPriv->rop) { case GXcopy: - pGC->ops->PolyArc = cfbZeroPolyArcSS8Copy; + pGC->ops->PolyArc = fbZeroPolyArcSS8Copy; break; default: pGC->ops->PolyArc = LeoZeroPolyArcSS8General; @@ -494,11 +490,11 @@ if (devPriv->oneRect && ((pDrawable->x >= pGC->pScreen->width - 32768) && (pDrawable->y >= pGC->pScreen->height - 32768))) { - pGC->ops->Polylines = cfb8LineSS1Rect; - pGC->ops->PolySegment = cfb8SegmentSS1Rect; + pGC->ops->Polylines = fb8LineSS1Rect; + pGC->ops->PolySegment = fb8SegmentSS1Rect; } else { - pGC->ops->Polylines = cfbLineSS; - pGC->ops->PolySegment = cfbSegmentSS; + pGC->ops->Polylines = fbLineSS; + pGC->ops->PolySegment = fbSegmentSS; } } else pGC->ops->Polylines = miZeroLine; @@ -508,8 +504,8 @@ case LineOnOffDash: case LineDoubleDash: if (pGC->lineWidth == 0 && pGC->fillStyle == FillSolid) { - pGC->ops->Polylines = cfbLineSD; - pGC->ops->PolySegment = cfbSegmentSD; + pGC->ops->Polylines = fbLineSD; + pGC->ops->PolySegment = fbSegmentSD; } else pGC->ops->Polylines = miWideDash; break; @@ -547,17 +543,17 @@ case FillTiled: if (pGC->pRotatedPixmap) { if (pGC->alu == GXcopy && (pGC->planemask & PMSK) == PMSK) - pGC->ops->FillSpans = cfbTile32FSCopy; + pGC->ops->FillSpans = fbTile32FSCopy; else pGC->ops->FillSpans = LeoTile32FSGeneral; } else - pGC->ops->FillSpans = cfbUnnaturalTileFS; + pGC->ops->FillSpans = fbUnnaturalTileFS; break; case FillStippled: - pGC->ops->FillSpans = cfbUnnaturalStippleFS; + pGC->ops->FillSpans = fbUnnaturalStippleFS; break; case FillOpaqueStippled: - pGC->ops->FillSpans = cfbUnnaturalStippleFS; + pGC->ops->FillSpans = fbUnnaturalStippleFS; break; default: FatalError("LeoValidateGC: illegal fillStyle\n"); @@ -576,12 +572,12 @@ } else if (gcPriv->stipple) pGC->ops->PolyFillRect = LeoPolyFillStippledRect; else if (pGC->fillStyle == FillTiled) - pGC->ops->PolyFillRect = cfbPolyFillRect; + pGC->ops->PolyFillRect = fbPolyFillRect; pGC->ops->PolyFillArc = miPolyFillArc; if (pGC->fillStyle == FillSolid) { switch (devPriv->rop) { case GXcopy: - pGC->ops->PolyFillArc = cfbPolyFillArcSolidCopy; + pGC->ops->PolyFillArc = fbPolyFillArcSolidCopy; break; default: pGC->ops->PolyFillArc = LeoPolyFillArcSolidGeneral; Index: leo_glyph.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c,v retrieving revision 1.2 diff -u -r1.2 leo_glyph.c --- leo_glyph.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_glyph.c 31 Aug 2004 19:18:37 -0000 @@ -31,7 +31,7 @@ #include "fontstruct.h" #include "dixfontstr.h" -#include "cfb.h" +#include "fb.h" #include "mi.h" void @@ -51,7 +51,7 @@ unsigned char *fb; int height, width; - clip = cfbGetCompositeClip(pGC); + clip = fbGetCompositeClip(pGC); /* compute an approximate (but covering) bounding box */ box.x1 = 0; if (ppci[0]->metrics.leftSideBearing < 0) @@ -76,7 +76,7 @@ ld0->vclipmax = ((clip->extents.y2 - 1) << 16) | (clip->extents.x2 - 1); break; } - cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase); + fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase); case rgnOUT: return; default: @@ -178,7 +178,7 @@ widthGlyph = FONTMAXBOUNDS(pfont,characterWidth); h = FONTASCENT(pfont) + FONTDESCENT(pfont); - clip = cfbGetCompositeClip(pGC); + clip = fbGetCompositeClip(pGC); bbox.x1 = x + pDrawable->x; bbox.x2 = bbox.x1 + (widthGlyph * nglyph); bbox.y1 = y + pDrawable->y - FONTASCENT(pfont); @@ -205,7 +205,7 @@ x -= pDrawable->x; y = y - pDrawable->y + FONTASCENT(pfont); if (pGlyphBase) - cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, NULL); + fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, NULL); else miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase); case rgnOUT: Index: leo_stubs.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_stubs.c,v retrieving revision 1.2 diff -u -r1.2 leo_stubs.c --- leo_stubs.c 23 Apr 2004 19:48:50 -0000 1.2 +++ leo_stubs.c 31 Aug 2004 19:18:37 -0000 @@ -30,7 +30,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "cfb.h" +#include "fb.h" void LeoFillPoly1RectGeneral(DrawablePtr pDrawable, GCPtr pGC, int shape, @@ -43,7 +43,7 @@ ld0->rop = leoRopTable[pGC->alu]; if (pGC->planemask != 0xffffff) ld0->planemask = pGC->planemask; - cfbFillPoly1RectCopy(pDrawable, pGC, shape, mode, count, ptsIn); + fbFillPoly1RectCopy(pDrawable, pGC, shape, mode, count, ptsIn); if (pGC->alu != GXcopy) ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW; if (pGC->planemask != 0xffffff) @@ -60,7 +60,7 @@ ld0->rop = leoRopTable[pGC->alu]; if (pGC->planemask != 0xffffff) ld0->planemask = pGC->planemask; - cfbZeroPolyArcSS8Copy(pDrawable, pGC, narcs, parcs); + fbZeroPolyArcSS8Copy(pDrawable, pGC, narcs, parcs); if (pGC->alu != GXcopy) ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW; if (pGC->planemask != 0xffffff) @@ -78,7 +78,7 @@ ld0->rop = leoRopTable[pGC->alu]; if (pGC->planemask != 0xffffff) ld0->planemask = pGC->planemask; - cfbTile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted); + fbTile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted); if (pGC->alu != GXcopy) ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW; if (pGC->planemask != 0xffffff) @@ -96,7 +96,7 @@ ld0->rop = leoRopTable[pGC->alu]; if (pGC->planemask != 0xffffff) ld0->planemask = pGC->planemask; - cfbPolyFillArcSolidCopy(pDrawable, pGC, narcs, parcs); + fbPolyFillArcSolidCopy(pDrawable, pGC, narcs, parcs); if (pGC->alu != GXcopy) ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW; if (pGC->planemask != 0xffffff)