diff options
| -rw-r--r-- | src/sna/gen6_render.c | 3 | ||||
| -rw-r--r-- | src/sna/gen7_render.c | 3 | ||||
| -rw-r--r-- | src/sna/gen8_render.c | 3 | ||||
| -rw-r--r-- | src/sna/sna_dri2.c | 1 | ||||
| -rw-r--r-- | src/sna/sna_render.c | 4 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index ca1f9c58..0fc10210 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -2797,8 +2797,7 @@ fallback_blt: assert(src->depth == dst->depth); assert(src->width == dst->width); assert(src->height == dst->height); - return sna_render_copy_boxes__overlap(sna, alu, - src, src_bo, + return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo, src_dx, src_dy, dst_dx, dst_dy, box, n, &extents); diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index 74bac5a8..8ff91507 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -3002,8 +3002,7 @@ fallback_blt: assert(src->depth == dst->depth); assert(src->width == dst->width); assert(src->height == dst->height); - return sna_render_copy_boxes__overlap(sna, alu, - src, src_bo, + return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo, src_dx, src_dy, dst_dx, dst_dy, box, n, &extents); diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c index 3d7f3a58..0b4638a2 100644 --- a/src/sna/gen8_render.c +++ b/src/sna/gen8_render.c @@ -2854,8 +2854,7 @@ fallback_blt: assert(src->depth == dst->depth); assert(src->width == dst->width); assert(src->height == dst->height); - return sna_render_copy_boxes__overlap(sna, alu, - src, src_bo, + return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo, src_dx, src_dy, dst_dx, dst_dy, box, n, &extents); diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index e6279026..eb5a558e 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -1186,6 +1186,7 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region, } else flags &= ~DRI2_SYNC; + scratch.pScreen = draw->pScreen; scratch.x = scratch.y = 0; scratch.width = scratch.height = 0; scratch.depth = draw->depth; diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index a9945057..89267a3e 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -2169,11 +2169,11 @@ copy_overlap(struct sna *sna, uint8_t alu, ret = (sna->render.copy_boxes(sna, GXcopy, draw, bo, src_dx, src_dy, &tmp->drawable, tmp_bo, -extents->x1, -extents->y1, - box, n , 0) && + box, n, 0) && sna->render.copy_boxes(sna, alu, &tmp->drawable, tmp_bo, -extents->x1, -extents->y1, draw, bo, dst_dx, dst_dy, - box, n , 0)); + box, n, 0)); screen->DestroyPixmap(tmp); return ret; |