diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-04-01 18:24:00 +0900 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-06 13:21:27 -0400 |
| commit | 81bd4fc18c407ebe8e535ffbe83b7578261e1643 (patch) | |
| tree | 872fba2ccd8d7aae12d7194bb6b9b329ab41628a | |
| parent | e849aecb65aabe2fc6abeab6e0ab0a721710c25c (diff) | |
EXA: Honour op parameter to exaGlyphs even if maskFormat == NULL
Reported-by: Uli Schlachter <psychon@znc.in>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94775
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
(cherry picked from commit 140c2f1a54dbc2503311e9a011e841aa1f277cbd)
| -rw-r--r-- | exa/exa_glyphs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index cf21ea914..192a643cc 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -618,9 +618,9 @@ exaGlyphsToMask(PicturePtr pMask, ExaGlyphBufferPtr buffer) } static void -exaGlyphsToDst(PicturePtr pSrc, PicturePtr pDst, ExaGlyphBufferPtr buffer) +exaGlyphsToDst(CARD8 op, PicturePtr pSrc, PicturePtr pDst, ExaGlyphBufferPtr buffer) { - exaCompositeRects(PictOpOver, pSrc, buffer->mask, pDst, buffer->count, + exaCompositeRects(op, pSrc, buffer->mask, pDst, buffer->count, buffer->rects); buffer->count = 0; @@ -801,7 +801,7 @@ exaGlyphs(CARD8 op, 0, 0, x - glyph->info.x, y - glyph->info.y) == ExaGlyphNeedFlush) { - exaGlyphsToDst(pSrc, pDst, &buffer); + exaGlyphsToDst(op, pSrc, pDst, &buffer); exaBufferGlyph(pScreen, &buffer, glyph, pSrc, pDst, xSrc + (x - glyph->info.x) - first_xOff, ySrc + (y - glyph->info.y) - first_yOff, @@ -821,7 +821,7 @@ exaGlyphs(CARD8 op, if (maskFormat) exaGlyphsToMask(pMask, &buffer); else - exaGlyphsToDst(pSrc, pDst, &buffer); + exaGlyphsToDst(op, pSrc, pDst, &buffer); } if (maskFormat) { |