Convert CamelCase names to underscore_names.

s/sizeRI/size_ri/g;
s/numRI/num_ri/g;
s/RepeatNone/REPEAT_NONE/g;
s/fbOver/over/g;
s/fbIn/in/g;
s/iSrc/src_image/g;
s/iMask/mask_image/g;
s/iDst/dest_image/g;
s/SaDa/Sa.Da/g;
s/FbMaskBits/MASK_BITS/g;
s/RenderSamplesX/RENDER_SAMPLES_X/g;
s/MMXData/mmx_data_t/g;
s/RegionInfo/region_info_t/g;

s/([^0x])([a-z])([A-Z])/$1$2_\l$3/g;
s/([^0x])([A-Z])([A-Z])([a-z])/$1$2_\l$3$4/g;
s/([^0x])([A-Z])([a-z]+)_([a-z])/$1\l$2$3_$4/g;
s/([a-z])_([A-Z])/$1_\l$2/g;

s/su_sE/SuSE/g;
s/X_Free86/XFree86/g;
s/X_free86/XFree86/g;

s/_ULL/ULL/g;
s/_uLL/ULL/g;

s/U_nc/UNc/g;
s/combine ##/combine_ ##/g;
s/## U/## _u/g;
s/## C/## _c/g;
s/UNc_aDD/UNc_ADD/g;

s/BLEND_MODE \((.+)\)/BLEND_MODE (\l$1)/g;
s/blend_(.+)/blend_\l$1/g;

s/AN_ds/ANDs/g;
s/O_rs/ORs/g;
s/over565/over_565/g;
s/8pix/8_pix/g;
s/Over565/over_565/g;
s/inU/in_u/g;
s/inPart/in_part/g;
s/inC/in_c/g;
s/inreverse/in_reverse/g;
s/get_exception_code/GetExceptionCode/g; # GetExceptionCode is WinCE API
s/CP_us/CPUs/g;
s/authentic_aMD/AuthenticAMD/g;
s/op_sR_cx_mAS_kx_dST/op_src_mask_dest/g;
s/no_VERBOSE/noVERBOSE/g;
s/mc_cormack/McCormack/g;
s/r1band/r1_band/g;
s/r2band/r2_band/g;
s/as GOOD things/as good things/g;
s/brokendata/broken_data/g;
s/X_render/XRender/g;
s/__open_bSD__/__OpenBSD__/g;
s/^Quick/quick/g;
s/NextRect/next_rect/g;
s/RectIn/rect_in/g;
s/pboxout/pbox_out/g;
s/F_sorted/FSorted/g;
s/usse2/u_sse2/g;
s/csse2/c_sse2/g;
s/cPixelsse2/c_pixel_sse2/g;
s/Mask565/mask_565/g;
s/565fix_rB/565_fix_rb/g;
s/565fix_g/565_fix_g/g;
s/565r/565_r/g;
s/565g/565_g/g;
s/565b/565_b/g;
s/uPixelsse2/u_pixel_sse2/g;
s/Mask00ff/mask_00ff/g;
s/Mask0080/mask_0080/g;
s/Mask0101/mask_0101/g;
s/Maskffff/mask_ffff/g;
s/Maskff000000/mask_ff000000/g;
s/load128Aligned/load_128_aligned/g;
s/load128Unaligned/load_128_unaligned/g;
s/save128Aligned/save_128_aligned/g;
s/save128Unaligned/save_128_unaligned/g;
s/fillsse2/fill_sse2/g;
s/unpack565/unpack_565/g;
s/pack565/pack_565/g;
s/bltsse2/blt_sse2/g;
s/x565Unpack/x565_unpack/g;
s/r1End/r1_end/g;
s/r2End/r2_end/g;
s/argb8Pixels/argb8_pixels/g;
This commit is contained in:
Søren Sandmann Pedersen 2009-07-05 01:35:14 -04:00
parent 437ab04987
commit a98b71eff4
24 changed files with 3463 additions and 3463 deletions

View File

@ -2638,22 +2638,22 @@ store_scanline_g1 (bits_image_t *image,
static void
store_scanline_generic_64 (bits_image_t *image, int x, int y, int width, const uint32_t *values)
{
uint32_t *argb8Pixels;
uint32_t *argb8_pixels;
assert(image->common.type == BITS);
argb8Pixels = pixman_malloc_ab (width, sizeof(uint32_t));
if (!argb8Pixels)
argb8_pixels = pixman_malloc_ab (width, sizeof(uint32_t));
if (!argb8_pixels)
return;
/* Contract the scanline. We could do this in place if values weren't
* const.
*/
pixman_contract(argb8Pixels, (uint64_t *)values, width);
pixman_contract(argb8_pixels, (uint64_t *)values, width);
image->store_scanline_raw_32 (image, x, y, width, argb8Pixels);
image->store_scanline_raw_32 (image, x, y, width, argb8_pixels);
free(argb8Pixels);
free(argb8_pixels);
}
/* Despite the type, this function expects both buffer and mask to be uint64_t */

File diff suppressed because it is too large Load Diff

View File

@ -30,7 +30,7 @@
#include "pixman-private.h"
static void
arm_CompositeAdd_8000_8000 (
arm_composite_add_8000_8000 (
pixman_implementation_t * impl,
pixman_op_t op,
pixman_image_t * src_image,
@ -45,21 +45,21 @@ arm_CompositeAdd_8000_8000 (
int32_t width,
int32_t height)
{
uint8_t *dstLine, *dst;
uint8_t *srcLine, *src;
int dstStride, srcStride;
uint8_t *dst_line, *dst;
uint8_t *src_line, *src;
int dst_stride, src_stride;
uint16_t w;
uint8_t s, d;
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
/* ensure both src and dst are properly aligned before doing 32 bit reads
@ -115,23 +115,23 @@ arm_composite_over_8888_8888 (
int32_t width,
int32_t height)
{
uint32_t *dstLine, *dst;
uint32_t *srcLine, *src;
int dstStride, srcStride;
uint32_t *dst_line, *dst;
uint32_t *src_line, *src;
int dst_stride, src_stride;
uint16_t w;
uint32_t component_half = 0x800080;
uint32_t upper_component_mask = 0xff00ff00;
uint32_t alpha_mask = 0xff;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
//#define inner_branch
@ -208,26 +208,26 @@ arm_composite_over_8888_n_8888 (
int32_t width,
int32_t height)
{
uint32_t *dstLine, *dst;
uint32_t *srcLine, *src;
uint32_t *dst_line, *dst;
uint32_t *src_line, *src;
uint32_t mask;
int dstStride, srcStride;
int dst_stride, src_stride;
uint16_t w;
uint32_t component_half = 0x800080;
uint32_t alpha_mask = 0xff;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
mask = (mask) >> 24;
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
//#define inner_branch
@ -302,7 +302,7 @@ arm_composite_over_8888_n_8888 (
}
static void
arm_CompositeOver_n_8_8888 (
arm_composite_over_n_8_8888 (
pixman_implementation_t * impl,
pixman_op_t op,
pixman_image_t * src_image,
@ -318,9 +318,9 @@ arm_CompositeOver_n_8_8888 (
int32_t height)
{
uint32_t src, srca;
uint32_t *dstLine, *dst;
uint8_t *maskLine, *mask;
int dstStride, maskStride;
uint32_t *dst_line, *dst;
uint8_t *mask_line, *mask;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -336,15 +336,15 @@ arm_CompositeOver_n_8_8888 (
uint32_t src_hi = (src >> 8) & component_mask;
uint32_t src_lo = src & component_mask;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
//#define inner_branch
@ -426,12 +426,12 @@ static const pixman_fast_path_t arm_simd_fast_path_array[] =
{ PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, arm_composite_over_8888_n_8888, NEED_SOLID_MASK },
{ PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, arm_composite_over_8888_n_8888, NEED_SOLID_MASK },
{ PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, arm_CompositeAdd_8000_8000, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, arm_composite_add_8000_8000, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, arm_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, arm_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, arm_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, arm_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, arm_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, arm_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, arm_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, arm_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_NONE },
};

View File

@ -490,7 +490,7 @@ bits_image_fetch_filtered (bits_image_t *pict, uint32_t *buffer, int n_pixels)
static void
bits_image_fetch_transformed (pixman_image_t * pict, int x, int y,
int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
uint32_t *bits;
int32_t stride;
@ -585,7 +585,7 @@ bits_image_fetch_transformed (pixman_image_t * pict, int x, int y,
static void
bits_image_fetch_solid_32 (pixman_image_t * image, int x, int y,
int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
uint32_t color[2];
uint32_t *end;
@ -696,7 +696,7 @@ bits_image_fetch_untransformed_repeat_normal (bits_image_t *image, pixman_bool_t
static void
bits_image_fetch_untransformed_32 (pixman_image_t * image, int x, int y,
int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
if (image->common.repeat == PIXMAN_REPEAT_NONE)
{

File diff suppressed because it is too large Load Diff

View File

@ -31,7 +31,7 @@
static void
conical_gradient_get_scanline_32 (pixman_image_t *image, int x, int y,
int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
source_image_t *source = (source_image_t *)image;
gradient_t *gradient = (gradient_t *)source;
@ -74,7 +74,7 @@ conical_gradient_get_scanline_32 (pixman_image_t *image, int x, int y,
while (buffer < end) {
double angle;
if (!mask || *mask++ & maskBits)
if (!mask || *mask++ & mask_bits)
{
pixman_fixed_48_16_t t;
@ -93,7 +93,7 @@ conical_gradient_get_scanline_32 (pixman_image_t *image, int x, int y,
double x, y;
double angle;
if (!mask || *mask++ & maskBits)
if (!mask || *mask++ & mask_bits)
{
pixman_fixed_48_16_t t;

View File

@ -20,7 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef rasterizeSpan
#ifndef rasterize_span
#endif
static void
@ -50,7 +50,7 @@ RASTERIZE_EDGES (pixman_image_t *image,
#if N_BITS == 1
/* For the non-antialiased case, round the coordinates up, in effect
* sampling the center of the pixel. (The AA case does a similar
* adjustment in RenderSamplesX) */
* adjustment in RENDER_SAMPLES_X) */
lx += X_FRAC_FIRST(1);
rx += X_FRAC_FIRST(1);
#endif
@ -94,7 +94,7 @@ RASTERIZE_EDGES (pixman_image_t *image,
(((32 - (x)) & 0x1f) ? \
SCREEN_SHIFT_LEFT (0xffffffff, (32 - (x)) & 0x1f) : 0)
#define FbMaskBits(x,w,l,n,r) { \
#define MASK_BITS(x,w,l,n,r) { \
n = (w); \
r = RIGHT_MASK ((x) + n); \
l = LEFT_MASK (x); \
@ -119,7 +119,7 @@ RASTERIZE_EDGES (pixman_image_t *image,
a += x >> 5;
x &= 0x1f;
FbMaskBits (x, width, startmask, nmiddle, endmask);
MASK_BITS (x, width, startmask, nmiddle, endmask);
if (startmask) {
WRITE(image, a, READ(image, a) | startmask);
@ -137,8 +137,8 @@ RASTERIZE_EDGES (pixman_image_t *image,
int rxs;
/* Sample coverage for edge pixels */
lxs = RenderSamplesX (lx, N_BITS);
rxs = RenderSamplesX (rx, N_BITS);
lxs = RENDER_SAMPLES_X (lx, N_BITS);
rxs = RENDER_SAMPLES_X (rx, N_BITS);
/* Add coverage across row */
if (lxi == rxi)
@ -183,4 +183,4 @@ RASTERIZE_EDGES (pixman_image_t *image,
}
}
#undef rasterizeSpan
#undef rasterize_span

View File

@ -190,8 +190,8 @@ rasterize_edges_8 (pixman_image_t *image,
rxi = pixman_fixed_to_int (rx);
/* Sample coverage for edge pixels */
lxs = RenderSamplesX (lx, 8);
rxs = RenderSamplesX (rx, 8);
lxs = RENDER_SAMPLES_X (lx, 8);
rxs = RENDER_SAMPLES_X (rx, 8);
/* Add coverage across row */
if (lxi == rxi)

View File

@ -75,7 +75,7 @@ store_24 (uint8_t *a, uint32_t v)
}
static force_inline uint32_t
fbOver (uint32_t src, uint32_t dest)
over (uint32_t src, uint32_t dest)
{
uint32_t a = ~src >> 24;
@ -85,7 +85,7 @@ fbOver (uint32_t src, uint32_t dest)
}
static uint32_t
fbIn (uint32_t x, uint8_t y)
in (uint32_t x, uint8_t y)
{
uint16_t a = y;
@ -97,10 +97,10 @@ fbIn (uint32_t x, uint8_t y)
/*
* Naming convention:
*
* opSRCxMASKxDST
* op_src_mask_dest
*/
static void
fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp,
fast_composite_over_x888_8_8888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -114,26 +114,26 @@ fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint32_t *src, *srcLine;
uint32_t *dst, *dstLine;
uint8_t *mask, *maskLine;
int srcStride, maskStride, dstStride;
uint32_t *src, *src_line;
uint32_t *dst, *dst_line;
uint8_t *mask, *mask_line;
int src_stride, mask_stride, dst_stride;
uint8_t m;
uint32_t s, d;
uint16_t w;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
while (height--)
{
src = srcLine;
srcLine += srcStride;
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
src = src_line;
src_line += src_stride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -147,8 +147,8 @@ fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp,
*dst = s;
else
{
d = fbIn (s, m);
*dst = fbOver (d, *dst);
d = in (s, m);
*dst = over (d, *dst);
}
}
src++;
@ -158,11 +158,11 @@ fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp,
}
static void
fast_CompositeIn_n_8_8 (pixman_implementation_t *imp,
fast_composite_in_n_8_8 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t *iSrc,
pixman_image_t *iMask,
pixman_image_t *iDst,
pixman_image_t *src_image,
pixman_image_t *mask_image,
pixman_image_t *dest_image,
int32_t src_x,
int32_t src_y,
int32_t mask_x,
@ -173,26 +173,26 @@ fast_CompositeIn_n_8_8 (pixman_implementation_t *imp,
int32_t height)
{
uint32_t src, srca;
uint8_t *dstLine, *dst;
uint8_t *maskLine, *mask, m;
int dstStride, maskStride;
uint8_t *dst_line, *dst;
uint8_t *mask_line, *mask, m;
int dst_stride, mask_stride;
uint16_t w;
uint16_t t;
src = _pixman_image_get_solid(iSrc, iDst->bits.format);
src = _pixman_image_get_solid(src_image, dest_image->bits.format);
srca = src >> 24;
PIXMAN_IMAGE_GET_LINE (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (iMask, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dest_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
if (srca == 0xff) {
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -214,10 +214,10 @@ fast_CompositeIn_n_8_8 (pixman_implementation_t *imp,
{
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -240,11 +240,11 @@ fast_CompositeIn_n_8_8 (pixman_implementation_t *imp,
static void
fast_CompositeIn_8_8 (pixman_implementation_t *imp,
fast_composite_in_8_8 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t *iSrc,
pixman_image_t *iMask,
pixman_image_t *iDst,
pixman_image_t *src_image,
pixman_image_t *mask_image,
pixman_image_t *dest_image,
int32_t src_x,
int32_t src_y,
int32_t mask_x,
@ -254,22 +254,22 @@ fast_CompositeIn_8_8 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint8_t *dstLine, *dst;
uint8_t *srcLine, *src;
int dstStride, srcStride;
uint8_t *dst_line, *dst;
uint8_t *src_line, *src;
int dst_stride, src_stride;
uint16_t w;
uint8_t s;
uint16_t t;
PIXMAN_IMAGE_GET_LINE (iSrc, src_x, src_y, uint8_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dest_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -289,7 +289,7 @@ fast_CompositeIn_8_8 (pixman_implementation_t *imp,
}
static void
fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp,
fast_composite_over_n_8_8888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -304,9 +304,9 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp,
int32_t height)
{
uint32_t src, srca;
uint32_t *dstLine, *dst, d;
uint8_t *maskLine, *mask, m;
int dstStride, maskStride;
uint32_t *dst_line, *dst, d;
uint8_t *mask_line, *mask, m;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -315,15 +315,15 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp,
if (src == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -334,12 +334,12 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp,
if (srca == 0xff)
*dst = src;
else
*dst = fbOver (src, *dst);
*dst = over (src, *dst);
}
else if (m)
{
d = fbIn (src, m);
*dst = fbOver (d, *dst);
d = in (src, m);
*dst = over (d, *dst);
}
dst++;
}
@ -347,7 +347,7 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp,
}
static void
fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp,
fast_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -362,9 +362,9 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp,
int32_t height)
{
uint32_t src, srca;
uint32_t *dstLine, *dst, d;
uint32_t *maskLine, *mask, ma;
int dstStride, maskStride;
uint32_t *dst_line, *dst, d;
uint32_t *mask_line, *mask, ma;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -373,15 +373,15 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp,
if (src == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -392,7 +392,7 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp,
if (srca == 0xff)
*dst = src;
else
*dst = fbOver (src, *dst);
*dst = over (src, *dst);
}
else if (ma)
{
@ -412,7 +412,7 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp,
}
static void
fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp,
fast_composite_over_n_8_0888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -427,10 +427,10 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp,
int32_t height)
{
uint32_t src, srca;
uint8_t *dstLine, *dst;
uint8_t *dst_line, *dst;
uint32_t d;
uint8_t *maskLine, *mask, m;
int dstStride, maskStride;
uint8_t *mask_line, *mask, m;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -439,15 +439,15 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp,
if (src == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 3);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -460,13 +460,13 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp,
else
{
d = fetch_24(dst);
d = fbOver (src, d);
d = over (src, d);
}
store_24(dst, d);
}
else if (m)
{
d = fbOver (fbIn(src,m), fetch_24(dst));
d = over (in(src,m), fetch_24(dst));
store_24(dst, d);
}
dst += 3;
@ -475,7 +475,7 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp,
}
static void
fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp,
fast_composite_over_n_8_0565 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -490,10 +490,10 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp,
int32_t height)
{
uint32_t src, srca;
uint16_t *dstLine, *dst;
uint16_t *dst_line, *dst;
uint32_t d;
uint8_t *maskLine, *mask, m;
int dstStride, maskStride;
uint8_t *mask_line, *mask, m;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -502,15 +502,15 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp,
if (src == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -523,14 +523,14 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp,
else
{
d = *dst;
d = fbOver (src, CONVERT_0565_TO_0888(d));
d = over (src, CONVERT_0565_TO_0888(d));
}
*dst = CONVERT_8888_TO_0565(d);
}
else if (m)
{
d = *dst;
d = fbOver (fbIn(src,m), CONVERT_0565_TO_0888(d));
d = over (in(src,m), CONVERT_0565_TO_0888(d));
*dst = CONVERT_8888_TO_0565(d);
}
dst++;
@ -539,7 +539,7 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp,
}
static void
fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp,
fast_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -555,10 +555,10 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp,
{
uint32_t src, srca;
uint16_t src16;
uint16_t *dstLine, *dst;
uint16_t *dst_line, *dst;
uint32_t d;
uint32_t *maskLine, *mask, ma;
int dstStride, maskStride;
uint32_t *mask_line, *mask, ma;
int dst_stride, mask_stride;
uint16_t w;
src = _pixman_image_get_solid(src_image, dst_image->bits.format);
@ -569,15 +569,15 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp,
src16 = CONVERT_8888_TO_0565(src);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -592,7 +592,7 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp,
else
{
d = *dst;
d = fbOver (src, CONVERT_0565_TO_0888(d));
d = over (src, CONVERT_0565_TO_0888(d));
*dst = CONVERT_8888_TO_0565(d);
}
}
@ -628,21 +628,21 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint32_t *dstLine, *dst;
uint32_t *srcLine, *src, s;
int dstStride, srcStride;
uint32_t *dst_line, *dst;
uint32_t *src_line, *src, s;
int dst_stride, src_stride;
uint8_t a;
uint16_t w;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -652,14 +652,14 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp,
if (a == 0xff)
*dst = s;
else if (s)
*dst = fbOver (s, *dst);
*dst = over (s, *dst);
dst++;
}
}
}
static void
fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp,
fast_composite_src_8888_0888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -673,22 +673,22 @@ fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint8_t *dstLine, *dst;
uint8_t *dst_line, *dst;
uint32_t d;
uint32_t *srcLine, *src, s;
uint32_t *src_line, *src, s;
uint8_t a;
int dstStride, srcStride;
int dst_stride, src_stride;
uint16_t w;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 3);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -700,7 +700,7 @@ fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp,
if (a == 0xff)
d = s;
else
d = fbOver (s, fetch_24(dst));
d = over (s, fetch_24(dst));
store_24(dst, d);
}
@ -724,22 +724,22 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint16_t *dstLine, *dst;
uint16_t *dst_line, *dst;
uint32_t d;
uint32_t *srcLine, *src, s;
uint32_t *src_line, *src, s;
uint8_t a;
int dstStride, srcStride;
int dst_stride, src_stride;
uint16_t w;
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -753,7 +753,7 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp,
else
{
d = *dst;
d = fbOver (s, CONVERT_0565_TO_0888(d));
d = over (s, CONVERT_0565_TO_0888(d));
}
*dst = CONVERT_8888_TO_0565(d);
}
@ -763,7 +763,7 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp,
}
static void
fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp,
fast_composite_src_x888_0565 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -777,20 +777,20 @@ fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint16_t *dstLine, *dst;
uint32_t *srcLine, *src, s;
int dstStride, srcStride;
uint16_t *dst_line, *dst;
uint32_t *src_line, *src, s;
int dst_stride, src_stride;
uint16_t w;
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -803,7 +803,7 @@ fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp,
}
static void
fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp,
fast_composite_add_8000_8000 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -817,22 +817,22 @@ fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint8_t *dstLine, *dst;
uint8_t *srcLine, *src;
int dstStride, srcStride;
uint8_t *dst_line, *dst;
uint8_t *src_line, *src;
int dst_stride, src_stride;
uint16_t w;
uint8_t s, d;
uint16_t t;
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -854,7 +854,7 @@ fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp,
}
static void
fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp,
fast_composite_add_8888_8888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -868,21 +868,21 @@ fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint32_t *dstLine, *dst;
uint32_t *srcLine, *src;
int dstStride, srcStride;
uint32_t *dst_line, *dst;
uint32_t *src_line, *src;
int dst_stride, src_stride;
uint16_t w;
uint32_t s, d;
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
src = srcLine;
srcLine += srcStride;
dst = dst_line;
dst_line += dst_stride;
src = src_line;
src_line += src_stride;
w = width;
while (w--)
@ -904,7 +904,7 @@ fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp,
}
static void
fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp,
fast_composite_add_8888_8_8 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -918,24 +918,24 @@ fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
uint8_t *dstLine, *dst;
uint8_t *maskLine, *mask;
int dstStride, maskStride;
uint8_t *dst_line, *dst;
uint8_t *mask_line, *mask;
int dst_stride, mask_stride;
uint16_t w;
uint32_t src;
uint8_t sa;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
src = _pixman_image_get_solid (src_image, dst_image->bits.format);
sa = (src >> 24);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
mask = maskLine;
maskLine += maskStride;
dst = dst_line;
dst_line += dst_stride;
mask = mask_line;
mask_line += mask_stride;
w = width;
while (w--)
@ -961,7 +961,7 @@ fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp,
*/
static void
fast_CompositeSolidFill (pixman_implementation_t *imp,
fast_composite_solid_fill (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -993,7 +993,7 @@ fast_CompositeSolidFill (pixman_implementation_t *imp,
}
static void
fast_CompositeSrc_8888_x888 (pixman_implementation_t *imp,
fast_composite_src_8888_x888 (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
@ -1009,72 +1009,72 @@ fast_CompositeSrc_8888_x888 (pixman_implementation_t *imp,
{
uint32_t *dst;
uint32_t *src;
int dstStride, srcStride;
int dst_stride, src_stride;
uint32_t n_bytes = width * sizeof (uint32_t);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, src, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1);
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst, 1);
while (height--)
{
memcpy (dst, src, n_bytes);
dst += dstStride;
src += srcStride;
dst += dst_stride;
src += src_stride;
}
}
static const pixman_fast_path_t c_fast_paths[] =
{
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fast_CompositeOver_n_8_0565, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fast_CompositeOver_n_8_0565, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r8g8b8, fast_CompositeOver_n_8_0888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b8g8r8, fast_CompositeOver_n_8_0888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fast_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fast_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fast_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fast_CompositeOver_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, fast_CompositeOver_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_x8r8g8b8, fast_CompositeOver_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_r5g6b5, fast_CompositeOver_n_8888_0565_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, fast_CompositeOver_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_x8b8g8r8, fast_CompositeOver_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_b5g6r5, fast_CompositeOver_n_8888_0565_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fast_CompositeOver_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fast_CompositeOver_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_x8b8g8r8, fast_CompositeOver_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_a8b8g8r8, fast_CompositeOver_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fast_composite_over_n_8_0565, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fast_composite_over_n_8_0565, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r8g8b8, fast_composite_over_n_8_0888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b8g8r8, fast_composite_over_n_8_0888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fast_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fast_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fast_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fast_composite_over_n_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_x8r8g8b8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8r8g8b8, PIXMAN_r5g6b5, fast_composite_over_n_8888_0565_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_x8b8g8r8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8b8g8r8, PIXMAN_b5g6r5, fast_composite_over_n_8888_0565_ca, NEED_COMPONENT_ALPHA },
{ PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fast_composite_over_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fast_composite_over_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_x8b8g8r8, fast_composite_over_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_a8b8g8r8, fast_composite_over_x888_8_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fast_composite_over_8888_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fast_composite_over_8888_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fast_composite_over_8888_0565, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fast_composite_over_8888_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fast_composite_over_8888_8888, 0 },
{ PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fast_composite_over_8888_0565, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fast_CompositeAdd_8888_8888, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fast_CompositeAdd_8888_8888, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fast_CompositeAdd_8000_8000, 0 },
{ PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fast_CompositeAdd_8888_8_8, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8r8g8b8, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_x8r8g8b8, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8b8g8r8, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_x8b8g8r8, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, fast_CompositeSolidFill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fast_CompositeSrc_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fast_CompositeSrc_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fast_CompositeSrc_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fast_CompositeSrc_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fast_CompositeSrc_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fast_CompositeSrc_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fast_CompositeSrc_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fast_CompositeSrc_x888_0565, 0 },
{ PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fast_CompositeIn_8_8, 0 },
{ PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fast_CompositeIn_n_8_8, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fast_composite_add_8888_8888, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fast_composite_add_8888_8888, 0 },
{ PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fast_composite_add_8000_8000, 0 },
{ PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fast_composite_add_8888_8_8, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8r8g8b8, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_x8r8g8b8, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8b8g8r8, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_x8b8g8r8, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_a8, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, fast_composite_solid_fill, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fast_composite_src_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fast_composite_src_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fast_composite_src_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fast_composite_src_8888_x888, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fast_composite_src_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fast_composite_src_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fast_composite_src_x888_0565, 0 },
{ PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fast_composite_src_x888_0565, 0 },
{ PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fast_composite_in_8_8, 0 },
{ PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fast_composite_in_n_8_8, 0 },
{ PIXMAN_OP_NONE },
};
static void
fast_CompositeSrcScaleNearest (pixman_implementation_t *imp,
fast_composite_src_scale_nearest (pixman_implementation_t *imp,
pixman_op_t op,
pixman_image_t *src_image,
pixman_image_t *mask_image,
@ -1090,14 +1090,14 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp,
{
uint32_t *dst;
uint32_t *src;
int dstStride, srcStride;
int dst_stride, src_stride;
int i, j;
pixman_vector_t v;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst, 1);
/* pass in 0 instead of src_x and src_y because src_x and src_y need to be
* transformed from destination space to source space */
PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, uint32_t, srcStride, src, 1);
PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, uint32_t, src_stride, src, 1);
/* reference point is the center of the pixel */
v.vector[0] = pixman_int_to_fixed(src_x) + pixman_fixed_1 / 2;
@ -1153,7 +1153,7 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp,
if (inside_bounds) {
//XXX: we should move this multiplication out of the loop
result = *(src + y * srcStride + x);
result = *(src + y * src_stride + x);
} else {
result = 0;
}
@ -1166,7 +1166,7 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp,
/* adjust the y location by a unit vector in the y direction
* this is equivalent to transforming y+1 of the destination point to source space */
v.vector[1] += src_image->common.transform->matrix[1][1];
dst += dstStride;
dst += dst_stride;
}
}
@ -1209,7 +1209,7 @@ fast_path_composite (pixman_implementation_t *imp,
mask_x, mask_y,
dest_x, dest_y,
width, height,
fast_CompositeSrcScaleNearest);
fast_composite_src_scale_nearest);
return;
}
}

View File

@ -55,20 +55,20 @@ general_composite_rect (pixman_implementation_t *imp,
int32_t height)
{
uint8_t stack_scanline_buffer[SCANLINE_BUFFER_LENGTH * 3];
const pixman_format_code_t srcFormat = src->type == BITS ? src->bits.format : 0;
const pixman_format_code_t maskFormat = mask && mask->type == BITS ? mask->bits.format : 0;
const pixman_format_code_t destFormat = dest->type == BITS ? dest->bits.format : 0;
const int srcWide = PIXMAN_FORMAT_IS_WIDE(srcFormat);
const int maskWide = mask && PIXMAN_FORMAT_IS_WIDE(maskFormat);
const int destWide = PIXMAN_FORMAT_IS_WIDE(destFormat);
const int wide = srcWide || maskWide || destWide;
const pixman_format_code_t src_format = src->type == BITS ? src->bits.format : 0;
const pixman_format_code_t mask_format = mask && mask->type == BITS ? mask->bits.format : 0;
const pixman_format_code_t dest_format = dest->type == BITS ? dest->bits.format : 0;
const int src_wide = PIXMAN_FORMAT_IS_WIDE(src_format);
const int mask_wide = mask && PIXMAN_FORMAT_IS_WIDE(mask_format);
const int dest_wide = PIXMAN_FORMAT_IS_WIDE(dest_format);
const int wide = src_wide || mask_wide || dest_wide;
const int Bpp = wide ? 8 : 4;
uint8_t *scanline_buffer = stack_scanline_buffer;
uint8_t *src_buffer, *mask_buffer, *dest_buffer;
fetch_scanline_t fetchSrc = NULL, fetchMask = NULL, fetchDest = NULL;
fetch_scanline_t fetch_src = NULL, fetch_mask = NULL, fetch_dest = NULL;
pixman_combine_32_func_t compose;
store_scanline_t store;
source_pict_class_t srcClass, maskClass;
source_pict_class_t src_class, mask_class;
pixman_bool_t component_alpha;
uint32_t *bits;
int32_t stride;
@ -86,38 +86,38 @@ general_composite_rect (pixman_implementation_t *imp,
mask_buffer = src_buffer + width * Bpp;
dest_buffer = mask_buffer + width * Bpp;
srcClass = _pixman_image_classify (src,
src_class = _pixman_image_classify (src,
src_x, src_y,
width, height);
maskClass = SOURCE_IMAGE_CLASS_UNKNOWN;
mask_class = SOURCE_IMAGE_CLASS_UNKNOWN;
if (mask)
{
maskClass = _pixman_image_classify (mask,
mask_class = _pixman_image_classify (mask,
src_x, src_y,
width, height);
}
if (op == PIXMAN_OP_CLEAR)
fetchSrc = NULL;
fetch_src = NULL;
else if (wide)
fetchSrc = _pixman_image_get_scanline_64;
fetch_src = _pixman_image_get_scanline_64;
else
fetchSrc = _pixman_image_get_scanline_32;
fetch_src = _pixman_image_get_scanline_32;
if (!mask || op == PIXMAN_OP_CLEAR)
fetchMask = NULL;
fetch_mask = NULL;
else if (wide)
fetchMask = _pixman_image_get_scanline_64;
fetch_mask = _pixman_image_get_scanline_64;
else
fetchMask = _pixman_image_get_scanline_32;
fetch_mask = _pixman_image_get_scanline_32;
if (op == PIXMAN_OP_CLEAR || op == PIXMAN_OP_SRC)
fetchDest = NULL;
fetch_dest = NULL;
else if (wide)
fetchDest = _pixman_image_get_scanline_64;
fetch_dest = _pixman_image_get_scanline_64;
else
fetchDest = _pixman_image_get_scanline_32;
fetch_dest = _pixman_image_get_scanline_32;
if (wide)
store = _pixman_image_store_scanline_64;
@ -150,8 +150,8 @@ general_composite_rect (pixman_implementation_t *imp,
}
component_alpha =
fetchSrc &&
fetchMask &&
fetch_src &&
fetch_mask &&
mask &&
mask->common.type == BITS &&
mask->common.component_alpha &&
@ -175,49 +175,49 @@ general_composite_rect (pixman_implementation_t *imp,
if (!compose)
return;
if (!fetchMask)
if (!fetch_mask)
mask_buffer = NULL;
for (i = 0; i < height; ++i)
{
/* fill first half of scanline with source */
if (fetchSrc)
if (fetch_src)
{
if (fetchMask)
if (fetch_mask)
{
/* fetch mask before source so that fetching of
source can be optimized */
fetchMask (mask, mask_x, mask_y + i,
fetch_mask (mask, mask_x, mask_y + i,
width, (void *)mask_buffer, 0, 0);
if (maskClass == SOURCE_IMAGE_CLASS_HORIZONTAL)
fetchMask = NULL;
if (mask_class == SOURCE_IMAGE_CLASS_HORIZONTAL)
fetch_mask = NULL;
}
if (srcClass == SOURCE_IMAGE_CLASS_HORIZONTAL)
if (src_class == SOURCE_IMAGE_CLASS_HORIZONTAL)
{
fetchSrc (src, src_x, src_y + i,
fetch_src (src, src_x, src_y + i,
width, (void *)src_buffer, 0, 0);
fetchSrc = NULL;
fetch_src = NULL;
}
else
{
fetchSrc (src, src_x, src_y + i,
fetch_src (src, src_x, src_y + i,
width, (void *)src_buffer, (void *)mask_buffer,
0xffffffff);
}
}
else if (fetchMask)
else if (fetch_mask)
{
fetchMask (mask, mask_x, mask_y + i,
fetch_mask (mask, mask_x, mask_y + i,
width, (void *)mask_buffer, 0, 0);
}
if (store)
{
/* fill dest into second half of scanline */
if (fetchDest)
fetchDest (dest, dest_x, dest_y + i,
if (fetch_dest)
fetch_dest (dest, dest_x, dest_y + i,
width, (void *)dest_buffer, 0, 0);
/* blend */

View File

@ -146,7 +146,7 @@ _pixman_gradient_walker_reset (pixman_gradient_walker_t *walker,
right_x += (pos - x);
break;
default: /* RepeatNone */
default: /* REPEAT_NONE */
for (n = 0; n < count; n++)
if (pos < stops[n].x)
break;

View File

@ -64,7 +64,7 @@ _pixman_init_gradient (gradient_t *gradient,
void
_pixman_image_get_scanline_generic_64 (pixman_image_t * pict, int x, int y,
int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
uint32_t *mask8 = NULL;
@ -80,7 +80,7 @@ _pixman_image_get_scanline_generic_64 (pixman_image_t * pict, int x, int y,
// Fetch the source image into the first half of buffer.
_pixman_image_get_scanline_32 (pict, x, y, width, (uint32_t*)buffer, mask8,
maskBits);
mask_bits);
// Expand from 32bpp to 64bpp in place.
pixman_expand ((uint64_t *)buffer, buffer, PIXMAN_a8r8g8b8, width);

View File

@ -89,7 +89,7 @@ linear_gradient_classify (pixman_image_t *image,
static void
linear_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
pixman_vector_t v, unit;
pixman_fixed_32_32_t l;
@ -156,7 +156,7 @@ linear_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width,
}
} else {
while (buffer < end) {
if (*mask++ & maskBits)
if (*mask++ & mask_bits)
{
*(buffer) = _pixman_gradient_walker_pixel (&walker, t);
}
@ -195,7 +195,7 @@ linear_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width,
{
while (buffer < end)
{
if (!mask || *mask++ & maskBits)
if (!mask || *mask++ & mask_bits)
{
if (v.vector[2] == 0) {
t = 0;

File diff suppressed because it is too large Load Diff

View File

@ -202,7 +202,7 @@ _pixman_image_get_scanline_generic_64 (pixman_image_t *pict,
int width,
uint32_t *buffer,
const uint32_t *mask,
uint32_t maskBits);
uint32_t mask_bits);
source_pict_class_t
_pixman_image_classify (pixman_image_t *image,
@ -320,7 +320,7 @@ _pixman_gradient_walker_pixel (pixman_gradient_walker_t *walker,
#define X_FRAC_FIRST(n) (STEP_X_SMALL(n) / 2)
#define X_FRAC_LAST(n) (X_FRAC_FIRST(n) + (N_X_FRAC(n) - 1) * STEP_X_SMALL(n))
#define RenderSamplesX(x,n) ((n) == 1 ? 0 : (pixman_fixed_frac (x) + X_FRAC_FIRST(n)) / STEP_X_SMALL(n))
#define RENDER_SAMPLES_X(x,n) ((n) == 1 ? 0 : (pixman_fixed_frac (x) + X_FRAC_FIRST(n)) / STEP_X_SMALL(n))
void
pixman_rasterize_edges_accessors (pixman_image_t *image,
@ -573,7 +573,7 @@ _pixman_walk_composite_region (pixman_implementation_t *imp,
int16_t dest_y,
uint16_t width,
uint16_t height,
pixman_composite_func_t compositeRect);
pixman_composite_func_t composite_rect);
void
pixman_expand (uint64_t *dst, const uint32_t *src, pixman_format_code_t, int width);

View File

@ -33,7 +33,7 @@
static void
radial_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
/*
* In the radial gradient problem we are given two circles (c,r) and
@ -185,7 +185,7 @@ radial_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width,
if (affine) {
while (buffer < end) {
if (!mask || *mask++ & maskBits)
if (!mask || *mask++ & mask_bits)
{
double pdx, pdy;
double B, C;
@ -222,7 +222,7 @@ radial_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, int width,
} else {
/* projective */
while (buffer < end) {
if (!mask || *mask++ & maskBits)
if (!mask || *mask++ & mask_bits)
{
double pdx, pdy;
double B, C;

File diff suppressed because it is too large Load Diff

View File

@ -57,7 +57,7 @@ pixman_region_set_static_pointers (pixman_box16_t *empty_box,
pixman_region16_data_t *empty_data,
pixman_region16_data_t *broken_data)
{
pixman_region_emptyBox = empty_box;
pixman_region_emptyData = empty_data;
pixman_brokendata = broken_data;
pixman_region_empty_box = empty_box;
pixman_region_empty_data = empty_data;
pixman_broken_data = broken_data;
}

View File

@ -26,7 +26,7 @@
static void
solid_fill_get_scanline_32 (pixman_image_t *image, int x, int y, int width, uint32_t *buffer,
const uint32_t *mask, uint32_t maskBits)
const uint32_t *mask, uint32_t mask_bits)
{
uint32_t *end = buffer + width;
register uint32_t color = ((solid_fill_t *)image)->color;

File diff suppressed because it is too large Load Diff

View File

@ -386,10 +386,10 @@ walk_region_internal (pixman_implementation_t *imp,
int16_t dest_y,
uint16_t width,
uint16_t height,
pixman_bool_t srcRepeat,
pixman_bool_t maskRepeat,
pixman_bool_t src_repeat,
pixman_bool_t mask_repeat,
pixman_region32_t *region,
pixman_composite_func_t compositeRect)
pixman_composite_func_t composite_rect)
{
int n;
const pixman_box32_t *pbox;
@ -411,13 +411,13 @@ walk_region_internal (pixman_implementation_t *imp,
x_msk = pbox->x1 - dest_x + mask_x;
x_dst = pbox->x1;
if (maskRepeat)
if (mask_repeat)
{
y_msk = MOD (y_msk, mask_image->bits.height);
if (h_this > mask_image->bits.height - y_msk)
h_this = mask_image->bits.height - y_msk;
}
if (srcRepeat)
if (src_repeat)
{
y_src = MOD (y_src, src_image->bits.height);
if (h_this > src_image->bits.height - y_src)
@ -426,19 +426,19 @@ walk_region_internal (pixman_implementation_t *imp,
while (w)
{
w_this = w;
if (maskRepeat)
if (mask_repeat)
{
x_msk = MOD (x_msk, mask_image->bits.width);
if (w_this > mask_image->bits.width - x_msk)
w_this = mask_image->bits.width - x_msk;
}
if (srcRepeat)
if (src_repeat)
{
x_src = MOD (x_src, src_image->bits.width);
if (w_this > src_image->bits.width - x_src)
w_this = src_image->bits.width - x_src;
}
(*compositeRect) (imp,
(*composite_rect) (imp,
op, src_image, mask_image, dst_image,
x_src, y_src, x_msk, y_msk, x_dst, y_dst,
w_this, h_this);
@ -470,7 +470,7 @@ _pixman_walk_composite_region (pixman_implementation_t *imp,
int16_t dest_y,
uint16_t width,
uint16_t height,
pixman_composite_func_t compositeRect)
pixman_composite_func_t composite_rect)
{
pixman_region32_t region;
@ -484,7 +484,7 @@ _pixman_walk_composite_region (pixman_implementation_t *imp,
src_x, src_y, mask_x, mask_y, dest_x, dest_y,
width, height, FALSE, FALSE,
&region,
compositeRect);
composite_rect);
}
pixman_region32_fini (&region);

View File

@ -217,7 +217,7 @@ over (vector unsigned int src, vector unsigned int srca,
vec_st ((vector unsigned int) tmp1, 0, dest );
static void
vmxCombineOverU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_over_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -250,7 +250,7 @@ vmxCombineOverU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineOverU_mask (uint32_t *dest,
vmx_combine_over_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -292,18 +292,18 @@ vmxCombineOverU_mask (uint32_t *dest,
}
static void
vmxCombineOverU(pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_over_u(pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask,
int width)
{
if (mask)
vmxCombineOverU_mask(dest, src, mask, width);
vmx_combine_over_u_mask(dest, src, mask, width);
else
vmxCombineOverU_no_mask(dest, src, width);
vmx_combine_over_u_no_mask(dest, src, width);
}
static void
vmxCombineOverReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_over_reverse_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -336,7 +336,7 @@ vmxCombineOverReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineOverReverseU_mask (uint32_t *dest,
vmx_combine_over_reverse_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -376,18 +376,18 @@ vmxCombineOverReverseU_mask (uint32_t *dest,
}
static void
vmxCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_over_reverse_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src,
const uint32_t *mask, int width)
{
if (mask)
vmxCombineOverReverseU_mask(dest, src, mask, width);
vmx_combine_over_reverse_u_mask(dest, src, mask, width);
else
vmxCombineOverReverseU_no_mask(dest, src, width);
vmx_combine_over_reverse_u_no_mask(dest, src, width);
}
static void
vmxCombineInU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_in_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -419,7 +419,7 @@ vmxCombineInU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineInU_mask (uint32_t *dest,
vmx_combine_in_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -458,18 +458,18 @@ vmxCombineInU_mask (uint32_t *dest,
}
static void
vmxCombineInU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_in_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask,
int width)
{
if (mask)
vmxCombineInU_mask(dest, src, mask, width);
vmx_combine_in_u_mask(dest, src, mask, width);
else
vmxCombineInU_no_mask(dest, src, width);
vmx_combine_in_u_no_mask(dest, src, width);
}
static void
vmxCombineInReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_in_reverse_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -500,7 +500,7 @@ vmxCombineInReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineInReverseU_mask (uint32_t *dest,
vmx_combine_in_reverse_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -540,18 +540,18 @@ vmxCombineInReverseU_mask (uint32_t *dest,
}
static void
vmxCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_in_reverse_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src,
const uint32_t *mask, int width)
{
if (mask)
vmxCombineInReverseU_mask(dest, src, mask, width);
vmx_combine_in_reverse_u_mask(dest, src, mask, width);
else
vmxCombineInReverseU_no_mask(dest, src, width);
vmx_combine_in_reverse_u_no_mask(dest, src, width);
}
static void
vmxCombineOutU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_out_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -582,7 +582,7 @@ vmxCombineOutU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineOutU_mask (uint32_t *dest,
vmx_combine_out_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -621,18 +621,18 @@ vmxCombineOutU_mask (uint32_t *dest,
}
static void
vmxCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_out_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask,
int width)
{
if (mask)
vmxCombineOutU_mask(dest, src, mask, width);
vmx_combine_out_u_mask(dest, src, mask, width);
else
vmxCombineOutU_no_mask(dest, src, width);
vmx_combine_out_u_no_mask(dest, src, width);
}
static void
vmxCombineOutReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_out_reverse_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -663,7 +663,7 @@ vmxCombineOutReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineOutReverseU_mask (uint32_t *dest,
vmx_combine_out_reverse_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -703,20 +703,20 @@ vmxCombineOutReverseU_mask (uint32_t *dest,
}
static void
vmxCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_out_reverse_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
{
if (mask)
vmxCombineOutReverseU_mask(dest, src, mask, width);
vmx_combine_out_reverse_u_mask(dest, src, mask, width);
else
vmxCombineOutReverseU_no_mask(dest, src, width);
vmx_combine_out_reverse_u_no_mask(dest, src, width);
}
static void
vmxCombineAtopU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_atop_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -751,7 +751,7 @@ vmxCombineAtopU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineAtopU_mask (uint32_t *dest,
vmx_combine_atop_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -795,20 +795,20 @@ vmxCombineAtopU_mask (uint32_t *dest,
}
static void
vmxCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_atop_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
{
if (mask)
vmxCombineAtopU_mask(dest, src, mask, width);
vmx_combine_atop_u_mask(dest, src, mask, width);
else
vmxCombineAtopU_no_mask(dest, src, width);
vmx_combine_atop_u_no_mask(dest, src, width);
}
static void
vmxCombineAtopReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_atop_reverse_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -843,7 +843,7 @@ vmxCombineAtopReverseU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineAtopReverseU_mask (uint32_t *dest,
vmx_combine_atop_reverse_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -887,20 +887,20 @@ vmxCombineAtopReverseU_mask (uint32_t *dest,
}
static void
vmxCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_atop_reverse_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
{
if (mask)
vmxCombineAtopReverseU_mask(dest, src, mask, width);
vmx_combine_atop_reverse_u_mask(dest, src, mask, width);
else
vmxCombineAtopReverseU_no_mask(dest, src, width);
vmx_combine_atop_reverse_u_no_mask(dest, src, width);
}
static void
vmxCombineXorU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_xor_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -935,7 +935,7 @@ vmxCombineXorU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineXorU_mask (uint32_t *dest,
vmx_combine_xor_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -979,20 +979,20 @@ vmxCombineXorU_mask (uint32_t *dest,
}
static void
vmxCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_xor_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
{
if (mask)
vmxCombineXorU_mask(dest, src, mask, width);
vmx_combine_xor_u_mask(dest, src, mask, width);
else
vmxCombineXorU_no_mask(dest, src, width);
vmx_combine_xor_u_no_mask(dest, src, width);
}
static void
vmxCombineAddU_no_mask (uint32_t *dest, const uint32_t *src, int width)
vmx_combine_add_u_no_mask (uint32_t *dest, const uint32_t *src, int width)
{
int i;
vector unsigned int vdest, vsrc;
@ -1022,7 +1022,7 @@ vmxCombineAddU_no_mask (uint32_t *dest, const uint32_t *src, int width)
}
static void
vmxCombineAddU_mask (uint32_t *dest,
vmx_combine_add_u_mask (uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
@ -1061,20 +1061,20 @@ vmxCombineAddU_mask (uint32_t *dest,
}
static void
vmxCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_add_u (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest,
const uint32_t *src,
const uint32_t *mask,
int width)
{
if (mask)
vmxCombineAddU_mask(dest, src, mask, width);
vmx_combine_add_u_mask(dest, src, mask, width);
else
vmxCombineAddU_no_mask(dest, src, width);
vmx_combine_add_u_no_mask(dest, src, width);
}
static void
vmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_src_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1106,7 +1106,7 @@ vmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_over_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1140,7 +1140,7 @@ vmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_over_reverse_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1175,7 +1175,7 @@ vmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_in_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1210,7 +1210,7 @@ vmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_in_reverse_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1245,7 +1245,7 @@ vmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_out_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1281,7 +1281,7 @@ vmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_out_reverse_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1318,7 +1318,7 @@ vmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_atop_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1360,7 +1360,7 @@ vmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_atop_reverse_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1402,7 +1402,7 @@ vmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_xor_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1444,7 +1444,7 @@ vmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
}
static void
vmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
vmx_combine_add_c (pixman_implementation_t *imp, pixman_op_t op,
uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
{
int i;
@ -1482,7 +1482,7 @@ vmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
#if 0
void
vmx_CompositeOver_n_8888 (pixman_operator_t op,
vmx_composite_over_n_8888 (pixman_operator_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
pixman_image_t * dst_image,
@ -1496,26 +1496,26 @@ vmx_CompositeOver_n_8888 (pixman_operator_t op,
uint16_t height)
{
uint32_t src;
uint32_t *dstLine, *dst;
int dstStride;
uint32_t *dst_line, *dst;
int dst_stride;
_pixman_image_get_solid (src_image, dst_image, src);
if (src >> 24 == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
/* XXX vmxCombineOverU (dst, src, width); */
dst = dst_line;
dst_line += dst_stride;
/* XXX vmx_combine_over_u (dst, src, width); */
}
}
void
vmx_CompositeOver_n_0565 (pixman_operator_t op,
vmx_composite_over_n_0565 (pixman_operator_t op,
pixman_image_t * src_image,
pixman_image_t * mask_image,
pixman_image_t * dst_image,
@ -1529,22 +1529,22 @@ vmx_CompositeOver_n_0565 (pixman_operator_t op,
uint16_t height)
{
uint32_t src;
uint16_t *dstLine, *dst;
uint16_t *dst_line, *dst;
uint16_t w;
int dstStride;
int dst_stride;
_pixman_image_get_solid (src_image, dst_image, src);
if (src >> 24 == 0)
return;
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1);
PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
while (height--)
{
dst = dstLine;
dstLine += dstStride;
vmxCombineOverU565(dst, src, width);
dst = dst_line;
dst_line += dst_stride;
vmx_combine_over_u565(dst, src, width);
}
}
@ -1566,29 +1566,29 @@ _pixman_implementation_create_vmx (void)
/* Set up function pointers */
/* SSE code patch for fbcompose.c */
imp->combine_32[PIXMAN_OP_OVER] = vmxCombineOverU;
imp->combine_32[PIXMAN_OP_OVER_REVERSE] = vmxCombineOverReverseU;
imp->combine_32[PIXMAN_OP_IN] = vmxCombineInU;
imp->combine_32[PIXMAN_OP_IN_REVERSE] = vmxCombineInReverseU;
imp->combine_32[PIXMAN_OP_OUT] = vmxCombineOutU;
imp->combine_32[PIXMAN_OP_OUT_REVERSE] = vmxCombineOutReverseU;
imp->combine_32[PIXMAN_OP_ATOP] = vmxCombineAtopU;
imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = vmxCombineAtopReverseU;
imp->combine_32[PIXMAN_OP_XOR] = vmxCombineXorU;
imp->combine_32[PIXMAN_OP_OVER] = vmx_combine_over_u;
imp->combine_32[PIXMAN_OP_OVER_REVERSE] = vmx_combine_over_reverse_u;
imp->combine_32[PIXMAN_OP_IN] = vmx_combine_in_u;
imp->combine_32[PIXMAN_OP_IN_REVERSE] = vmx_combine_in_reverse_u;
imp->combine_32[PIXMAN_OP_OUT] = vmx_combine_out_u;
imp->combine_32[PIXMAN_OP_OUT_REVERSE] = vmx_combine_out_reverse_u;
imp->combine_32[PIXMAN_OP_ATOP] = vmx_combine_atop_u;
imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = vmx_combine_atop_reverse_u;
imp->combine_32[PIXMAN_OP_XOR] = vmx_combine_xor_u;
imp->combine_32[PIXMAN_OP_ADD] = vmxCombineAddU;
imp->combine_32[PIXMAN_OP_ADD] = vmx_combine_add_u;
imp->combine_32_ca[PIXMAN_OP_SRC] = vmxCombineSrcC;
imp->combine_32_ca[PIXMAN_OP_OVER] = vmxCombineOverC;
imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = vmxCombineOverReverseC;
imp->combine_32_ca[PIXMAN_OP_IN] = vmxCombineInC;
imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = vmxCombineInReverseC;
imp->combine_32_ca[PIXMAN_OP_OUT] = vmxCombineOutC;
imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = vmxCombineOutReverseC;
imp->combine_32_ca[PIXMAN_OP_ATOP] = vmxCombineAtopC;
imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = vmxCombineAtopReverseC;
imp->combine_32_ca[PIXMAN_OP_XOR] = vmxCombineXorC;
imp->combine_32_ca[PIXMAN_OP_ADD] = vmxCombineAddC;
imp->combine_32_ca[PIXMAN_OP_SRC] = vmx_combine_src_c;
imp->combine_32_ca[PIXMAN_OP_OVER] = vmx_combine_over_c;
imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = vmx_combine_over_reverse_c;
imp->combine_32_ca[PIXMAN_OP_IN] = vmx_combine_in_c;
imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = vmx_combine_in_reverse_c;
imp->combine_32_ca[PIXMAN_OP_OUT] = vmx_combine_out_c;
imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = vmx_combine_out_reverse_c;
imp->combine_32_ca[PIXMAN_OP_ATOP] = vmx_combine_atop_c;
imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = vmx_combine_atop_reverse_c;
imp->combine_32_ca[PIXMAN_OP_XOR] = vmx_combine_xor_c;
imp->combine_32_ca[PIXMAN_OP_ADD] = vmx_combine_add_c;
return imp;
}

View File

@ -34,9 +34,9 @@
typedef struct
{
pixman_op_t op;
pixman_op_t opSrcDstOpaque;
pixman_op_t opSrcOpaque;
pixman_op_t opDstOpaque;
pixman_op_t op_src_dst_opaque;
pixman_op_t op_src_opaque;
pixman_op_t op_dst_opaque;
} optimized_operator_info_t;
static const optimized_operator_info_t optimized_operators[] =
@ -92,11 +92,11 @@ pixman_optimize_operator(pixman_op_t op, pixman_image_t *src_image, pixman_image
return op;
if(is_source_opaque && is_dest_opaque)
return info->opSrcDstOpaque;
return info->op_src_dst_opaque;
else if(is_source_opaque)
return info->opSrcOpaque;
return info->op_src_opaque;
else if(is_dest_opaque)
return info->opDstOpaque;
return info->op_dst_opaque;
return op;

View File

@ -398,7 +398,7 @@ typedef struct pixman_region16 pixman_region16_t;
struct pixman_region16_data {
long size;
long numRects;
long num_rects;
/* pixman_box16_t rects[size]; in memory but not explicitly declared */
};
@ -455,10 +455,10 @@ void pixman_region_translate (pixman_region16_t
int y);
pixman_bool_t pixman_region_copy (pixman_region16_t *dest,
pixman_region16_t *source);
pixman_bool_t pixman_region_intersect (pixman_region16_t *newReg,
pixman_bool_t pixman_region_intersect (pixman_region16_t *new_reg,
pixman_region16_t *reg1,
pixman_region16_t *reg2);
pixman_bool_t pixman_region_union (pixman_region16_t *newReg,
pixman_bool_t pixman_region_union (pixman_region16_t *new_reg,
pixman_region16_t *reg1,
pixman_region16_t *reg2);
pixman_bool_t pixman_region_union_rect (pixman_region16_t *dest,
@ -467,12 +467,12 @@ pixman_bool_t pixman_region_union_rect (pixman_region16_t
int y,
unsigned int width,
unsigned int height);
pixman_bool_t pixman_region_subtract (pixman_region16_t *regD,
pixman_region16_t *regM,
pixman_region16_t *regS);
pixman_bool_t pixman_region_inverse (pixman_region16_t *newReg,
pixman_bool_t pixman_region_subtract (pixman_region16_t *reg_d,
pixman_region16_t *reg_m,
pixman_region16_t *reg_s);
pixman_bool_t pixman_region_inverse (pixman_region16_t *new_reg,
pixman_region16_t *reg1,
pixman_box16_t *invRect);
pixman_box16_t *inv_rect);
pixman_bool_t pixman_region_contains_point (pixman_region16_t *region,
int x,
int y,
@ -500,7 +500,7 @@ typedef struct pixman_region32 pixman_region32_t;
struct pixman_region32_data {
long size;
long numRects;
long num_rects;
/* pixman_box32_t rects[size]; in memory but not explicitly declared */
};
@ -542,10 +542,10 @@ void pixman_region32_translate (pixman_region32_t *r
int y);
pixman_bool_t pixman_region32_copy (pixman_region32_t *dest,
pixman_region32_t *source);
pixman_bool_t pixman_region32_intersect (pixman_region32_t *newReg,
pixman_bool_t pixman_region32_intersect (pixman_region32_t *new_reg,
pixman_region32_t *reg1,
pixman_region32_t *reg2);
pixman_bool_t pixman_region32_union (pixman_region32_t *newReg,
pixman_bool_t pixman_region32_union (pixman_region32_t *new_reg,
pixman_region32_t *reg1,
pixman_region32_t *reg2);
pixman_bool_t pixman_region32_union_rect (pixman_region32_t *dest,
@ -554,12 +554,12 @@ pixman_bool_t pixman_region32_union_rect (pixman_region32_t *d
int y,
unsigned int width,
unsigned int height);
pixman_bool_t pixman_region32_subtract (pixman_region32_t *regD,
pixman_region32_t *regM,
pixman_region32_t *regS);
pixman_bool_t pixman_region32_inverse (pixman_region32_t *newReg,
pixman_bool_t pixman_region32_subtract (pixman_region32_t *reg_d,
pixman_region32_t *reg_m,
pixman_region32_t *reg_s);
pixman_bool_t pixman_region32_inverse (pixman_region32_t *new_reg,
pixman_region32_t *reg1,
pixman_box32_t *invRect);
pixman_box32_t *inv_rect);
pixman_bool_t pixman_region32_contains_point (pixman_region32_t *region,
int x,
int y,