/*
* Combine src and mask
*/
-FASTCALL void
+FASTCALL static void
pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int width)
{
int i;
fbCombineConjointGeneralC (dest, src, mask, width, CombineXor);
}
-CombineFuncU pixman_fbCombineFuncU[] = {
+static CombineFuncU pixman_fbCombineFuncU[] = {
fbCombineClear,
fbCombineSrcU,
NULL, /* CombineDst */
fbCombineConjointXorU,
};
-CombineFuncC pixman_fbCombineFuncC[] = {
+static CombineFuncC pixman_fbCombineFuncC[] = {
fbCombineClearC,
fbCombineSrcC,
NULL, /* Dest */
fbCombineConjointAtopReverseC,
fbCombineConjointXorC,
};
+
+FbComposeFunctions pixman_composeFunctions = {
+ pixman_fbCombineFuncU,
+ pixman_fbCombineFuncC,
+ pixman_fbCombineMaskU
+};
#ifdef PIXMAN_FB_ACCESSORS
#define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_accessors
-#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions_accessors
#define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture_accessors
#define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture_accessors
#else
#define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_no_accessors
-#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions
#define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture
#define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture
fetch(pict, x, y, width, buffer);
}
-#ifdef PIXMAN_FB_ACCESSORS /* The accessor version can't be parameterized from outside */
-static const
-#endif
-FbComposeFunctions PIXMAN_COMPOSE_FUNCTIONS = {
- pixman_fbCombineFuncU,
- pixman_fbCombineFuncC,
- pixman_fbCombineMaskU
-};
-
static void
fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
{
PIXMAN_FORMAT_RGB (data->mask->bits.format))
{
uint32_t *mask_buffer = dest_buffer + data->width;
- CombineFuncC compose = PIXMAN_COMPOSE_FUNCTIONS.combineC[data->op];
+ CombineFuncC compose = pixman_composeFunctions.combineC[data->op];
if (!compose)
return;
else
{
uint32_t *src_mask_buffer = 0, *mask_buffer = 0;
- CombineFuncU compose = PIXMAN_COMPOSE_FUNCTIONS.combineU[data->op];
+ CombineFuncU compose = pixman_composeFunctions.combineU[data->op];
if (!compose)
return;
if (mask_buffer)
{
- PIXMAN_COMPOSE_FUNCTIONS.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
+ pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
src_mask_buffer = mask_buffer;
}
else
0xff000000);
if (mask_buffer)
- PIXMAN_COMPOSE_FUNCTIONS.combineMaskU (src_buffer,
- mask_buffer,
- data->width);
+ pixman_composeFunctions.combineMaskU (src_buffer,
+ mask_buffer,
+ data->width);
src_mask_buffer = src_buffer;
}
fetchMask (data->mask, data->xMask, data->yMask + i,
data->width, mask_buffer, 0, 0);
- PIXMAN_COMPOSE_FUNCTIONS.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
+ pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
src_mask_buffer = mask_buffer;
}