pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-private.h |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 3f5c2936c67d2b0dcf08b80e11c954ba73602ee2
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed May 27 21:15:18 2009 -0400

    Add back pixman_composeFunctions since vmx is not ported to implementations yet

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 3280af7..9cb0968 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -184,6 +184,19 @@ typedef struct _FbComposeData {
     uint16_t	 height;
 } FbComposeData;
 
+typedef struct _FbComposeFunctions32 {
+    CombineFunc32 *combineU;
+    CombineFunc32 *combineC;
+} FbComposeFunctions32;
+
+typedef struct _FbComposeFunctions64 {
+    CombineFunc64 *combineU;
+    CombineFunc64 *combineC;
+} FbComposeFunctions64;
+
+extern FbComposeFunctions32 pixman_composeFunctions;
+extern FbComposeFunctions64 pixman_composeFunctions64;
+
 void pixman_composite_rect_general_accessors (const FbComposeData *data,
                                               void *src_buffer,
                                               void *mask_buffer,