s/pixman_compositeOperand/FbCompositeOperand/g.

This commit is contained in:
Jeff Muizelaar 2005-06-23 19:39:12 +00:00
parent 373e7f68b1
commit e77d9776ae
3 changed files with 345 additions and 286 deletions

View file

@ -1,3 +1,62 @@
2005-06-23 Jeff Muizelaar <jeff@infidigm.net>
* src/iccompose.c: (IcCombineMaskU), (IcCombineMaskC),
(IcCombineMaskValueC), (IcCombineMaskAlphaU),
(IcCombineMaskAlphaC), (IcCombineClear), (IcCombineSrcU),
(IcCombineSrcC), (IcCombineDst), (IcCombineOverU),
(IcCombineOverC), (IcCombineOverReverseU), (IcCombineOverReverseC),
(IcCombineInU), (IcCombineInC), (IcCombineInReverseU),
(IcCombineInReverseC), (IcCombineOutU), (IcCombineOutC),
(IcCombineOutReverseU), (IcCombineOutReverseC), (IcCombineAtopU),
(IcCombineAtopC), (IcCombineAtopReverseU), (IcCombineAtopReverseC),
(IcCombineXorU), (IcCombineXorC), (IcCombineAddU), (IcCombineAddC),
(IcCombineDisjointGeneralU), (IcCombineDisjointGeneralC),
(IcCombineDisjointOverU), (IcCombineDisjointOverC),
(IcCombineDisjointOverReverseU), (IcCombineDisjointOverReverseC),
(IcCombineDisjointInU), (IcCombineDisjointInC),
(IcCombineDisjointInReverseU), (IcCombineDisjointInReverseC),
(IcCombineDisjointOutU), (IcCombineDisjointOutC),
(IcCombineDisjointOutReverseU), (IcCombineDisjointOutReverseC),
(IcCombineDisjointAtopU), (IcCombineDisjointAtopC),
(IcCombineDisjointAtopReverseU), (IcCombineDisjointAtopReverseC),
(IcCombineDisjointXorU), (IcCombineDisjointXorC),
(IcCombineConjointGeneralU), (IcCombineConjointGeneralC),
(IcCombineConjointOverU), (IcCombineConjointOverC),
(IcCombineConjointOverReverseU), (IcCombineConjointOverReverseC),
(IcCombineConjointInU), (IcCombineConjointInC),
(IcCombineConjointInReverseU), (IcCombineConjointInReverseC),
(IcCombineConjointOutU), (IcCombineConjointOutC),
(IcCombineConjointOutReverseU), (IcCombineConjointOutReverseC),
(IcCombineConjointAtopU), (IcCombineConjointAtopC),
(IcCombineConjointAtopReverseU), (IcCombineConjointAtopReverseC),
(IcCombineConjointXorU), (IcCombineConjointXorC),
(IcFetch_a8r8g8b8), (IcFetch_x8r8g8b8), (IcFetch_a8b8g8r8),
(IcFetch_x8b8g8r8), (IcFetch_r8g8b8), (IcFetch_b8g8r8),
(IcFetch_r5g6b5), (IcFetch_b5g6r5), (IcFetch_a1r5g5b5),
(IcFetch_x1r5g5b5), (IcFetch_a1b5g5r5), (IcFetch_x1b5g5r5),
(IcFetch_a4r4g4b4), (IcFetch_x4r4g4b4), (IcFetch_a4b4g4r4),
(IcFetch_x4b4g4r4), (IcFetch_a8), (IcFetcha_a8), (IcFetch_r3g3b2),
(IcFetch_b2g3r3), (IcFetch_a2r2g2b2), (IcFetch_a4), (IcFetcha_a4),
(IcFetch_r1g2b1), (IcFetch_b1g2r1), (IcFetch_a1r1g1b1),
(IcFetch_a1b1g1r1), (IcFetcha_a1), (IcFetch_a1),
(IcStore_a8r8g8b8), (IcStore_x8r8g8b8), (IcStore_a8b8g8r8),
(IcStore_x8b8g8r8), (IcStore_r8g8b8), (IcStore_b8g8r8),
(IcStore_r5g6b5), (IcStore_b5g6r5), (IcStore_a1r5g5b5),
(IcStore_x1r5g5b5), (IcStore_a1b5g5r5), (IcStore_x1b5g5r5),
(IcStore_a4r4g4b4), (IcStore_x4r4g4b4), (IcStore_a4b4g4r4),
(IcStore_x4b4g4r4), (IcStore_a8), (IcStore_r3g3b2),
(IcStore_b2g3r3), (IcStore_a2r2g2b2), (IcStore_a4),
(IcStore_r1g2b1), (IcStore_b1g2r1), (IcStore_a1r1g1b1),
(IcStore_a1b1g1r1), (IcStore_a1), (IcFetch_external),
(IcFetcha_external), (IcStore_external), (IcFetch_transform),
(IcFetcha_transform), (IcStepOver), (IcStepDown), (IcSet),
(IcStepOver_external), (IcStepDown_external), (IcSet_external),
(IcStepOver_transform), (IcStepDown_transform), (IcSet_transform),
(IcBuildCompositeOperand), (pixman_compositeGeneral):
* src/icimage.h:
s/pixman_compositeOperand/FbCompositeOperand/g.
2005-06-23 Jeff Muizelaar <jeff@infidigm.net>
* src/ic.c: (pixman_compositeSrcAdd_1000x1000),

File diff suppressed because it is too large Load diff

View file

@ -245,15 +245,15 @@ typedef void (*CompositeFunc) (pixman_operator_t op,
uint16_t width,
uint16_t height);
typedef struct _pixman_compositeOperand pixman_compositeOperand;
typedef struct _FbCompositeOperand FbCompositeOperand;
typedef uint32_t (*pixman_compositeFetch)(pixman_compositeOperand *op);
typedef void (*pixman_compositeStore) (pixman_compositeOperand *op, uint32_t value);
typedef uint32_t (*pixman_compositeFetch)(FbCompositeOperand *op);
typedef void (*pixman_compositeStore) (FbCompositeOperand *op, uint32_t value);
typedef void (*pixman_compositeStep) (pixman_compositeOperand *op);
typedef void (*pixman_compositeSet) (pixman_compositeOperand *op, int x, int y);
typedef void (*pixman_compositeStep) (FbCompositeOperand *op);
typedef void (*pixman_compositeSet) (FbCompositeOperand *op, int x, int y);
struct _pixman_compositeOperand {
struct _FbCompositeOperand {
union {
struct {
pixman_bits_t *top_line;
@ -295,9 +295,9 @@ struct _pixman_compositeOperand {
pixman_region16_t *src_clip;
};
typedef void (*IcCombineFunc) (pixman_compositeOperand *src,
pixman_compositeOperand *msk,
pixman_compositeOperand *dst);
typedef void (*IcCombineFunc) (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst);
typedef struct _IcAccessMap {
uint32_t format_code;
@ -315,7 +315,7 @@ typedef struct _IcCompSrc {
pixman_private int
IcBuildCompositeOperand (pixman_image_t *image,
pixman_compositeOperand op[4],
FbCompositeOperand op[4],
int16_t x,
int16_t y,
int transform,