andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

exa_glyphs: remove useless offset

Browse Source
This commit is contained in:
Maarten Maathuis 2008-08-26 13:18:58 +02:00
parent fd94651fc3
commit ce19347680
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
exa/exa_glyphs.c
View File

@ -364,7 +364,6 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
ExaPixmapPriv(pGlyphPixmap); ExaPixmapPriv(pGlyphPixmap);
PixmapPtr pCachePixmap = (PixmapPtr)cache->picture->pDrawable; PixmapPtr pCachePixmap = (PixmapPtr)cache->picture->pDrawable;
ExaMigrationRec pixmaps[1]; ExaMigrationRec pixmaps[1];
int cacheXoff, cacheYoff;
if (!pExaScr->info->UploadToScreen || pExaScr->swappedOut || pExaPixmap->accel_blocked) if (!pExaScr->info->UploadToScreen || pExaScr->swappedOut || pExaPixmap->accel_blocked)
return FALSE; return FALSE;
@ -385,8 +384,7 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
pixmaps[0].pReg = NULL; pixmaps[0].pReg = NULL;
exaDoMigration (pixmaps, 1, TRUE); exaDoMigration (pixmaps, 1, TRUE);
pCachePixmap = exaGetOffscreenPixmap ((DrawablePtr)pCachePixmap, &cacheXoff, &cacheYoff); if (!exaPixmapIsOffscreen(pCachePixmap))
if (!pCachePixmap)
return FALSE; return FALSE;
/* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */ /* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */
@ -399,11 +397,12 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
pExaPixmap->sys_pitch)) pExaPixmap->sys_pitch))
return FALSE; return FALSE;
/* This pixmap should never be bound to a window, so no need to offset coordinates. */
exaPixmapDirty (pCachePixmap, exaPixmapDirty (pCachePixmap,
CACHE_X(pos) + cacheXoff, CACHE_X(pos),
CACHE_Y(pos) + cacheYoff, CACHE_Y(pos),
CACHE_X(pos) + cacheXoff + pGlyph->info.width, CACHE_X(pos) + pGlyph->info.width,
CACHE_Y(pos) + cacheYoff + pGlyph->info.height); CACHE_Y(pos) + pGlyph->info.height);
return TRUE; return TRUE;
} }