diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 9b9c7ccc..f88222f5 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -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(®ion, ®ion, gc->pCompositeClip); + RegionIntersect(®ion, ®ion, gc->pCompositeClip); if (!RegionNotEmpty(®ion)) return NULL;