pixman: Branch 'master'

[Aaron Plattner]

 pixman/pixman-compose.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 7b1d0c091dd5ae8797b6f7a0ab3d40d5c3676fe9 (from 43370d1ce793ef2754c2e6f0fc08e534d4247793)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Aug 13 17:26:51 2007 -0700

    Don't skip fbFetch/fbStore when PIXMAN_FB_ACCESSORS is enabled.
    
    pixman_composite_rect_general_accessors skips the fetch / store steps by setting
    store to NULL when the op is ADD or OVER and the dest format is [ax]8r8g8b8.
    This optimization is only valid when no accessors are in play.

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index e7f80f8..2082cb6 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -4257,6 +4257,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
 	case PIXMAN_OP_CLEAR:
 	case PIXMAN_OP_SRC:
 	    fetchDest = NULL;
+#ifndef PIXMAN_FB_ACCESSORS
 	    /* fall-through */
 	case PIXMAN_OP_ADD:
 	case PIXMAN_OP_OVER:
@@ -4268,6 +4269,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
 	    default:
 		break;
 	    }
+#endif
 	    break;
 	}
     }