diff options
| -rw-r--r-- | exa/exa_glyphs.c | 5 | ||||
| -rw-r--r-- | exa/exa_render.c | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index b23e7f688..2acc891f3 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -491,7 +491,6 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, } } - buffer->source = cache->picture; @@ -502,7 +501,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, rect->yDst = yGlyph - pGlyph->info.y; rect->width = pGlyph->info.width; rect->height = pGlyph->info.height; - + buffer->count++; return ExaGlyphSuccess; @@ -597,7 +596,7 @@ exaGlyphsToDst(CARD8 op, for (i = 0; i < buffer->count; i++) { ExaCompositeRectPtr rect = &buffer->rects[i]; - + CompositePicture (op, pSrc, buffer->source, diff --git a/exa/exa_render.c b/exa/exa_render.c index f9c6b40ee..c2c1df05d 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -371,7 +371,7 @@ exaTryDriverCompositeRects(CARD8 op, } exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y); - + pixmaps[0].as_dst = TRUE; pixmaps[0].as_src = exaOpReadsDestination(op); pixmaps[0].pPix = pDstPix; @@ -406,24 +406,24 @@ exaTryDriverCompositeRects(CARD8 op, INT16 yDst = rects->yDst + pDst->pDrawable->y; INT16 xSrc = rects->xSrc + pSrc->pDrawable->x; INT16 ySrc = rects->ySrc + pSrc->pDrawable->y; - + RegionRec region; BoxPtr pbox; int nbox; - + if (!miComputeCompositeRegion (®ion, pSrc, NULL, pDst, xSrc, ySrc, 0, 0, xDst, yDst, rects->width, rects->height)) goto next_rect; - + REGION_TRANSLATE(pScreen, ®ion, dst_off_x, dst_off_y); - + nbox = REGION_NUM_RECTS(®ion); pbox = REGION_RECTS(®ion); xSrc = xSrc + src_off_x - xDst - dst_off_x; ySrc = ySrc + src_off_y - yDst - dst_off_y; - + while (nbox--) { (*pExaScr->info->Composite) (pDstPix, @@ -442,10 +442,10 @@ exaTryDriverCompositeRects(CARD8 op, rects++; } - + (*pExaScr->info->DoneComposite) (pDstPix); exaMarkSync(pDst->pDrawable->pScreen); - + return 1; } |