summaryrefslogtreecommitdiff
path: root/src/sna/gen6_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-09-20 22:43:26 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-09-20 22:43:26 +0100
commitd853064e7eebc5719645c12605782f995131a6fe (patch)
tree1fc06ab74c8139f55fbc67fc89bb45b068fc77bb /src/sna/gen6_render.c
parent853beff4306d5a168e310af82d0ddf9db319fdce (diff)
sna/gen3+: Trim the target extents to the CompositeClip
When computing the active region with of a composite operation with unknown extents we try to simply use the whole Drawable. However, this needs to be clipped otherwise it may trigger assertion failure with an offscreen pixmap. References: https://bugs.freedesktop.org/show_bug.cgi?id=55164 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen6_render.c')
-rw-r--r--src/sna/gen6_render.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 8e10af34..4990062f 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2331,12 +2331,8 @@ gen6_composite_set_target(struct sna *sna,
box.y1 = y;
box.x2 = x + w;
box.y2 = y + h;
- } else {
- box.x1 = dst->pDrawable->x;
- box.y1 = dst->pDrawable->y;
- box.x2 = box.x1 + dst->pDrawable->width;
- box.y2 = box.y1 + dst->pDrawable->height;
- }
+ } else
+ sna_render_picture_extents(dst, &box);
op->dst.bo = sna_drawable_use_bo (dst->pDrawable,
PREFER_GPU | FORCE_GPU | RENDER_GPU,