aboutsummaryrefslogtreecommitdiff
path: root/pixman/pixman/pixman-mmx.c
diff options
context:
space:
mode:
Diffstat (limited to 'pixman/pixman/pixman-mmx.c')
-rw-r--r--pixman/pixman/pixman-mmx.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c
index 1e6dbe8aa..aef468ac0 100644
--- a/pixman/pixman/pixman-mmx.c
+++ b/pixman/pixman/pixman-mmx.c
@@ -62,7 +62,7 @@ _mm_empty (void)
#endif
#ifdef USE_X86_MMX
-# if (defined(__SUNPRO_C) || defined(_MSC_VER))
+# if (defined(__SUNPRO_C) || defined(_MSC_VER) || defined(_WIN64))
# include <xmmintrin.h>
# else
/* We have to compile with -msse to use xmmintrin.h, but that causes SSE
@@ -1402,7 +1402,7 @@ mmx_composite_over_n_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
store8888 (dst, over (vsrc, vsrca, load8888 (dst)));
@@ -1468,7 +1468,7 @@ mmx_composite_over_n_0565 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint64_t d = *dst;
__m64 vdest = expand565 (to_m64 (d), 0);
@@ -1546,7 +1546,7 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
uint32_t *p = (uint32_t *)mask_line;
uint32_t *q = (uint32_t *)dst_line;
- while (twidth && (unsigned long)q & 7)
+ while (twidth && (uintptr_t)q & 7)
{
uint32_t m = *(uint32_t *)p;
@@ -1637,7 +1637,7 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
__m64 s = load8888 (src);
__m64 d = load8888 (dst);
@@ -1707,7 +1707,7 @@ mmx_composite_over_x888_n_8888 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint32_t ssrc = *src | 0xff000000;
__m64 s = load8888 (&ssrc);
@@ -1881,7 +1881,7 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
__m64 vsrc = load8888 (src);
uint64_t d = *dst;
@@ -1984,7 +1984,7 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint64_t m = *mask;
@@ -2127,21 +2127,21 @@ mmx_fill (pixman_implementation_t *imp,
byte_line += stride;
w = byte_width;
- if (w >= 1 && ((unsigned long)d & 1))
+ if (w >= 1 && ((uintptr_t)d & 1))
{
*(uint8_t *)d = (xor & 0xff);
w--;
d++;
}
- if (w >= 2 && ((unsigned long)d & 3))
+ if (w >= 2 && ((uintptr_t)d & 3))
{
*(uint16_t *)d = xor;
w -= 2;
d += 2;
}
- while (w >= 4 && ((unsigned long)d & 7))
+ while (w >= 4 && ((uintptr_t)d & 7))
{
*(uint32_t *)d = xor;
@@ -2227,7 +2227,7 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
s = *src++;
*dst = CONVERT_8888_TO_0565 (s);
@@ -2305,7 +2305,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint64_t m = *mask;
@@ -2419,7 +2419,7 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint64_t m = *mask;
@@ -2536,7 +2536,7 @@ mmx_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
__m64 vsrc = load8888 (src);
uint64_t d = *dst;
@@ -2651,7 +2651,7 @@ mmx_composite_over_pixbuf_8888 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
__m64 s = load8888 (src);
__m64 d = load8888 (dst);
@@ -2739,7 +2739,7 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
uint32_t *p = (uint32_t *)mask_line;
uint16_t *q = (uint16_t *)dst_line;
- while (twidth && ((unsigned long)q & 7))
+ while (twidth && ((uintptr_t)q & 7))
{
uint32_t m = *(uint32_t *)p;
@@ -2840,7 +2840,7 @@ mmx_composite_in_n_8_8 (pixman_implementation_t *imp,
mask_line += mask_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
uint16_t tmp;
uint8_t a;
@@ -2911,7 +2911,7 @@ mmx_composite_in_8_8 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 3)
+ while (w && (uintptr_t)dst & 3)
{
uint8_t s, d;
uint16_t tmp;
@@ -2990,7 +2990,7 @@ mmx_composite_add_n_8_8 (pixman_implementation_t *imp,
mask_line += mask_stride;
w = width;
- while (w && (unsigned long)dst & 3)
+ while (w && (uintptr_t)dst & 3)
{
uint16_t tmp;
uint16_t a;
@@ -3067,7 +3067,7 @@ mmx_composite_add_8_8 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
s = *src;
d = *dst;
@@ -3130,7 +3130,7 @@ mmx_composite_add_0565_0565 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
s = *src++;
if (s)
@@ -3212,7 +3212,7 @@ mmx_composite_add_8888_8888 (pixman_implementation_t *imp,
src_line += src_stride;
w = width;
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
store (dst, _mm_adds_pu8 (load ((const uint32_t *)src),
load ((const uint32_t *)dst)));
@@ -3296,7 +3296,7 @@ mmx_blt (pixman_implementation_t *imp,
dst_bytes += dst_stride;
w = byte_width;
- if (w >= 1 && ((unsigned long)d & 1))
+ if (w >= 1 && ((uintptr_t)d & 1))
{
*(uint8_t *)d = *(uint8_t *)s;
w -= 1;
@@ -3304,7 +3304,7 @@ mmx_blt (pixman_implementation_t *imp,
d += 1;
}
- if (w >= 2 && ((unsigned long)d & 3))
+ if (w >= 2 && ((uintptr_t)d & 3))
{
*(uint16_t *)d = *(uint16_t *)s;
w -= 2;
@@ -3312,7 +3312,7 @@ mmx_blt (pixman_implementation_t *imp,
d += 2;
}
- while (w >= 4 && ((unsigned long)d & 7))
+ while (w >= 4 && ((uintptr_t)d & 7))
{
*(uint32_t *)d = ldl_u ((uint32_t *)s);
@@ -3495,7 +3495,7 @@ mmx_composite_over_reverse_n_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w && (unsigned long)dst & 7)
+ while (w && (uintptr_t)dst & 7)
{
__m64 vdest = load8888 (dst);
@@ -3778,7 +3778,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
iter->bits += iter->stride;
- while (w && ((unsigned long)dst) & 7)
+ while (w && ((uintptr_t)dst) & 7)
{
*dst++ = (*src++) | 0xff000000;
w--;
@@ -3820,7 +3820,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
iter->bits += iter->stride;
- while (w && ((unsigned long)dst) & 0x0f)
+ while (w && ((uintptr_t)dst) & 0x0f)
{
uint16_t s = *src++;
@@ -3864,7 +3864,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
iter->bits += iter->stride;
- while (w && (((unsigned long)dst) & 15))
+ while (w && (((uintptr_t)dst) & 15))
{
*dst++ = *(src++) << 24;
w--;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 10:08:29 +0000