frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull code for getting the (0,0) pixel from a pixmap out to a separate 

function, since it gets repeated (with bad error handling, in one
    case).
This commit is contained in:
Eric Anholt 2006-03-14 20:38:06 +00:00
parent 01aa209f20
commit d309054780
5 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-03-14 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_accel.c: (exaFillRegionTiled):
* exa/exa_priv.h:
* exa/exa_render.c: (exaTryDriverSolidFill):
* exa/exa_unaccel.c: (exaGetPixmapFirstPixel):
Pull code for getting the (0,0) pixel from a pixmap out to a separate
function, since it gets repeated (with bad error handling, in one case).
2006-03-14 Kristian Høgsberg <krh@redhat.com> 2006-03-14 Kristian Høgsberg <krh@redhat.com>
* GL/glx/glxdri.c (__glXDRIscreenProbe): Bail out early if screen * GL/glx/glxdri.c (__glXDRIscreenProbe): Bail out early if screen

21
exa/exa_accel.c
View File

@ -782,26 +782,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
* FillRegionSolid, saving numerous copies. * FillRegionSolid, saving numerous copies.
*/ */
if (tileWidth == 1 && tileHeight == 1) { if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel; exaFillRegionSolid(pDrawable, pRegion, exaGetPixmapFirstPixel (pTile));
exaDrawableUseMemory(&pTile->drawable);
exaPrepareAccess(&pTile->drawable, EXA_PREPARE_SRC);
switch (pTile->drawable.bitsPerPixel) {
case 8:
pixel = *(CARD8 *)(pTile->devPrivate.ptr);
break;
case 16:
pixel = *(CARD16 *)(pTile->devPrivate.ptr);
break;
case 32:
pixel = *(CARD32 *)(pTile->devPrivate.ptr);
break;
default:
exaFinishAccess(&pTile->drawable, EXA_PREPARE_SRC);
goto fallback;
}
exaFinishAccess(&pTile->drawable, EXA_PREPARE_SRC);
exaFillRegionSolid(pDrawable, pRegion, pixel);
return; return;
} }

5
exa/exa_priv.h
View File

@ -147,7 +147,7 @@ typedef struct {
*/ */
void exaDDXDriverInit (ScreenPtr pScreen); void exaDDXDriverInit (ScreenPtr pScreen);
/* exaasync.c */ /* exa_unaccel.c */
void void
ExaCheckFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nspans, ExaCheckFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nspans,
DDXPointPtr ppt, int *pwidth, int fSorted); DDXPointPtr ppt, int *pwidth, int fSorted);
@ -246,6 +246,9 @@ ExaCheckRestoreAreas (PixmapPtr pPixmap,
void void
ExaCheckPaintWindow (WindowPtr pWin, RegionPtr pRegion, int what); ExaCheckPaintWindow (WindowPtr pWin, RegionPtr pRegion, int what);
CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap);
/* exa_accel.c */ /* exa_accel.c */
void void
exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);

19
exa/exa_render.c
View File

@ -243,7 +243,9 @@ exaTryDriverSolidFill(PicturePtr pSrc,
width, height)) width, height))
return 1; return 1;
exaDrawableUseMemory(pSrc->pDrawable); pSrcPix = exaGetDrawablePixmap (pSrc->pDrawable);
pixel = exaGetPixmapFirstPixel (pSrcPix);
exaDrawableUseScreen(pDst->pDrawable); exaDrawableUseScreen(pDst->pDrawable);
pDstPix = exaGetOffscreenPixmap (pDst->pDrawable, &dst_off_x, &dst_off_y); pDstPix = exaGetOffscreenPixmap (pDst->pDrawable, &dst_off_x, &dst_off_y);
@ -252,27 +254,12 @@ exaTryDriverSolidFill(PicturePtr pSrc,
return 0; return 0;
} }
pSrcPix = exaGetDrawablePixmap (pSrc->pDrawable);
exaPrepareAccess(&pSrcPix->drawable, EXA_PREPARE_SRC);
switch (pSrcPix->drawable.bitsPerPixel) {
case 32:
pixel = *(CARD32 *)(pSrcPix->devPrivate.ptr);
break;
case 16:
pixel = *(CARD16 *)(pSrcPix->devPrivate.ptr);
break;
default:
pixel = *(CARD8 *)(pSrcPix->devPrivate.ptr);
break;
}
if (!exaGetRGBAFromPixel(pixel, &red, &green, &blue, &alpha, if (!exaGetRGBAFromPixel(pixel, &red, &green, &blue, &alpha,
pSrc->format)) pSrc->format))
{ {
REGION_UNINIT(pDst->pDrawable->pScreen, &region); REGION_UNINIT(pDst->pDrawable->pScreen, &region);
return -1; return -1;
} }
exaFinishAccess(&pSrcPix->drawable, EXA_PREPARE_SRC);
exaGetPixelFromRGBA(&pixel, red, green, blue, alpha, exaGetPixelFromRGBA(&pixel, red, green, blue, alpha,
pDst->format); pDst->format);

28
exa/exa_unaccel.c
View File

@ -326,6 +326,34 @@ ExaCheckComposite (CARD8 op,
exaFinishAccess (pDst->pDrawable, EXA_PREPARE_DEST); exaFinishAccess (pDst->pDrawable, EXA_PREPARE_DEST);
} }
/**
* Gets the 0,0 pixel of a pixmap. Used for doing solid fills of tiled pixmaps
* that happen to be 1x1. Pixmap must be at least 8bpp.
*/
CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap)
{
CARD32 pixel;
exaDrawableUseMemory(&pPixmap->drawable);
exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC);
switch (pPixmap->drawable.bitsPerPixel) {
case 32:
pixel = *(CARD32 *)(pPixmap->devPrivate.ptr);
break;
case 16:
pixel = *(CARD16 *)(pPixmap->devPrivate.ptr);
break;
default:
pixel = *(CARD8 *)(pPixmap->devPrivate.ptr);
break;
}
exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC);
return pixel;
}
/* /*
* Only need to stall for CopyArea/CopyPlane, but we want to have the chance to * Only need to stall for CopyArea/CopyPlane, but we want to have the chance to
* do migration for CopyArea. * do migration for CopyArea.