pixman: Branch 'master' - 3 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Tue May 31 15:11:53 PDT 2011
demos/alpha-test.c | 4 +++-
demos/gradient-test.c | 4 ++++
pixman/pixman-mmx.c | 17 +++--------------
pixman/pixman-sse2.c | 18 ++++--------------
4 files changed, 14 insertions(+), 29 deletions(-)
New commits:
commit 6aceb767aa6eea38ec3021263ca1d83aa9e0a3df
Author: Søren Sandmann <ssp at redhat.com>
Date: Sat May 28 12:32:35 2011 -0400
demos: Comment out some unused variables
diff --git a/demos/alpha-test.c b/demos/alpha-test.c
index 92c2081..54e30fa 100644
--- a/demos/alpha-test.c
+++ b/demos/alpha-test.c
@@ -40,10 +40,12 @@ main (int argc, char **argv)
};
#endif
+#if 0
pixman_point_fixed_t c_inner;
pixman_point_fixed_t c_outer;
pixman_fixed_t r_inner;
pixman_fixed_t r_outer;
+#endif
for (i = 0; i < WIDTH * HEIGHT; ++i)
alpha[i] = 0x4f00004f; /* pale blue */
@@ -69,6 +71,7 @@ main (int argc, char **argv)
src,
WIDTH * 4);
+#if 0
c_inner.x = pixman_double_to_fixed (50.0);
c_inner.y = pixman_double_to_fixed (50.0);
c_outer.x = pixman_double_to_fixed (50.0);
@@ -76,7 +79,6 @@ main (int argc, char **argv)
r_inner = 0;
r_outer = pixman_double_to_fixed (50.0);
-#if 0
grad_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
stops, 2);
#endif
diff --git a/demos/gradient-test.c b/demos/gradient-test.c
index fc84844..20f78a6 100644
--- a/demos/gradient-test.c
+++ b/demos/gradient-test.c
@@ -36,10 +36,12 @@ main (int argc, char **argv)
};
#endif
+#if 0
pixman_point_fixed_t c_inner;
pixman_point_fixed_t c_outer;
pixman_fixed_t r_inner;
pixman_fixed_t r_outer;
+#endif
for (i = 0; i < WIDTH * HEIGHT; ++i)
dest[i] = 0x4f00004f; /* pale blue */
@@ -49,6 +51,7 @@ main (int argc, char **argv)
dest,
WIDTH * 4);
+#if 0
c_inner.x = pixman_double_to_fixed (50.0);
c_inner.y = pixman_double_to_fixed (50.0);
c_outer.x = pixman_double_to_fixed (50.0);
@@ -58,6 +61,7 @@ main (int argc, char **argv)
src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
stops, 2);
+#endif
#if 0
src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
stops, 2);
commit 4abe76432a59dec2e7978bfa4a01ad032178da0a
Author: Søren Sandmann <ssp at redhat.com>
Date: Sat May 28 11:56:32 2011 -0400
sse2: Delete some unused variables
diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 533b858..1fd66bf 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -2537,20 +2537,19 @@ sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
- uint32_t src, srca;
+ uint32_t src;
uint32_t *dst_line, d;
uint32_t *mask_line, m;
uint32_t pack_cmp;
int dst_stride, mask_stride;
- __m128i xmm_src, xmm_alpha;
+ __m128i xmm_src;
__m128i xmm_dst;
__m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
- __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;
+ __m128i mmx_src, mmx_mask, mmx_dest;
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- srca = src >> 24;
if (src == 0)
return;
@@ -2562,9 +2561,7 @@ sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp,
xmm_src = _mm_unpacklo_epi8 (
create_mask_2x32_128 (src, src), _mm_setzero_si128 ());
- xmm_alpha = expand_alpha_1x128 (xmm_src);
mmx_src = xmm_src;
- mmx_alpha = xmm_alpha;
while (height--)
{
@@ -3628,7 +3625,7 @@ sse2_composite_over_n_8_0565 (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
- uint32_t src, srca;
+ uint32_t src;
uint16_t *dst_line, *dst, d;
uint8_t *mask_line, *mask;
int dst_stride, mask_stride;
@@ -3642,7 +3639,6 @@ sse2_composite_over_n_8_0565 (pixman_implementation_t *imp,
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- srca = src >> 24;
if (src == 0)
return;
@@ -4143,7 +4139,6 @@ sse2_composite_in_n_8_8 (pixman_implementation_t *imp,
int dst_stride, mask_stride;
uint32_t d, m;
uint32_t src;
- uint8_t sa;
int32_t w;
__m128i xmm_alpha;
@@ -4157,8 +4152,6 @@ sse2_composite_in_n_8_8 (pixman_implementation_t *imp,
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- sa = src >> 24;
-
xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));
while (height--)
@@ -4415,7 +4408,6 @@ sse2_composite_add_n_8_8 (pixman_implementation_t *imp,
int dst_stride, mask_stride;
int32_t w;
uint32_t src;
- uint8_t sa;
uint32_t m, d;
__m128i xmm_alpha;
@@ -4429,8 +4421,6 @@ sse2_composite_add_n_8_8 (pixman_implementation_t *imp,
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- sa = src >> 24;
-
xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));
while (height--)
commit 5c60e1855b082b1a323319e1d0ba2d6f916fb3d5
Author: Søren Sandmann <ssp at redhat.com>
Date: Sat May 28 11:51:31 2011 -0400
mmx: Delete some unused variables
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 0272347..62a73d6 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -1267,7 +1267,7 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
- uint32_t src, srca;
+ uint32_t src;
uint32_t *dst_line;
uint32_t *mask_line;
int dst_stride, mask_stride;
@@ -1277,7 +1277,6 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- srca = src >> 24;
if (src == 0)
return;
@@ -1377,7 +1376,6 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
__m64 vmask;
int dst_stride, src_stride;
int32_t w;
- __m64 srca;
CHECKPOINT ();
@@ -1388,7 +1386,6 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
mask &= 0xff000000;
mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
vmask = load8888 (mask);
- srca = MC (4x00ff);
while (height--)
{
@@ -2033,7 +2030,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
uint8_t *mask_line, *mask;
int dst_stride, mask_stride;
int32_t w;
- __m64 vsrc, vsrca;
+ __m64 vsrc;
uint64_t srcsrc;
CHECKPOINT ();
@@ -2055,7 +2052,6 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
vsrc = load8888 (src);
- vsrca = expand_alpha (vsrc);
while (height--)
{
@@ -2101,11 +2097,8 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
}
else if (m0 | m1)
{
- __m64 vdest;
__m64 dest0, dest1;
- vdest = *(__m64 *)dst;
-
dest0 = in (vsrc, expand_alpha_rev (to_m64 (m0)));
dest1 = in (vsrc, expand_alpha_rev (to_m64 (m1)));
@@ -2524,7 +2517,7 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
int32_t width,
int32_t height)
{
- uint32_t src, srca;
+ uint32_t src;
uint16_t *dst_line;
uint32_t *mask_line;
int dst_stride, mask_stride;
@@ -2534,7 +2527,6 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
- srca = src >> 24;
if (src == 0)
return;
@@ -2663,12 +2655,9 @@ mmx_composite_in_n_8_8 (pixman_implementation_t *imp,
{
while (w >= 4)
{
- uint32_t m;
__m64 vmask;
__m64 vdest;
- m = 0;
-
vmask = load8888 (*(uint32_t *)mask);
vdest = load8888 (*(uint32_t *)dst);
More information about the xorg-commit
mailing list