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

exa: remove some excessive whitespace

This commit is contained in:
Maarten Maathuis 2008-10-03 22:59:40 +02:00
parent b72a217ad5
commit 416870d8c9
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
exa/exa_glyphs.c
View File

@ -491,7 +491,6 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen,
} }
} }
buffer->source = cache->picture; buffer->source = cache->picture;
@ -502,7 +501,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen,
rect->yDst = yGlyph - pGlyph->info.y; rect->yDst = yGlyph - pGlyph->info.y;
rect->width = pGlyph->info.width; rect->width = pGlyph->info.width;
rect->height = pGlyph->info.height; rect->height = pGlyph->info.height;
buffer->count++; buffer->count++;
return ExaGlyphSuccess; return ExaGlyphSuccess;
@ -597,7 +596,7 @@ exaGlyphsToDst(CARD8 op,
for (i = 0; i < buffer->count; i++) { for (i = 0; i < buffer->count; i++) {
ExaCompositeRectPtr rect = &buffer->rects[i]; ExaCompositeRectPtr rect = &buffer->rects[i];
CompositePicture (op, CompositePicture (op,
pSrc, pSrc,
buffer->source, buffer->source,

16
exa/exa_render.c
View File

@ -371,7 +371,7 @@ exaTryDriverCompositeRects(CARD8 op,
} }
exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y); exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y);
pixmaps[0].as_dst = TRUE; pixmaps[0].as_dst = TRUE;
pixmaps[0].as_src = exaOpReadsDestination(op); pixmaps[0].as_src = exaOpReadsDestination(op);
pixmaps[0].pPix = pDstPix; pixmaps[0].pPix = pDstPix;
@ -406,24 +406,24 @@ exaTryDriverCompositeRects(CARD8 op,
INT16 yDst = rects->yDst + pDst->pDrawable->y; INT16 yDst = rects->yDst + pDst->pDrawable->y;
INT16 xSrc = rects->xSrc + pSrc->pDrawable->x; INT16 xSrc = rects->xSrc + pSrc->pDrawable->x;
INT16 ySrc = rects->ySrc + pSrc->pDrawable->y; INT16 ySrc = rects->ySrc + pSrc->pDrawable->y;
RegionRec region; RegionRec region;
BoxPtr pbox; BoxPtr pbox;
int nbox; int nbox;
if (!miComputeCompositeRegion (&region, pSrc, NULL, pDst, if (!miComputeCompositeRegion (&region, pSrc, NULL, pDst,
xSrc, ySrc, 0, 0, xDst, yDst, xSrc, ySrc, 0, 0, xDst, yDst,
rects->width, rects->height)) rects->width, rects->height))
goto next_rect; goto next_rect;
REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y); REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
nbox = REGION_NUM_RECTS(&region); nbox = REGION_NUM_RECTS(&region);
pbox = REGION_RECTS(&region); pbox = REGION_RECTS(&region);
xSrc = xSrc + src_off_x - xDst - dst_off_x; xSrc = xSrc + src_off_x - xDst - dst_off_x;
ySrc = ySrc + src_off_y - yDst - dst_off_y; ySrc = ySrc + src_off_y - yDst - dst_off_y;
while (nbox--) while (nbox--)
{ {
(*pExaScr->info->Composite) (pDstPix, (*pExaScr->info->Composite) (pDstPix,
@ -442,10 +442,10 @@ exaTryDriverCompositeRects(CARD8 op,
rects++; rects++;
} }
(*pExaScr->info->DoneComposite) (pDstPix); (*pExaScr->info->DoneComposite) (pDstPix);
exaMarkSync(pDst->pDrawable->pScreen); exaMarkSync(pDst->pDrawable->pScreen);
return 1; return 1;
} }