pixman: Branch 'master' - 2 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Mon Aug 30 10:48:10 PDT 2010
.gitignore | 1
pixman/pixman-compiler.h | 18 +---------
pixman/pixman-mmx.c | 82 +++++++++++++++++++++++------------------------
3 files changed, 45 insertions(+), 56 deletions(-)
New commits:
commit 765bde32e0a2e81fbbe15acc0f491695ba2726e8
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Mon Aug 30 08:55:00 2010 +0200
Add *.exe to .gitignore
diff --git a/.gitignore b/.gitignore
index aaeb75f..1584064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@ test/window-test
*.lib
*.ilk
*.obj
+*.exe
commit 85964082618fc5350cafcd22b48ba1e02cbc4276
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sun Aug 29 06:28:42 2010 +0200
Use windows.h directly for mingw32 build
This patch adresses the issue discussed in
http://lists.freedesktop.org/archives/pixman/2010-April/000163.html
There were only two clashing identifiers. The first one is IN, which
obviously causes problems in Pixman for lines like
PIXMAN_STD_FAST_PATH (IN, solid, a8, a8, fast_composite_in_n_8_8),
Fortunately the mingw headers provide a solution: by defining
_NO_W32_PSEUDO_MODIFIERS, these stupid symbols are skipped.
The other name is UINT64, used in pixman-mmx.c. I renamed that
function to to_uint64, but may be another name is more appropriate.
diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
index 2b15cc3..5501396 100644
--- a/pixman/pixman-compiler.h
+++ b/pixman/pixman-compiler.h
@@ -84,22 +84,10 @@
# define PIXMAN_GET_THREAD_LOCAL(name) \
(&name)
-#elif defined(__MINGW32__) && !defined(__WIN64)
+#elif defined(__MINGW32__)
-/* We can't include <windows.h> as it causes carious clashes with
- * identifiers in pixman, sigh. So just declare the functions we need
- * here.
- */
-extern __stdcall long InterlockedCompareExchange(long volatile *, long, long);
-#define InterlockedCompareExchangePointer(d,e,c) \
- (void *)InterlockedCompareExchange((long volatile *)(d),(long)(e),(long)(c))
-extern __stdcall int TlsAlloc (void);
-extern __stdcall void *TlsGetValue (unsigned);
-extern __stdcall int TlsSetValue (unsigned, void *);
-extern __stdcall void *CreateMutexA(void *, int, char *);
-extern __stdcall int CloseHandle(void *);
-extern __stdcall unsigned WaitForSingleObject (void *, unsigned);
-extern __stdcall int ReleaseMutex (void *);
+# define _NO_W32_PSEUDO_MODIFIERS
+# include <windows.h>
# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
static volatile int tls_ ## name ## _initialized = 0; \
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index d51b40c..b284cd3 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -129,7 +129,7 @@ static const mmx_data_t c =
#ifdef __GNUC__
# ifdef __ICC
-# define MC(x) M64 (c.mmx_ ## x)
+# define MC(x) to_m64 (c.mmx_ ## x)
# else
# define MC(x) ((__m64)c.mmx_ ## x)
# endif
@@ -138,7 +138,7 @@ static const mmx_data_t c =
#endif
static force_inline __m64
-M64 (uint64_t x)
+to_m64 (uint64_t x)
{
#ifdef __ICC
return _mm_cvtsi64_m64 (x);
@@ -153,7 +153,7 @@ M64 (uint64_t x)
}
static force_inline uint64_t
-UINT64 (__m64 x)
+to_uint64 (__m64 x)
{
#ifdef __ICC
return _mm_cvtm64_si64 (x);
@@ -1208,10 +1208,10 @@ mmx_composite_over_n_0565 (pixman_implementation_t *imp,
while (w && (unsigned long)dst & 7)
{
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (over (vsrc, vsrca, vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -1239,10 +1239,10 @@ mmx_composite_over_n_0565 (pixman_implementation_t *imp,
while (w)
{
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (over (vsrc, vsrca, vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -1680,12 +1680,12 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp,
{
__m64 vsrc = load8888 (*src);
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (
over (vsrc, expand_alpha (vsrc), vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -1724,11 +1724,11 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp,
{
__m64 vsrc = load8888 (*src);
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (over (vsrc, expand_alpha (vsrc), vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -1795,7 +1795,7 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
if (m)
{
__m64 vdest = in_over (vsrc, vsrca,
- expand_alpha_rev (M64 (m)),
+ expand_alpha_rev (to_m64 (m)),
load8888 (*dst));
*dst = store8888 (vdest);
@@ -1826,9 +1826,9 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
vdest = *(__m64 *)dst;
- dest0 = in_over (vsrc, vsrca, expand_alpha_rev (M64 (m0)),
+ dest0 = in_over (vsrc, vsrca, expand_alpha_rev (to_m64 (m0)),
expand8888 (vdest, 0));
- dest1 = in_over (vsrc, vsrca, expand_alpha_rev (M64 (m1)),
+ dest1 = in_over (vsrc, vsrca, expand_alpha_rev (to_m64 (m1)),
expand8888 (vdest, 1));
*(__m64 *)dst = pack8888 (dest0, dest1);
@@ -1850,7 +1850,7 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
__m64 vdest = load8888 (*dst);
vdest = in_over (
- vsrc, vsrca, expand_alpha_rev (M64 (m)), vdest);
+ vsrc, vsrca, expand_alpha_rev (to_m64 (m)), vdest);
*dst = store8888 (vdest);
}
@@ -1910,7 +1910,7 @@ pixman_fill_mmx (uint32_t *bits,
}
fill = ((uint64_t)xor << 32) | xor;
- vfill = M64 (fill);
+ vfill = to_m64 (fill);
#ifdef __GNUC__
__asm__ (
@@ -2073,7 +2073,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
if (m)
{
- __m64 vdest = in (vsrc, expand_alpha_rev (M64 (m)));
+ __m64 vdest = in (vsrc, expand_alpha_rev (to_m64 (m)));
*dst = store8888 (vdest);
}
@@ -2106,8 +2106,8 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
vdest = *(__m64 *)dst;
- dest0 = in (vsrc, expand_alpha_rev (M64 (m0)));
- dest1 = in (vsrc, expand_alpha_rev (M64 (m1)));
+ dest0 = in (vsrc, expand_alpha_rev (to_m64 (m0)));
+ dest1 = in (vsrc, expand_alpha_rev (to_m64 (m1)));
*(__m64 *)dst = pack8888 (dest0, dest1);
}
@@ -2131,7 +2131,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
{
__m64 vdest = load8888 (*dst);
- vdest = in (vsrc, expand_alpha_rev (M64 (m)));
+ vdest = in (vsrc, expand_alpha_rev (to_m64 (m)));
*dst = store8888 (vdest);
}
else
@@ -2186,7 +2186,7 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp,
vsrca = expand_alpha (vsrc);
tmp = pack_565 (vsrc, _mm_setzero_si64 (), 0);
- src16 = UINT64 (tmp);
+ src16 = to_uint64 (tmp);
srcsrcsrcsrc =
(uint64_t)src16 << 48 | (uint64_t)src16 << 32 |
@@ -2209,12 +2209,12 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp,
if (m)
{
uint64_t d = *dst;
- __m64 vd = M64 (d);
+ __m64 vd = to_m64 (d);
__m64 vdest = in_over (
- vsrc, vsrca, expand_alpha_rev (M64 (m)), expand565 (vd, 0));
+ vsrc, vsrca, expand_alpha_rev (to_m64 (m)), expand565 (vd, 0));
vd = pack_565 (vdest, _mm_setzero_si64 (), 0);
- *dst = UINT64 (vd);
+ *dst = to_uint64 (vd);
}
w--;
@@ -2243,16 +2243,16 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp,
vdest = *(__m64 *)dst;
- vm0 = M64 (m0);
+ vm0 = to_m64 (m0);
vdest = pack_565 (in_over (vsrc, vsrca, expand_alpha_rev (vm0),
expand565 (vdest, 0)), vdest, 0);
- vm1 = M64 (m1);
+ vm1 = to_m64 (m1);
vdest = pack_565 (in_over (vsrc, vsrca, expand_alpha_rev (vm1),
expand565 (vdest, 1)), vdest, 1);
- vm2 = M64 (m2);
+ vm2 = to_m64 (m2);
vdest = pack_565 (in_over (vsrc, vsrca, expand_alpha_rev (vm2),
expand565 (vdest, 2)), vdest, 2);
- vm3 = M64 (m3);
+ vm3 = to_m64 (m3);
vdest = pack_565 (in_over (vsrc, vsrca, expand_alpha_rev (vm3),
expand565 (vdest, 3)), vdest, 3);
@@ -2273,11 +2273,11 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp,
if (m)
{
uint64_t d = *dst;
- __m64 vd = M64 (d);
- __m64 vdest = in_over (vsrc, vsrca, expand_alpha_rev (M64 (m)),
+ __m64 vd = to_m64 (d);
+ __m64 vdest = in_over (vsrc, vsrca, expand_alpha_rev (to_m64 (m)),
expand565 (vd, 0));
vd = pack_565 (vdest, _mm_setzero_si64 (), 0);
- *dst = UINT64 (vd);
+ *dst = to_uint64 (vd);
}
w--;
@@ -2333,11 +2333,11 @@ mmx_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
{
__m64 vsrc = load8888 (*src);
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (over_rev_non_pre (vsrc, vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -2394,11 +2394,11 @@ mmx_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
{
__m64 vsrc = load8888 (*src);
uint64_t d = *dst;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (over_rev_non_pre (vsrc, vdest), vdest, 0);
- *dst = UINT64 (vdest);
+ *dst = to_uint64 (vdest);
w--;
dst++;
@@ -2557,9 +2557,9 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
if (m)
{
uint64_t d = *q;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (in_over (vsrc, vsrca, load8888 (m), vdest), vdest, 0);
- *q = UINT64 (vdest);
+ *q = to_uint64 (vdest);
}
twidth--;
@@ -2600,9 +2600,9 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
if (m)
{
uint64_t d = *q;
- __m64 vdest = expand565 (M64 (d), 0);
+ __m64 vdest = expand565 (to_m64 (d), 0);
vdest = pack_565 (in_over (vsrc, vsrca, load8888 (m), vdest), vdest, 0);
- *q = UINT64 (vdest);
+ *q = to_uint64 (vdest);
}
twidth--;
@@ -2963,7 +2963,7 @@ mmx_composite_add_8888_8888 (pixman_implementation_t *imp,
while (w >= 2)
{
dst64 = _mm_adds_pu8 (*(__m64*)src, *(__m64*)dst);
- *(uint64_t*)dst = UINT64 (dst64);
+ *(uint64_t*)dst = to_uint64 (dst64);
dst += 2;
src += 2;
w -= 2;
@@ -3199,7 +3199,7 @@ mmx_composite_over_x888_8_8888 (pixman_implementation_t *imp,
else
{
__m64 sa = expand_alpha (s);
- __m64 vm = expand_alpha_rev (M64 (m));
+ __m64 vm = expand_alpha_rev (to_m64 (m));
__m64 vdest = in_over (s, sa, vm, load8888 (*dst));
*dst = store8888 (vdest);
More information about the xorg-commit
mailing list