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

sna: gc->pCompositeClip always exists after validate 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-11-02 22:02:51 +00:00
parent 6fd0754e9c
commit 73b2ef5a7d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_accel.c
View File

@ -111,7 +111,7 @@ static inline void region_set(RegionRec *r, const BoxRec *b)
static inline void region_maybe_clip(RegionRec *r, RegionRec *clip)
{
if (clip && clip->data)
if (clip->data)
RegionIntersect(r, r, clip);
}
@ -1079,9 +1079,6 @@ static inline bool clip_box(BoxPtr box, GCPtr gc)
const BoxRec *clip;
bool clipped;
if (!gc->pCompositeClip)
return false;
clip = &gc->pCompositeClip->extents;
clipped = gc->pCompositeClip->data != NULL;
@ -2202,8 +2199,7 @@ sna_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
region.extents.x2 = region.extents.x1 + width;
region.extents.y2 = region.extents.y1 + height;
region.data = NULL;
if (gc->pCompositeClip)
RegionIntersect(&region, &region, gc->pCompositeClip);
RegionIntersect(&region, &region, gc->pCompositeClip);
if (!RegionNotEmpty(&region))
return NULL;