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

test

This commit is contained in:
Chris Wilson 2013-11-04 22:14:05 +00:00
parent a0d1de962a
commit 93193aaf7d
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sna/sna_glyphs.c
View File

@ -519,21 +519,8 @@ static void apply_damage_clipped_to_dst(struct sna_composite_op *op,
static inline bool clipped_glyphs(PicturePtr dst, int nlist, GlyphListPtr list, GlyphPtr *glyphs)
{
PixmapPtr pixmap;
BoxRec box;
if (dst->pCompositeClip->data) {
DBG(("%s: yes, has complex region\n", __FUNCTION__));
return true;
}
pixmap = get_drawable_pixmap(dst->pDrawable);
if (dst->pCompositeClip->extents.x2 - dst->pCompositeClip->extents.x1 >= pixmap->drawable.width &&
dst->pCompositeClip->extents.y2 - dst->pCompositeClip->extents.y1 >= pixmap->drawable.height) {
DBG(("%s: no, region matches drawable\n", __FUNCTION__));
return false;
}
glyph_extents(nlist, list, glyphs, &box);
DBG(("%s? glyph extents (%d, %d), (%d, %d), region (%d, %d), (%d, %d): %s\n",
__FUNCTION__, box.x1, box.y1, box.x2, box.y2,
@ -542,10 +529,9 @@ static inline bool clipped_glyphs(PicturePtr dst, int nlist, GlyphListPtr list,
box.y1 < dst->pCompositeClip->extents.y1 ||
box.x2 > dst->pCompositeClip->extents.x2 ||
box.y2 > dst->pCompositeClip->extents.y2) ? "yes" : "no"));
return (box.x1 < dst->pCompositeClip->extents.x1 ||
box.y1 < dst->pCompositeClip->extents.y1 ||
box.x2 > dst->pCompositeClip->extents.x2 ||
box.y2 > dst->pCompositeClip->extents.y2);
return pixman_region_contains_rectangle(dst->pCompositeClip,
&box) != PIXMAN_REGION_IN;
}
flatten static bool