summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-07-04 12:10:10 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-07-04 12:19:25 +0100
commit228a22fe8db044a18556a9fdb989323274817771 (patch)
tree3c406f6f8ea3157cc99760b141ad32623aeefd72
parent64bcb91f58fba3956f2c66fa37707b9e496da936 (diff)
downloadxorg-driver-xf86-video-intel-228a22fe8db044a18556a9fdb989323274817771.tar.gz
sna: Disable use of threaded compositor when using threaded renderer
Reported-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_trapezoids_boxes.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
index 1cfad298..2f7028fc 100644
--- a/src/sna/sna_trapezoids_boxes.c
+++ b/src/sna/sna_trapezoids_boxes.c
@@ -682,7 +682,7 @@ pixsolid_opacity(struct pixman_inplace *pi,
else
*pi->bits = mul_4x8_8(pi->color, opacity);
sna_image_composite(pi->op, pi->source, NULL, pi->image,
- 0, 0, 0, 0, pi->dx + x, pi->dy + y, w, h);
+ 0, 0, 0, 0, pi->dx + x, pi->dy + y, w, h);
}
static void
@@ -936,18 +936,18 @@ pixmask_opacity(struct pixman_inplace *pi,
uint8_t opacity)
{
if (opacity == 0xff) {
- sna_image_composite(pi->op, pi->source, NULL, pi->image,
- pi->sx + x, pi->sy + y,
- 0, 0,
- pi->dx + x, pi->dy + y,
- w, h);
+ pixman_image_composite(pi->op, pi->source, NULL, pi->image,
+ pi->sx + x, pi->sy + y,
+ 0, 0,
+ pi->dx + x, pi->dy + y,
+ w, h);
} else {
*pi->bits = opacity;
- sna_image_composite(pi->op, pi->source, pi->mask, pi->image,
- pi->sx + x, pi->sy + y,
- 0, 0,
- pi->dx + x, pi->dy + y,
- w, h);
+ pixman_image_composite(pi->op, pi->source, pi->mask, pi->image,
+ pi->sx + x, pi->sy + y,
+ 0, 0,
+ pi->dx + x, pi->dy + y,
+ w, h);
}
}