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

XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth 

(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
This commit is contained in:
Jeremy Huddleston 2008-12-23 12:39:38 -08:00
parent 86dc660588
commit a1b201bcb0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/xquartz/xpr/xprScreen.c
View File

@ -278,18 +278,17 @@ xprAddScreen(int index, ScreenPtr pScreen)
} }
switch(depth) { switch(depth) {
case -8: // broken // case -8: // broken
FatalError("Unsupported color depth %d %d\n", darwinDesiredDepth, depth); // dfb->visuals = (1 << StaticGray) | (1 << GrayScale);
dfb->visuals = (1 << StaticGray) | (1 << GrayScale); // dfb->preferredCVC = GrayScale;
dfb->preferredCVC = GrayScale; // dfb->depth = 8;
dfb->depth = 8; // dfb->bitsPerRGB = 8;
dfb->bitsPerRGB = 8; // dfb->bitsPerPixel = 8;
dfb->bitsPerPixel = 8; // dfb->redMask = 0;
dfb->redMask = 0; // dfb->greenMask = 0;
dfb->greenMask = 0; // dfb->blueMask = 0;
dfb->blueMask = 0; // break;
break; case 8: // pseudo-working
case 8: // broken
dfb->visuals = PseudoColorMask; dfb->visuals = PseudoColorMask;
dfb->preferredCVC = PseudoColor; dfb->preferredCVC = PseudoColor;
dfb->depth = 8; dfb->depth = 8;
@ -309,7 +308,10 @@ xprAddScreen(int index, ScreenPtr pScreen)
dfb->greenMask = 0x03e0; dfb->greenMask = 0x03e0;
dfb->blueMask = 0x001f; dfb->blueMask = 0x001f;
break; break;
case 24: // case 24:
default:
if(depth != 24)
ErrorF("Unsupported color depth requested. Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d CGDisplaySamplesPerPixel=%d CGDisplayBitsPerSample=%d)\n", darwinDesiredDepth, depth, (int)CGDisplaySamplesPerPixel(kCGDirectMainDisplay), (int)CGDisplayBitsPerSample(kCGDirectMainDisplay));
dfb->visuals = LARGE_VISUALS; dfb->visuals = LARGE_VISUALS;
dfb->preferredCVC = TrueColor; dfb->preferredCVC = TrueColor;
dfb->depth = 24; dfb->depth = 24;
@ -319,8 +321,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
dfb->greenMask = 0x0000ff00; dfb->greenMask = 0x0000ff00;
dfb->blueMask = 0x000000ff; dfb->blueMask = 0x000000ff;
break; break;
default:
FatalError("Unsupported color depth %d %d\n", darwinDesiredDepth, depth);
} }
if (noPseudoramiXExtension) if (noPseudoramiXExtension)