summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-17 17:55:02 +0000
committerKevin E Martin <kem@kem.org>2004-08-17 17:55:02 +0000
commita45bc0df7a1c369e8429e84414ac813187c90059 (patch)
tree80d2432d1864f5e72c028841b1379ac6fa98bb8b
parent75de2fe82e7da755555028a724f68b9fb9ddfb14 (diff)
Fix DRI module loading (Bug #1057, Ronny Vindenes).XORG-6_7_99_902
Fix Xvfb at 8bpp (Bug #1091). Fix link order when building with Xprint in glxgears (Bug #1060, Alexander Gottwald).
-rw-r--r--hw/vfb/InitOutput.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index c3dd21b47..44ce521d6 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -69,8 +69,8 @@ from The Open Group.
#define VFB_DEFAULT_WIDTH 1280
#define VFB_DEFAULT_HEIGHT 1024
#define VFB_DEFAULT_DEPTH 8
-#define VFB_DEFAULT_WHITEPIXEL 0
-#define VFB_DEFAULT_BLACKPIXEL 1
+#define VFB_DEFAULT_WHITEPIXEL 1
+#define VFB_DEFAULT_BLACKPIXEL 0
#define VFB_DEFAULT_LINEBIAS 0
#define XWD_WINDOW_NAME_LEN 60
@@ -871,6 +871,16 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
miSetPixmapDepths ();
switch (pvfb->depth) {
+ case 8:
+ miSetVisualTypesAndMasks (8,
+ ((1 << StaticGray) |
+ (1 << GrayScale) |
+ (1 << StaticColor) |
+ (1 << PseudoColor) |
+ (1 << TrueColor) |
+ (1 << DirectColor)),
+ 8, PseudoColor, 0x07, 0x38, 0xc0);
+ break;
case 15:
miSetVisualTypesAndMasks (15, (1 << TrueColor), 8, TrueColor,
0x7c00, 0x03e0, 0x001f);