From c0bff215de2d034118d06cac42e234008612204b Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 27 Aug 2004 01:15:10 +0000
Subject: [PATCH] Fix xtest failures in Xvfb from XMatchVisualInfo test.

---
 hw/vfb/InitOutput.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 44ce521d64..0fbf014d66 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -882,16 +882,22 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 				  8, PseudoColor, 0x07, 0x38, 0xc0);
 	break;
     case 15:
-	miSetVisualTypesAndMasks (15, (1 << TrueColor), 8, TrueColor,
-				  0x7c00, 0x03e0, 0x001f);
+	miSetVisualTypesAndMasks (15,
+				  ((1 << TrueColor) |
+				   (1 << DirectColor)),
+				  8, TrueColor, 0x7c00, 0x03e0, 0x001f);
 	break;
     case 16:
-	miSetVisualTypesAndMasks (16, (1 << TrueColor), 8, TrueColor,
-				  0xf800, 0x07e0, 0x001f);
+	miSetVisualTypesAndMasks (16,
+				  ((1 << TrueColor) |
+				   (1 << DirectColor)),
+				  8, TrueColor, 0xf800, 0x07e0, 0x001f);
 	break;
     case 24:
-	miSetVisualTypesAndMasks (24, (1 << TrueColor), 8, TrueColor,
-				  0xff0000, 0x00ff00, 0x0000ff);
+	miSetVisualTypesAndMasks (24,
+				  ((1 << TrueColor) |
+				   (1 << DirectColor)),
+				  8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
 	break;
     }