From fe571035f8889fd12892f2257b64536feced3f4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Thu, 30 Apr 2009 19:50:24 -0400 Subject: [PATCH] Make combineC function type take const args Fix type of mmx component alpha combiners Fix type of sse2 component alpha combiners Fix type of vmx component alpha combiners --- pixman/combine.inc | 64 ++++++++++++++++++++++++------------------------- pixman/pixman-mmx.c | 22 ++++++++--------- pixman/pixman-private.h | 4 ++-- pixman/pixman-sse2.c | 56 +++++++++++++++++++++---------------------- pixman/pixman-vmx.c | 22 ++++++++--------- 5 files changed, 84 insertions(+), 84 deletions(-) diff --git a/pixman/combine.inc b/pixman/combine.inc index bcf7d5d..0b02f27 100644 --- a/pixman/combine.inc +++ b/pixman/combine.inc @@ -614,13 +614,13 @@ fbCombineMaskAlphaC (const comp4_t *src, comp4_t *mask) FASTCALL static void -fbCombineClearC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineClearC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { memset(dest, 0, width*sizeof(comp4_t)); } FASTCALL static void -fbCombineSrcC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineSrcC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -635,7 +635,7 @@ fbCombineSrcC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineOverC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineOverC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -661,7 +661,7 @@ fbCombineOverC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineOverReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineOverReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -686,7 +686,7 @@ fbCombineOverReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineInC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineInC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -710,7 +710,7 @@ fbCombineInC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineInReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineInReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -736,7 +736,7 @@ fbCombineInReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineOutC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineOutC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -761,7 +761,7 @@ fbCombineOutC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineOutReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineOutReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -787,7 +787,7 @@ fbCombineOutReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineAtopC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineAtopC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -808,7 +808,7 @@ fbCombineAtopC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineAtopReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineAtopReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -830,7 +830,7 @@ fbCombineAtopReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineXorC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineXorC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -851,7 +851,7 @@ fbCombineXorC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineAddC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineAddC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -868,7 +868,7 @@ fbCombineAddC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineSaturateC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineSaturateC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { int i; @@ -915,7 +915,7 @@ fbCombineSaturateC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) } FASTCALL static void -fbCombineDisjointGeneralC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width, comp1_t combine) +fbCombineDisjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine) { int i; @@ -991,55 +991,55 @@ fbCombineDisjointGeneralC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width } FASTCALL static void -fbCombineDisjointOverC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointOverC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineAOver); } FASTCALL static void -fbCombineDisjointInC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointInC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineAIn); } FASTCALL static void -fbCombineDisjointInReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointInReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineBIn); } FASTCALL static void -fbCombineDisjointOutC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointOutC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineAOut); } FASTCALL static void -fbCombineDisjointOutReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointOutReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineBOut); } FASTCALL static void -fbCombineDisjointAtopC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointAtopC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineAAtop); } FASTCALL static void -fbCombineDisjointAtopReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointAtopReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineBAtop); } FASTCALL static void -fbCombineDisjointXorC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineDisjointXorC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineDisjointGeneralC (dest, src, mask, width, CombineXor); } FASTCALL static void -fbCombineConjointGeneralC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width, comp1_t combine) +fbCombineConjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine) { int i; @@ -1115,55 +1115,55 @@ fbCombineConjointGeneralC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width } FASTCALL static void -fbCombineConjointOverC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointOverC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineAOver); } FASTCALL static void -fbCombineConjointOverReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointOverReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineBOver); } FASTCALL static void -fbCombineConjointInC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointInC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineAIn); } FASTCALL static void -fbCombineConjointInReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointInReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineBIn); } FASTCALL static void -fbCombineConjointOutC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointOutC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineAOut); } FASTCALL static void -fbCombineConjointOutReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointOutReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineBOut); } FASTCALL static void -fbCombineConjointAtopC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointAtopC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineAAtop); } FASTCALL static void -fbCombineConjointAtopReverseC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointAtopReverseC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineBAtop); } FASTCALL static void -fbCombineConjointXorC (comp4_t *dest, comp4_t *src, comp4_t *mask, int width) +fbCombineConjointXorC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width) { fbCombineConjointGeneralC (dest, src, mask, width, CombineXor); } diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index 7d0a802..844006c 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -663,7 +663,7 @@ mmxCombineSaturateU (uint32_t *dest, const uint32_t *src, int width) static FASTCALL void -mmxCombineSrcC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineSrcC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -679,7 +679,7 @@ mmxCombineSrcC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineOverC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineOverC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -698,7 +698,7 @@ mmxCombineOverC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineOverReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineOverReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -718,7 +718,7 @@ mmxCombineOverReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width static FASTCALL void -mmxCombineInC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineInC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -737,7 +737,7 @@ mmxCombineInC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineInReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineInReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -756,7 +756,7 @@ mmxCombineInReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineOutC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineOutC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -776,7 +776,7 @@ mmxCombineOutC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineOutReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineOutReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -796,7 +796,7 @@ mmxCombineOutReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineAtopC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineAtopC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -818,7 +818,7 @@ mmxCombineAtopC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineAtopReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineAtopReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -840,7 +840,7 @@ mmxCombineAtopReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width } static FASTCALL void -mmxCombineXorC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineXorC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { @@ -863,7 +863,7 @@ mmxCombineXorC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -mmxCombineAddC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +mmxCombineAddC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { const uint32_t *end = src + width; while (src < end) { diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 4ef915d..7554035 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -154,7 +154,7 @@ typedef struct point point_t; #define FASTCALL typedef FASTCALL void (*CombineMaskU32) (uint32_t *src, const uint32_t *mask, int width); typedef FASTCALL void (*CombineFuncU32) (uint32_t *dest, const uint32_t *src, int width); -typedef FASTCALL void (*CombineFuncC32) (uint32_t *dest, uint32_t *src, uint32_t *mask, int width); +typedef FASTCALL void (*CombineFuncC32) (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width); typedef FASTCALL void (*fetchProc32)(bits_image_t *pict, int x, int y, int width, uint32_t *buffer); typedef FASTCALL uint32_t (*fetchPixelProc32)(bits_image_t *pict, int offset, int line); @@ -164,7 +164,7 @@ typedef FASTCALL void (*storeProc32)(pixman_image_t *, uint32_t *bits, typedef FASTCALL void (*CombineMaskU64) (uint64_t *src, const uint64_t *mask, int width); typedef FASTCALL void (*CombineFuncU64) (uint64_t *dest, const uint64_t *src, int width); -typedef FASTCALL void (*CombineFuncC64) (uint64_t *dest, uint64_t *src, uint64_t *mask, int width); +typedef FASTCALL void (*CombineFuncC64) (uint64_t *dest, const uint64_t *src, const uint64_t *mask, int width); typedef FASTCALL void (*fetchProc64)(bits_image_t *pict, int x, int y, int width, uint64_t *buffer); typedef FASTCALL uint64_t (*fetchPixelProc64)(bits_image_t *pict, int offset, int line); diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index 92872d0..bbc2324 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -1452,7 +1452,7 @@ coreCombineOverReverseCsse2 (uint32_t* pd, const uint32_t* ps, const uint32_t *p } static force_inline void -coreCombineInCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineInCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1523,7 +1523,7 @@ coreCombineInCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) } static force_inline void -coreCombineInReverseCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineInReverseCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1596,7 +1596,7 @@ coreCombineInReverseCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) } static force_inline void -coreCombineOutCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineOutCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1668,7 +1668,7 @@ coreCombineOutCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) } static force_inline void -coreCombineOutReverseCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineOutReverseCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1759,7 +1759,7 @@ coreCombineAtopCPixelsse2 (uint32_t src, uint32_t mask, uint32_t dst) } static force_inline void -coreCombineAtopCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineAtopCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1852,7 +1852,7 @@ coreCombineReverseAtopCPixelsse2 (uint32_t src, uint32_t mask, uint32_t dst) } static force_inline void -coreCombineReverseAtopCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineReverseAtopCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -1946,7 +1946,7 @@ coreCombineXorCPixelsse2 (uint32_t src, uint32_t mask, uint32_t dst) } static force_inline void -coreCombineXorCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineXorCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -2024,7 +2024,7 @@ coreCombineXorCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) } static force_inline void -coreCombineAddCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w) +coreCombineAddCsse2 (uint32_t *pd, const uint32_t *ps, const uint32_t *pm, int w) { uint32_t s, m, d; @@ -2207,77 +2207,77 @@ sse2CombineSaturateU (uint32_t *dst, const uint32_t *src, int width) } static FASTCALL void -sse2CombineSrcC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineSrcC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineSrcCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineOverC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineOverC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineOverCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineOverReverseC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineOverReverseC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineOverReverseCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineInC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineInC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineInCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineInReverseC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineInReverseC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineInReverseCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineOutC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineOutC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineOutCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineOutReverseC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineOutReverseC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineOutReverseCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineAtopC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineAtopC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineAtopCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineAtopReverseC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineAtopReverseC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineReverseAtopCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineXorC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineXorC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineXorCsse2 (dst, src, mask, width); _mm_empty(); } static FASTCALL void -sse2CombineAddC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width) +sse2CombineAddC (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width) { coreCombineAddCsse2 (dst, src, mask, width); _mm_empty(); @@ -2578,7 +2578,7 @@ fbCompositeSolidMask_nx8888x8888Csse2 (pixman_op_t op, while (height--) { int w = width; - uint32_t *pm = (uint32_t *)maskLine; + const uint32_t *pm = (uint32_t *)maskLine; uint32_t *pd = (uint32_t *)dstLine; dstLine += dstStride; @@ -4411,14 +4411,14 @@ fbCompositeSrcAdd_8888x8888sse2 (pixman_op_t op, pixman_bool_t pixmanBltsse2 (uint32_t *src_bits, - uint32_t *dst_bits, - int src_stride, - int dst_stride, - int src_bpp, - int dst_bpp, - int src_x, int src_y, - int dst_x, int dst_y, - int width, int height) + uint32_t *dst_bits, + int src_stride, + int dst_stride, + int src_bpp, + int dst_bpp, + int src_x, int src_y, + int dst_x, int dst_y, + int width, int height) { uint8_t * src_bytes; uint8_t * dst_bytes; diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c index 6af23c4..6d4df4e 100644 --- a/pixman/pixman-vmx.c +++ b/pixman/pixman-vmx.c @@ -567,7 +567,7 @@ vmxCombineAddU (uint32_t *dest, const uint32_t *src, int width) } static FASTCALL void -vmxCombineSrcC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineSrcC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -598,7 +598,7 @@ vmxCombineSrcC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineOverC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineOverC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -631,7 +631,7 @@ vmxCombineOverC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineOverReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineOverReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -665,7 +665,7 @@ vmxCombineOverReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width } static FASTCALL void -vmxCombineInC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineInC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -699,7 +699,7 @@ vmxCombineInC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineInReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineInReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -733,7 +733,7 @@ vmxCombineInReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineOutC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineOutC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -768,7 +768,7 @@ vmxCombineOutC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineOutReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineOutReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -804,7 +804,7 @@ vmxCombineOutReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineAtopC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineAtopC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -845,7 +845,7 @@ vmxCombineAtopC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineAtopReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineAtopReverseC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -886,7 +886,7 @@ vmxCombineAtopReverseC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width } static FASTCALL void -vmxCombineXorC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineXorC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; @@ -927,7 +927,7 @@ vmxCombineXorC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) } static FASTCALL void -vmxCombineAddC (uint32_t *dest, uint32_t *src, uint32_t *mask, int width) +vmxCombineAddC (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width) { int i; vector unsigned int vdest, vsrc, vmask; -- 2.7.4