Move the scanline buffer allocation logic into pixman_composite_rect_general.

Pass the src, mask, and dest buffers into pixman_composite_rect_general_* as
void* pointers since those functions should not do pointer arithmetic.

Signed-off-by: Soren Sandmann Pedersen <sandmann@redhat.com>

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 09225c7..de2378a 100644 (file)
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -144,10 +144,9 @@ static
 #endif
 void
 PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
-                              uint32_t *scanline_buffer)
+                              void *src_buffer, void *mask_buffer, 
+                              void *dest_buffer)
 {
-    uint32_t *src_buffer = scanline_buffer;
-    uint32_t *dest_buffer = src_buffer + data->width;
     int i;
     scanStoreProc store;
     scanFetchProc fetchSrc = NULL, fetchMask = NULL, fetchDest = NULL;
@@ -282,7 +281,6 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
        data->mask->common.component_alpha &&
        PIXMAN_FORMAT_RGB (data->mask->bits.format))
     {
-       uint32_t *mask_buffer = dest_buffer + data->width;
        CombineFuncC32 compose = pixman_composeFunctions.combineC[data->op];
        if (!compose)
            return;
@@ -346,14 +344,12 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
     }
     else
     {
-       uint32_t *src_mask_buffer = 0, *mask_buffer = 0;
+       void *src_mask_buffer = 0;
+       const int useMask = (fetchMask != NULL);
        CombineFuncU32 compose = pixman_composeFunctions.combineU[data->op];
        if (!compose)
            return;
 
-       if (fetchMask)
-           mask_buffer = dest_buffer + data->width;
-
        for (i = 0; i < data->height; ++i) {
            /* fill first half of scanline with source */
            if (fetchSrc)
@@ -374,7 +370,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
                    fetchSrc (data->src, data->xSrc, data->ySrc + i,
                              data->width, src_buffer, 0, 0);
 
-                   if (mask_buffer)
+                   if (useMask)
                    {
                        pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
                        src_mask_buffer = mask_buffer;
@@ -387,10 +383,10 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
                else
                {
                    fetchSrc (data->src, data->xSrc, data->ySrc + i,
-                             data->width, src_buffer, mask_buffer,
-                             0xff000000);
+                             data->width, src_buffer,
+                             useMask ? mask_buffer : NULL, 0xff000000);
 
-                   if (mask_buffer)
+                   if (useMask)
                        pixman_composeFunctions.combineMaskU (src_buffer,
                                                              mask_buffer,
                                                              data->width);
@@ -435,10 +431,27 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data,
 
 #ifndef PIXMAN_FB_ACCESSORS
 
+#define SCANLINE_BUFFER_LENGTH 2048
+
 void
-pixman_composite_rect_general (const FbComposeData *data,
-                              uint32_t *scanline_buffer)
+pixman_composite_rect_general (const FbComposeData *data)
 {
+    uint32_t _scanline_buffer[SCANLINE_BUFFER_LENGTH * 3];
+    uint32_t *scanline_buffer = _scanline_buffer;
+    uint32_t *src_buffer, *mask_buffer, *dest_buffer;
+
+    if (data->width > SCANLINE_BUFFER_LENGTH)
+    {
+       scanline_buffer = (uint32_t *)pixman_malloc_abc (data->width, 3, sizeof (uint32_t));
+
+       if (!scanline_buffer)
+           return;
+    }
+
+    src_buffer = scanline_buffer;
+    mask_buffer = src_buffer + data->width;
+    dest_buffer = mask_buffer + data->width;
+
     if (data->src->common.read_func                    ||
        data->src->common.write_func                    ||
        (data->mask && data->mask->common.read_func)    ||
@@ -446,12 +459,17 @@ pixman_composite_rect_general (const FbComposeData *data,
        data->dest->common.read_func                    ||
        data->dest->common.write_func)
     {
-       pixman_composite_rect_general_accessors (data, scanline_buffer);
+       pixman_composite_rect_general_accessors (data, src_buffer, mask_buffer,
+                                                dest_buffer);
     }
     else
     {
-       pixman_composite_rect_general_no_accessors (data, scanline_buffer);
+       pixman_composite_rect_general_no_accessors (data, src_buffer,
+                                                   mask_buffer, dest_buffer);
     }
+
+    if (scanline_buffer != _scanline_buffer)
+       free (scanline_buffer);
 }
 
 #endif

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 833d65a..1479670 100644 (file)
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1261,8 +1261,6 @@ pixman_walk_composite_region (pixman_op_t op,
     pixman_region_fini (&reg);
 }
 
-#define SCANLINE_BUFFER_LENGTH 2048
-
 static void
 pixman_image_composite_rect  (pixman_op_t                   op,
                              pixman_image_t               *src,
@@ -1278,20 +1276,10 @@ pixman_image_composite_rect  (pixman_op_t                   op,
                              uint16_t                      height)
 {
     FbComposeData compose_data;
-    uint32_t _scanline_buffer[SCANLINE_BUFFER_LENGTH * 3];
-    uint32_t *scanline_buffer = _scanline_buffer;
 
     return_if_fail (src != NULL);
     return_if_fail (dest != NULL);
 
-    if (width > SCANLINE_BUFFER_LENGTH)
-    {
-       scanline_buffer = (uint32_t *)pixman_malloc_abc (width, 3, sizeof (uint32_t));
-
-       if (!scanline_buffer)
-           return;
-    }
-
     compose_data.op = op;
     compose_data.src = src;
     compose_data.mask = mask;
@@ -1305,10 +1293,7 @@ pixman_image_composite_rect  (pixman_op_t                   op,
     compose_data.width = width;
     compose_data.height = height;
 
-    pixman_composite_rect_general (&compose_data, scanline_buffer);
-
-    if (scanline_buffer != _scanline_buffer)
-       free (scanline_buffer);
+    pixman_composite_rect_general (&compose_data);
 }
 
 /* These "formats" both have depth 0, so they

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 869bc80..96f6c21 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -188,9 +188,10 @@ extern FbComposeFunctions32 pixman_composeFunctions;
 extern FbComposeFunctions64 pixman_composeFunctions64;
 
 void pixman_composite_rect_general_accessors (const FbComposeData *data,
-                                             uint32_t *scanline_buffer);
-void pixman_composite_rect_general (const FbComposeData *data,
-                                   uint32_t *scanline_buffer);
+                                              void *src_buffer,
+                                              void *mask_buffer,
+                                              void *dest_buffer);
+void pixman_composite_rect_general (const FbComposeData *data);
 
 fetchProc pixman_fetchProcForPicture (bits_image_t *);
 fetchPixelProc pixman_fetchPixelProcForPicture (bits_image_t *);