summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-10-09 11:31:46 +0200
committerKeith Packard <keithp@keithp.com>2009-10-09 16:04:52 -0700
commitb375be9285c40467578fac2f1360c29a75306ab4 (patch)
treea8161a76787a9464624f47db414b242b011cf48b
parentc0a1bb511a4629bf5683d8a710dc4a1c577a5d44 (diff)
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@vmware.com> Tested-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--composite/compinit.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/composite/compinit.c b/composite/compinit.c
index 96ac70fd0..9b033c8d2 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) {