diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-05 20:10:09 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-07 18:41:29 +0200 |
| commit | 8cfcf9973c765f11d1b45b95b8091ef7e01d7f01 (patch) | |
| tree | 9bc54d9d12cca66bb5595851e4b9fd4dcecdb8d8 /exa/exa_unaccel.c | |
| parent | e510a77ba4d65d5d6ead514cd698f1b1e3f8a2b6 (diff) | |
EXA: Migrate out pixmap in exaPrepareAccess.
Also fix exaFinishAccessGC not to use the same index for tile and stipple.
Diffstat (limited to 'exa/exa_unaccel.c')
| -rw-r--r-- | exa/exa_unaccel.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c index 8db28667f..8dadd066d 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -41,7 +41,7 @@ void exaPrepareAccessGC(GCPtr pGC) { if (pGC->stipple) - exaPrepareAccess(&pGC->stipple->drawable, EXA_PREPARE_SRC); + exaPrepareAccess(&pGC->stipple->drawable, EXA_PREPARE_MASK); if (pGC->fillStyle == FillTiled) exaPrepareAccess(&pGC->tile.pixmap->drawable, EXA_PREPARE_SRC); } @@ -53,7 +53,7 @@ void exaFinishAccessGC(GCPtr pGC) { if (pGC->fillStyle == FillTiled) - exaFinishAccess(&pGC->tile.pixmap->drawable, EXA_PREPARE_SRC); + exaFinishAccess(&pGC->tile.pixmap->drawable, EXA_PREPARE_MASK); if (pGC->stipple) exaFinishAccess(&pGC->stipple->drawable, EXA_PREPARE_SRC); } @@ -358,7 +358,6 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) void *fb; Bool need_finish = FALSE; BoxRec box; - ExaMigrationRec pixmaps[1]; ExaPixmapPriv (pPixmap); fb = pExaPixmap->sys_ptr; @@ -368,10 +367,6 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box)) { need_finish = TRUE; - pixmaps[0].as_dst = FALSE; - pixmaps[0].as_src = TRUE; - pixmaps[0].pPix = pPixmap; - exaDoMigration (pixmaps, 1, FALSE); exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); fb = pPixmap->devPrivate.ptr; } |