sna: Use the threaded compositor for picture conversions

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 5135c11..89be5a5 100644 (file)
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1699,11 +1699,11 @@ do_fixup:
                dst = pixman_image_create_bits(channel->pict_format,
                                               w, h, ptr, channel->bo->pitch);
                if (dst) {
-                       pixman_image_composite(PictOpSrc, src, NULL, dst,
-                                              0, 0,
-                                              0, 0,
-                                              0, 0,
-                                              w, h);
+                       sna_image_composite(PictOpSrc, src, NULL, dst,
+                                           0, 0,
+                                           0, 0,
+                                           0, 0,
+                                           w, h);
                        pixman_image_unref(src);
                } else {
                        memset(ptr, 0, __kgem_buffer_size(channel->bo));
@@ -1891,11 +1891,11 @@ sna_render_picture_convert(struct sna *sna,
                }
 
                if (sigtrap_get() == 0) {
-                       pixman_image_composite(PictOpSrc, src, NULL, dst,
-                                              box.x1, box.y1,
-                                              0, 0,
-                                              0, 0,
-                                              w, h);
+                       sna_image_composite(PictOpSrc, src, NULL, dst,
+                                           box.x1, box.y1,
+                                           0, 0,
+                                           0, 0,
+                                           w, h);
                        sigtrap_put();
                }
                pixman_image_unref(dst);

diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
index ba31803..1cfad29 100644 (file)
--- a/src/sna/sna_trapezoids_boxes.c
+++ b/src/sna/sna_trapezoids_boxes.c
@@ -681,8 +681,8 @@ pixsolid_opacity(struct pixman_inplace *pi,
                *pi->bits = pi->color;
        else
                *pi->bits = mul_4x8_8(pi->color, opacity);
-       pixman_image_composite(pi->op, pi->source, NULL, pi->image,
-                              0, 0, 0, 0, pi->dx + x, pi->dy + y, w, h);
+       sna_image_composite(pi->op, pi->source, NULL, pi->image,
+                       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) {
-               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);
+               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);
        } else {
                *pi->bits = opacity;
-               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);
+               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);
        }
 }