[cairo-commit] cairo/pixman/src Makefile.am, 1.12, 1.13 pixman-remap.h, 1.1, 1.2

[Billy Biggs]

Committed by: vektor

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv25898/src

Modified Files:
	Makefile.am pixman-remap.h 
Log Message:
	* src/Makefile.am: Split the MMX code into a separate libtool
	library to avoid applying the MMX CFLAGS to all of the pixman
	code.  Idea and code from Owen Taylor.

	* src/pixman-remap.h: Update the mangling header file to include
	the MMX symbols.



Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	16 Aug 2005 23:50:25 -0000	1.12
+++ Makefile.am	17 Aug 2005 01:38:38 -0000	1.13
@@ -32,9 +32,12 @@
 	slim_internal.h
 
 if USE_MMX
-libpixman_la_SOURCES += \
+noinst_LTLIBRARIES = libpixman-mmx.la
+libpixman_mmx_la_SOURCES = \
 	fbmmx.c		\
 	fbmmx.h
+libpixman_mmx_la_CFLAGS = @MMX_CFLAGS@
+libpixman_la_LIBADD = libpixman-mmx.la
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(srcdir) $(WARN_CFLAGS) @MMX_CFLAGS@
+INCLUDES = -I$(top_srcdir) -I$(srcdir) $(WARN_CFLAGS)

Index: pixman-remap.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/pixman-remap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pixman-remap.h	10 Aug 2005 19:36:51 -0000	1.1
+++ pixman-remap.h	17 Aug 2005 01:38:38 -0000	1.2
@@ -16,6 +16,7 @@
 #define fbCombineAtopReverseU _cairo_pixman_combine_atop_reverse_u
 #define fbCombineAtopU _cairo_pixman_combine_atop_u
 #define fbCombineClear _cairo_pixman_combine_clear
+#define fbCombineClearC _cairo_pixman_combine_clear_c
 #define fbCombineConjointAtopC _cairo_pixman_combine_conjoint_atop_c
 #define fbCombineConjointAtopReverseC _cairo_pixman_combine_conjoint_atop_reverse_c
 #define fbCombineConjointAtopReverseU _cairo_pixman_combine_conjoint_atop_reverse_u
@@ -86,6 +87,25 @@
 #define fbCombineSrcU _cairo_pixman_combine_src_u
 #define fbCombineXorC _cairo_pixman_combine_xor_c
 #define fbCombineXorU _cairo_pixman_combine_xor_u
+#define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
+#define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
+#define fbCompositeSolidMaskSrc_nx8x8888mmx _cairo_pixman_composite_solid_mask_src_nx8x8888mmx
+#define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx
+#define fbCompositeSolidMask_nx8888x8888Cmmx _cairo_pixman_composite_solid_mask_nx8888x8888Cmmx
+#define fbCompositeSolidMask_nx8x0565mmx _cairo_pixman_composite_solid_mask_nx8x0565mmx
+#define fbCompositeSolidMask_nx8x8888mmx _cairo_pixman_composite_solid_mask_nx8x8888mmx
+#define fbCompositeSolid_nx0565mmx _cairo_pixman_composite_solid_nx0565mmx
+#define fbCompositeSolid_nx8888mmx _cairo_pixman_composite_solid_nx8888mmx
+#define fbCompositeSrcAdd_8000x8000mmx _cairo_pixman_composite_src_add_8000x8000mmx
+#define fbCompositeSrcAdd_8888x8888mmx _cairo_pixman_composite_src_add_8888x8888mmx
+#define fbCompositeSrc_8888RevNPx0565mmx _cairo_pixman_composite_src_8888RevNPx0565mmx
+#define fbCompositeSrc_8888RevNPx8888mmx _cairo_pixman_composite_src_8888RevNPx8888_mmx
+#define fbCompositeSrc_8888x8888mmx _cairo_pixman_composite_src_8888x8888mmx
+#define fbCompositeSrc_8888x8x8888mmx _cairo_pixman_composite_src_8888x8x8888mmx
+#define fbCompositeSrc_x888x8x8888mmx _cairo_pixman_composite_src_x888x8x8888mmx
+#define fbCopyAreammx _cairo_pixman_copy_area_mmx
+#define fbHaveMMX _cairo_pixman_have_mmx
+#define fbSolidFillmmx _cairo_pixman_solid_fill_mmx
 #define fbCompositeSolidMask_nx1xn _cairo_pixman_composite_solid_mask_nx1xn
 #define fbCompositeSolidMask_nx8888x0565 _cairo_pixman_composite_solid_mask_nx8888x0565
 #define fbCompositeSolidMask_nx8888x0565C _cairo_pixman_composite_solid_mask_nx8888x0565_c
@@ -300,3 +320,4 @@
 #define RenderLineFixedEdgeInit _cairo_pixman_render_line_fixed_edge_init
 #define RenderSampleCeilY _cairo_pixman_render_sample_ceil_y
 #define RenderSampleFloorY _cairo_pixman_render_sample_floor_y
+#define composeFunctions _cairo_pixman_compose_functions