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).

1 files changed, 1 insertions, 20 deletions

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 9d02ab990..ca3afc3ec 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -782,26 +782,7 @@ exaFillRegionTiled (DrawablePtr	pDrawable,
      * FillRegionSolid, saving numerous copies.
      */
     if (tileWidth == 1 && tileHeight == 1) {
-	CARD32 pixel;
-
-	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);
+	exaFillRegionSolid(pDrawable, pRegion, exaGetPixmapFirstPixel (pTile));
 	return;
     }