Fix DRI module loading (Bug #1057, Ronny Vindenes).

Fix Xvfb at 8bpp (Bug #1091).
Fix link order when building with Xprint in glxgears (Bug #1060, Alexander
    Gottwald).
This commit is contained in:
Kevin E Martin 2004-08-17 17:55:02 +00:00
parent 75de2fe82e
commit a45bc0df7a

View File

@ -69,8 +69,8 @@ from The Open Group.
#define VFB_DEFAULT_WIDTH 1280 #define VFB_DEFAULT_WIDTH 1280
#define VFB_DEFAULT_HEIGHT 1024 #define VFB_DEFAULT_HEIGHT 1024
#define VFB_DEFAULT_DEPTH 8 #define VFB_DEFAULT_DEPTH 8
#define VFB_DEFAULT_WHITEPIXEL 0 #define VFB_DEFAULT_WHITEPIXEL 1
#define VFB_DEFAULT_BLACKPIXEL 1 #define VFB_DEFAULT_BLACKPIXEL 0
#define VFB_DEFAULT_LINEBIAS 0 #define VFB_DEFAULT_LINEBIAS 0
#define XWD_WINDOW_NAME_LEN 60 #define XWD_WINDOW_NAME_LEN 60
@ -871,6 +871,16 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
miSetPixmapDepths (); miSetPixmapDepths ();
switch (pvfb->depth) { 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: case 15:
miSetVisualTypesAndMasks (15, (1 << TrueColor), 8, TrueColor, miSetVisualTypesAndMasks (15, (1 << TrueColor), 8, TrueColor,
0x7c00, 0x03e0, 0x001f); 0x7c00, 0x03e0, 0x001f);