diff options
Diffstat (limited to 'hw/xfree86/xf8_32bpp')
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfb8_32.h | 14 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbbstore.c | 6 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbcpyarea.c | 24 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbgcunder.c | 9 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbimage.c | 4 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbscrinit.c | 20 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbwindow.c | 8 |
7 files changed, 50 insertions, 35 deletions
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index 733051ae0..30bc1a0fa 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ #ifndef _CFB8_32_H #define _CFB8_32_H @@ -57,8 +57,7 @@ cfbDoBitblt8To32( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long planemask, - unsigned long bitPlane + unsigned long planemask ); void @@ -68,8 +67,7 @@ cfbDoBitblt32To8( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long planemask, - unsigned long bitPlane + unsigned long planemask ); @@ -177,8 +175,7 @@ cfbDoBitblt8To8GXcopy( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ); void @@ -188,8 +185,7 @@ cfbDoBitblt24To24GXcopy( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ); Bool cfb8_32CreateWindow(WindowPtr pWin); diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 919fabf5f..581efb4f6 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ #define PSZ 8 #include "cfb.h" @@ -49,7 +49,7 @@ cfb8_32SaveAreas( pScrPix = (PixmapPtr) pScreen->devPrivate; cfbDoBitblt32To8((DrawablePtr) pScrPix, (DrawablePtr)pPixmap, - GXcopy, prgnSave, pPtsInit, ~0L, 0); + GXcopy, prgnSave, pPtsInit, ~0L); DEALLOCATE_LOCAL (pPtsInit); } @@ -95,7 +95,7 @@ cfb8_32RestoreAreas( GXcopy, prgnRestore, pPtsInit, ~0); } else { cfbDoBitblt8To32((DrawablePtr)pPixmap, (DrawablePtr) pScrPix, - GXcopy, prgnRestore, pPtsInit, ~0L, 0); + GXcopy, prgnRestore, pPtsInit, ~0L); } DEALLOCATE_LOCAL (pPtsInit); diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 752e56db8..53af8f7d8 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" #include "Xmd.h" @@ -67,8 +67,7 @@ cfbDoBitblt8To32( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ){ BoxPtr pbox = REGION_RECTS(prgnDst); int nbox = REGION_NUM_RECTS(prgnDst); @@ -184,8 +183,7 @@ cfbDoBitblt32To8( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ){ BoxPtr pbox = REGION_RECTS(prgnDst); int nbox = REGION_NUM_RECTS(prgnDst); @@ -394,7 +392,15 @@ cfb8_32DoBitBlt( DrawablePtr pDst, RegionPtr prgnDst, DDXPointPtr pptSrc, - void (*DoBlt)() + void (*DoBlt)( + unsigned char *SrcPtr, + int SrcPitch, + unsigned char *DstPtr, + int DstPitch, + int nbox, + DDXPointPtr pptSrc, + BoxPtr pbox, + int xdir, int ydir) ){ int nbox, careful, SrcPitch, DstPitch; BoxPtr pbox, pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2; @@ -519,8 +525,7 @@ cfbDoBitblt8To8GXcopy( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ){ cfb8_32DoBitBlt(pSrc, pDst, prgnDst, pptSrc, Do8To8Blt); } @@ -533,8 +538,7 @@ cfbDoBitblt24To24GXcopy( int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, - unsigned long pm, - unsigned long bitPlane + unsigned long pm ){ cfb8_32DoBitBlt(pSrc, pDst, prgnDst, pptSrc, Do24To24Blt); } diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index d263b8b9e..d01b2b5cb 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,6 +66,7 @@ SOFTWARE. #include "cfbmskbits.h" #include "cfb8bit.h" +#include "cfb8_32.h" #ifdef WriteBitGroup # define useTEGlyphBlt cfbImageGlyphBlt8 @@ -217,9 +218,9 @@ static GCOps cfbNonTEOps = { }; static GCOps * -cfb32MatchCommon_Underlay (pGC, devPriv) - GCPtr pGC; - cfbPrivGCPtr devPriv; +cfb32MatchCommon_Underlay( + GCPtr pGC, + cfbPrivGCPtr devPriv) { if (pGC->lineWidth != 0) return 0; diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 1e8550851..e737e025e 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" #include "windowstr.h" @@ -63,7 +63,7 @@ cfb8_32GetImage ( box.y2 = h; REGION_INIT(pScreen, &rgnDst, &box, 1); cfbDoBitblt32To8(pDraw, (DrawablePtr)pPixmap, GXcopy, &rgnDst, - &ptSrc, planemask, 0); + &ptSrc, planemask); REGION_UNINIT(pScreen, &rgnDst); FreeScratchPixmapHeader(pPixmap); } diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index ce2b8ae8f..7f123d36a 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" @@ -76,6 +76,20 @@ cfb8_32AllocatePrivates(ScreenPtr pScreen) return TRUE; } +static void DestroyColormapNoop( + ColormapPtr pColormap) +{ + /* NOOP */ +} + +static void StoreColorsNoop( + ColormapPtr pColormap, + int ndef, + xColorItem * pdef) +{ + /* NOOP */ +} + static Bool cfb8_32SetupScreen( ScreenPtr pScreen, @@ -108,11 +122,11 @@ cfb8_32SetupScreen( pScreen->UnrealizeFont = mfbUnrealizeFont; pScreen->CreateGC = cfb8_32CreateGC; pScreen->CreateColormap = miInitializeColormap; - pScreen->DestroyColormap = (void (*)())NoopDDA; + pScreen->DestroyColormap = DestroyColormapNoop; pScreen->InstallColormap = miInstallColormap; pScreen->UninstallColormap = miUninstallColormap; pScreen->ListInstalledColormaps = miListInstalledColormaps; - pScreen->StoreColors = (void (*)())NoopDDA; + pScreen->StoreColors = StoreColorsNoop; pScreen->ResolveColor = miResolveColor; pScreen->BitmapToRegion = mfbPixmapToRegion; diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 518166f41..c18b54399 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.7 2003/02/17 16:08:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */ #include "X.h" @@ -67,7 +67,7 @@ cfb8_32CopyWindow(pWin, ptOldOrg, prgnSrc) if(doUnderlay) freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip); - REGION_INIT(pScreen, &rgnDst, NullBox, 0); + REGION_NULL(pScreen, &rgnDst); dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; @@ -92,10 +92,10 @@ cfb8_32CopyWindow(pWin, ptOldOrg, prgnSrc) if(doUnderlay) cfbDoBitblt24To24GXcopy((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot, - GXcopy, &rgnDst, pptSrc, ~0, 0); + GXcopy, &rgnDst, pptSrc, ~0); else cfbDoBitblt8To8GXcopy((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot, - GXcopy, &rgnDst, pptSrc, ~0, 0); + GXcopy, &rgnDst, pptSrc, ~0); DEALLOCATE_LOCAL(pptSrc); REGION_UNINIT(pScreen, &rgnDst); |