Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/glyphs: Apply mask reduction along fallback paths as well 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-12 19:37:02 +01:00
parent 16aaa51b5d
commit 0477b5fb6f
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/sna/sna_glyphs.c
View File

@ -108,6 +108,19 @@ static inline struct sna_glyph *sna_glyph(GlyphPtr glyph)
#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
static bool op_is_bounded(uint8_t op)
{
switch (op) {
case PictOpOver:
case PictOpOutReverse:
case PictOpAdd:
case PictOpXor:
return true;
default:
return false;
}
}
void sna_glyphs_close(struct sna *sna)
{
struct sna_render *render = &sna->render;
@ -1208,6 +1221,11 @@ glyphs_fallback(CARD8 op,
src_x += dx - list->xOff;
src_y += dy - list->yOff;
if (mask_format &&
(op_is_bounded(op) || (nlist == 1 && list->len == 1)) &&
mask_format == glyphs_format(nlist, list, glyphs))
mask_format = NULL;
if (mask_format) {
DBG(("%s: create mask (%d, %d)x(%d,%d) + (%d,%d) + (%d,%d), depth=%d, format=%lx [%lx], ca? %d\n",
__FUNCTION__,
@ -1258,8 +1276,7 @@ glyphs_fallback(CARD8 op,
if (picture == NULL)
goto next_glyph;
glyph_image = image_from_pict(picture,
FALSE,
glyph_image = image_from_pict(picture, FALSE,
&gx, &gy);
if (!glyph_image)
goto next_glyph;
@ -1360,19 +1377,6 @@ cleanup_region:
RegionUninit(&region);
}
static bool op_is_bounded(uint8_t op)
{
switch (op) {
case PictOpOver:
case PictOpOutReverse:
case PictOpAdd:
case PictOpXor:
return true;
default:
return false;
}
}
void
sna_glyphs(CARD8 op,
PicturePtr src,