pixman: Branch 'master' - 4 commits

[GitLab Mirror]

 pixman/pixman-access.c |    2 +-
 pixman/pixman-mmx.c    |    2 +-
 pixman/pixman-sse2.c   |   18 ------------------
 test/matrix-test.c     |    4 ++--
 4 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit 396e1a76edbbe96b6584a80bc850243ed0f8a91d
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 3 21:25:20 2024 -0500

    test: Use fabsl on float128

diff --git a/test/matrix-test.c b/test/matrix-test.c
index 0a5f203..cd8820c 100644
--- a/test/matrix-test.c
+++ b/test/matrix-test.c
@@ -201,8 +201,8 @@ test_matrix (int testnum, int verbose)
             {
                 for (j = 0; j < 3; j++)
                 {
-                    double diff = fabs (result_f.v[j] -
-                                        pixman_fixed_to_float128 (result_i.v[j]));
+                    double diff = fabsl (result_f.v[j] -
+                                         pixman_fixed_to_float128 (result_i.v[j]));
 
                     if (is_affine && diff > (0.51 / 65536.0))
                     {
commit 7e76c962810914464122b9eec3699e910b3e6017
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 3 21:13:21 2024 -0500

    pixman-access: Mark __dummy__ variables with MAYBE_UNUSED

diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index 892e70b..7bd7a5a 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -465,7 +465,7 @@ convert_and_store_pixel (bits_image_t *		image,
 	    image, bits, offset, PIXMAN_ ## format);			\
     }									\
 									\
-    static const void *const __dummy__ ## format
+    static const void *const __dummy__ ## format MAYBE_UNUSED
 
 MAKE_ACCESSORS(a8r8g8b8);
 MAKE_ACCESSORS(x8r8g8b8);
commit af101d3c213bafd7d43516519ed911a11e5d23b6
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 3 21:11:35 2024 -0500

    pixman-mmx: Don't redefine _MM_SHUFFLE

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 3a85616..52c70e9 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -103,7 +103,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B)
 # endif
 #endif
 
-#ifndef _MSC_VER
+#ifndef _MM_SHUFFLE
 #define _MM_SHUFFLE(fp3,fp2,fp1,fp0) \
  (((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | (fp0))
 #endif
commit 20cc4ee0e95d77d3e0072a4da625363ab7e6c53b
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 3 21:10:23 2024 -0500

    pixman-sse2: Remove unused functions

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 6082537..9c9cff2 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -373,16 +373,6 @@ load_128_unaligned (const __m128i* src)
     return _mm_loadu_si128 (src);
 }
 
-/* save 4 pixels using Write Combining memory on a 16-byte
- * boundary aligned address
- */
-static force_inline void
-save_128_write_combining (__m128i* dst,
-                          __m128i  data)
-{
-    _mm_stream_si128 (dst, data);
-}
-
 /* save 4 pixels on a 16-byte boundary aligned address */
 static force_inline void
 save_128_aligned (__m128i* dst,
@@ -391,14 +381,6 @@ save_128_aligned (__m128i* dst,
     _mm_store_si128 (dst, data);
 }
 
-/* save 4 pixels on a unaligned address */
-static force_inline void
-save_128_unaligned (__m128i* dst,
-                    __m128i  data)
-{
-    _mm_storeu_si128 (dst, data);
-}
-
 static force_inline __m128i
 load_32_1x128 (uint32_t data)
 {