diff options
| -rw-r--r-- | src/sna/sna_accel.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 68e2de6b..52c5a908 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -6880,6 +6880,14 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc, if (region.extents.y2 > src->y + (int) src->height) region.extents.y2 = src->y + (int) src->height; + DBG(("%s: clipped src extents (%d, %d), (%d, %d)\n", __FUNCTION__, + region.extents.x1, region.extents.y1, + region.extents.x2, region.extents.y2)); + if (box_empty(®ion.extents)) { + DBG(("%s: src clipped out\n", __FUNCTION__)); + return NULL; + } + /* Compute source clip region */ if (src->type == DRAWABLE_PIXMAP) { if (src == dst && gc->clientClipType == CT_NONE) { @@ -6921,10 +6929,12 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc, RegionTranslate(®ion, dx-sx, dy-sy); if (gc->pCompositeClip->data) RegionIntersect(®ion, ®ion, gc->pCompositeClip); - DBG(("%s: copy region (%d, %d), (%d, %d) x %d\n", __FUNCTION__, + DBG(("%s: copy region (%d, %d), (%d, %d) x %d + (%d, %d)\n", + __FUNCTION__, region.extents.x1, region.extents.y1, region.extents.x2, region.extents.y2, - region_num_rects(®ion))); + region_num_rects(®ion), + sx-dx, sy-dy)); if (!box_empty(®ion.extents)) copy(src, dst, gc, ®ion, sx-dx, sy-dy, bitPlane, closure); |