[cairo-commit] libpixman/src pixman.h,1.15,1.16

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv22896/src

Modified Files:
	pixman.h 
Log Message:

        * src/pixman.h: Use 32-bits for pixman_bits_t, even on 64-bit
        platforms. This should fix bug #2335 as well as rendering problems
        seen on 64-bit platforms.


Index: pixman.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pixman.h	12 Sep 2004 13:06:50 -0000	1.15
+++ pixman.h	26 Jan 2005 17:10:15 -0000	1.16
@@ -261,18 +261,18 @@
  * by this software; it must be log2(sizeof (pixman_bits_t) * 8)
  */
 
+/* We use a 32-bit size on all platforms, (even those with native 64
+ * bit types). This is consistent with the code currently in the X
+ * server, so it goes through much more well-tested code paths, (we
+ * saw rendering bugs when we tried IC_SHIFT==6 and uint64_t for
+ * pixman_bits_t on 64-bit platofrms). In addition, Keith says that
+ * his testing indicates that using 32-bits everywhere is a
+ * performance win in any case, (presumably due to 32-bit datapaths
+ * between the processor and the video card).
+*/
 #ifndef IC_SHIFT
-#  if defined(__alpha__) || defined(__alpha) || \
-      defined(ia64) || defined(__ia64__) || \
-      defined(__sparc64__) || \
-      defined(__s390x__) || \
-      defined(x86_64) || defined (__x86_64__)
-#define IC_SHIFT 6
-typedef uint64_t pixman_bits_t;
-#  else
 #define IC_SHIFT 5
 typedef uint32_t pixman_bits_t;
-#  endif
 #endif
 
 pixman_image_t *