frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the default depth back to 8 like it was originally. Disable the 

addition of depth 12 & 30. It causes more than MAXFORMATS depths to be
    added to the screen which causes an array in the Screen structure to
    overflow and crash on server reset.
This commit is contained in:
Stuart R. Anderson 2005-07-23 18:16:06 +00:00
parent d8a1241a24
commit a5532e456d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/vfb/InitOutput.c
View File

@ -72,7 +72,7 @@ from The Open Group.
#define VFB_DEFAULT_WIDTH 1280
#define VFB_DEFAULT_HEIGHT 1024
#define VFB_DEFAULT_DEPTH 12
#define VFB_DEFAULT_DEPTH 8
#define VFB_DEFAULT_WHITEPIXEL 1
#define VFB_DEFAULT_BLACKPIXEL 0
#define VFB_DEFAULT_LINEBIAS 0
@ -892,6 +892,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
(1 << DirectColor)),
8, PseudoColor, 0, 0, 0);
break;
#if 0
/* 12bit PseudoColor with 12bit color resolution
* (to simulate SGI hardware and the 12bit PseudoColor emulation layer) */
case 12:
@ -904,6 +905,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
(1 << DirectColor)),
12, PseudoColor, 0, 0, 0);
break;
#endif
case 15:
miSetVisualTypesAndMasks (15,
((1 << GrayScale) |
@ -924,6 +926,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
(1 << DirectColor)),
8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
break;
#if 0
/* 30bit TrueColor (to simulate Sun's XVR-1000/-4000 high quality
* framebuffer series) */
case 30:
@ -932,6 +935,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
(1 << DirectColor)),
10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
break;
#endif
}
ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
@ -995,11 +999,15 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
vfbPixmapDepths[1] = TRUE;
vfbPixmapDepths[4] = TRUE;
vfbPixmapDepths[8] = TRUE;
#if 0
vfbPixmapDepths[12] = TRUE;
#endif
/* vfbPixmapDepths[15] = TRUE; */
vfbPixmapDepths[16] = TRUE;
vfbPixmapDepths[24] = TRUE;
#if 0
vfbPixmapDepths[30] = TRUE;
#endif
vfbPixmapDepths[32] = TRUE;
}