xserver: Branch 'master'

[Keith Packard]

 composite/compinit.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b375be9285c40467578fac2f1360c29a75306ab4
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri Oct 9 11:31:46 2009 +0200

    composite: Revert changes from adding support for BGRA picture formats.
    
    They were aimed towards a since abandoned approach for making radeon KMS work
    on big endian machines, and Aaron Plattner pointed out that they break the
    Composite extension when the X server runs in 16bpp.
    
    Signed-off-by: Michel Dänzer <daenzer at vmware.com>
    Tested-by: Aaron Plattner <aplattner at nvidia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/composite/compinit.c b/composite/compinit.c
index 96ac70f..9b033c8 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -238,7 +238,6 @@ static CompAlternateVisual  altVisuals[] = {
     {	24,	PICT_r8g8b8 },
 #endif
     {	32,	PICT_a8r8g8b8 },
-    {	32,	PICT_b8g8r8a8 },
 };
 
 static const int NUM_COMP_ALTERNATE_VISUALS = sizeof(altVisuals) /
@@ -267,8 +266,7 @@ compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs,
 	return TRUE;
 
     pPictFormat = PictureMatchFormat (pScreen, alt->depth, alt->format);
-    if (!pPictFormat ||
-	pPictFormat->direct.red != pScreen->visuals[0].offsetRed)
+    if (!pPictFormat)
 	return FALSE;
 
     if (ResizeVisualArray(pScreen, 1, depth) == FALSE) {