pixman: Branch 'master' - 3 commits
Matt Turner
mattst88 at kemper.freedesktop.org
Mon Sep 26 08:30:33 PDT 2011
pixman/pixman-mmx.c | 33 +++++++--------------------------
test/lowlevel-blt-bench.c | 1 +
2 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit 57fd8c37aa3148b1d70bad65e1a49721e9a47d7e
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Sep 23 14:10:52 2011 -0400
mmx: convert while (w) to if (w) when possible
gcc isn't able to see that w is no greater than 1, so it generates
unnecessary loop instructions with while (w).
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index f835a14..c044593 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -1142,12 +1142,9 @@ mmx_composite_over_n_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w)
+ if (w)
{
*dst = store8888 (over (vsrc, vsrca, load8888 (*dst)));
-
- w--;
- dst++;
}
}
@@ -1383,16 +1380,12 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
src += 2;
}
- while (w)
+ if (w)
{
__m64 s = load8888 (*src);
__m64 d = load8888 (*dst);
*dst = store8888 (in_over (s, expand_alpha (s), vmask, d));
-
- w--;
- dst++;
- src++;
}
}
@@ -1758,7 +1751,7 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w)
+ if (w)
{
uint64_t m = *mask;
@@ -1770,10 +1763,6 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp,
vsrc, vsrca, expand_alpha_rev (to_m64 (m)), vdest);
*dst = store8888 (vdest);
}
-
- w--;
- mask++;
- dst++;
}
}
@@ -2026,7 +2015,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
CHECKPOINT ();
- while (w)
+ if (w)
{
uint64_t m = *mask;
@@ -2041,10 +2030,6 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
{
*dst = 0;
}
-
- w--;
- mask++;
- dst++;
}
}
@@ -2366,16 +2351,12 @@ mmx_composite_over_pixbuf_8888 (pixman_implementation_t *imp,
src += 2;
}
- while (w)
+ if (w)
{
__m64 s = load8888 (*src);
__m64 d = load8888 (*dst);
*dst = store8888 (over_rev_non_pre (s, d));
-
- w--;
- dst++;
- src++;
}
}
commit 38a7aae1d9c8e1e41de22f9c3846dfc975af6838
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Sep 9 15:33:14 2011 +0200
mmx: fix formats in commented code
b8r8g8 is apparently no longer supported sometime since this code was
commented.
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 697ec4c..f835a14 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -3040,8 +3040,8 @@ static const pixman_fast_path_t mmx_fast_paths[] =
*/
PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, x8r8g8b8, mmx_composite_over_x888_8_8888 ),
PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, a8r8g8b8, mmx_composite_over_x888_8_8888 ),
- PIXMAN_STD_FAST_PATH (OVER, x8b8r8g8, a8, x8b8g8r8, mmx_composite_over_x888_8_8888 ),
- PIXMAN_STD_FAST_PATH (OVER, x8b8r8g8, a8, a8r8g8b8, mmx_composite_over_x888_8_8888 ),
+ PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, x8b8g8r8, mmx_composite_over_x888_8_8888 ),
+ PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, a8b8g8r8, mmx_composite_over_x888_8_8888 ),
#endif
PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, mmx_composite_over_n_8888 ),
PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, mmx_composite_over_n_8888 ),
commit b6b77488a0259da3662edf68568e78806ca97444
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Sep 9 15:34:04 2011 +0200
lowlevel-blt: add over_x888_8_8888
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
index 099e434..bdafb35 100644
--- a/test/lowlevel-blt-bench.c
+++ b/test/lowlevel-blt-bench.c
@@ -632,6 +632,7 @@ tests_tbl[] =
{ "over_8888_0565", PIXMAN_a8r8g8b8, 0, PIXMAN_OP_OVER, PIXMAN_null, 0, PIXMAN_r5g6b5 },
{ "over_8888_x888", PIXMAN_a8r8g8b8, 0, PIXMAN_OP_OVER, PIXMAN_null, 0, PIXMAN_x8r8g8b8 },
{ "over_x888_8_0565", PIXMAN_x8r8g8b8, 0, PIXMAN_OP_OVER, PIXMAN_a8, 0, PIXMAN_r5g6b5 },
+ { "over_x888_8_8888", PIXMAN_x8r8g8b8, 0, PIXMAN_OP_OVER, PIXMAN_a8, 0, PIXMAN_a8r8g8b8 },
{ "over_n_8_0565", PIXMAN_a8r8g8b8, 1, PIXMAN_OP_OVER, PIXMAN_a8, 0, PIXMAN_r5g6b5 },
{ "over_n_8_1555", PIXMAN_a8r8g8b8, 1, PIXMAN_OP_OVER, PIXMAN_a8, 0, PIXMAN_a1r5g5b5 },
{ "over_n_8_4444", PIXMAN_a8r8g8b8, 1, PIXMAN_OP_OVER, PIXMAN_a8, 0, PIXMAN_a4r4g4b4 },
More information about the xorg-commit
mailing list