EXA: Don't migrate twice in exaImageGlyphBlt.
exaPrepareAccess already handles migration.
(cherry picked from commit f6d61d3d86
)
This commit is contained in:
parent
6dee3fdf18
commit
1667ed6e24
|
@ -950,10 +950,8 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
|
||||||
int dstBpp;
|
int dstBpp;
|
||||||
int dstXoff, dstYoff;
|
int dstXoff, dstYoff;
|
||||||
FbBits depthMask;
|
FbBits depthMask;
|
||||||
Bool fallback;
|
|
||||||
PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable);
|
PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable);
|
||||||
ExaPixmapPriv(pPixmap);
|
ExaPixmapPriv(pPixmap);
|
||||||
ExaMigrationRec pixmaps[1];
|
|
||||||
RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
|
RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
|
||||||
BoxRec extents = *REGION_EXTENTS(pScreen, pending_damage);
|
BoxRec extents = *REGION_EXTENTS(pScreen, pending_damage);
|
||||||
int xoff, yoff;
|
int xoff, yoff;
|
||||||
|
@ -962,16 +960,8 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
depthMask = FbFullMask(pDrawable->depth);
|
depthMask = FbFullMask(pDrawable->depth);
|
||||||
fallback = (pGC->planemask & depthMask) != depthMask;
|
|
||||||
|
|
||||||
pixmaps[0].as_dst = TRUE;
|
if ((pGC->planemask & depthMask) != depthMask)
|
||||||
pixmaps[0].as_src = FALSE;
|
|
||||||
pixmaps[0].pPix = pPixmap;
|
|
||||||
pixmaps[0].pReg = fallback ? NULL : pending_damage;
|
|
||||||
|
|
||||||
exaDoMigration(pixmaps, 1, FALSE);
|
|
||||||
|
|
||||||
if (fallback)
|
|
||||||
{
|
{
|
||||||
ExaCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
|
ExaCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
|
||||||
return;
|
return;
|
||||||
|
@ -994,7 +984,7 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
|
||||||
extents.y1 -= yoff;
|
extents.y1 -= yoff;
|
||||||
extents.y2 -= yoff;
|
extents.y2 -= yoff;
|
||||||
|
|
||||||
exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST, pixmaps[0].pReg);
|
exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST, pending_damage);
|
||||||
|
|
||||||
if (TERMINALFONT (pGC->font) && !glyph)
|
if (TERMINALFONT (pGC->font) && !glyph)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user