xserver: Branch 'master'

[Aaron Plattner]

 composite/compinit.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 951c058e7800308f7c472e77178c14400f45c1b3 (from 722d73a0ef54c2ebd8ef38c4a6afa0e7c5aa3e30)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Jul 31 14:23:58 2007 -0700

    Don't fail compScreenInit if the driver added its own alternate visuals.

diff --git a/composite/compinit.c b/composite/compinit.c
index 8ce08b4..630f104 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -239,7 +239,8 @@ compAddAlternateVisual(ScreenPtr pScreen
 
     depth = compFindVisuallessDepth (pScreen, alt->depth);
     if (!depth)
-	return FALSE;
+	/* alt->depth doesn't exist or already has alternate visuals. */
+	return TRUE;
 
     pPictFormat = PictureMatchFormat (pScreen, alt->depth, alt->format);
     if (!pPictFormat)