andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dead ifdefs for BITMAP_SCANLINE_UNIT == 64

Browse Source 
This appears to be a legacy of cfb24 not being smart enough to deal with this
case.  But since cfb24 unexists, die die die.
This commit is contained in:
Adam Jackson 2007-02-06 21:01:08 -05:00
parent cbe74394a5
commit d1d65a8415
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86Helper.c
View File

@ -481,16 +481,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
scrp->bitsPerPixelFrom = X_DEFAULT;
scrp->depthFrom = X_DEFAULT;
#if BITMAP_SCANLINE_UNIT == 64
/*
* For platforms with 64-bit scanlines, modify the driver's depth24flags
* to remove preferences for packed 24bpp modes, which are not currently
* supported on these platforms.
*/
depth24flags &= ~(SupportConvert32to24 | SupportConvert32to24 |
PreferConvert24to32 | PreferConvert32to24);
#endif
if (xf86FbBpp > 0) {
scrp->bitsPerPixel = xf86FbBpp;
scrp->bitsPerPixelFrom = X_CMDLINE;

21
hw/xfree86/common/xf86Init.c
View File

@ -761,27 +761,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
}
}
#if BITMAP_SCANLINE_UNIT == 64
/*
* cfb24 doesn't currently work on architectures with a 64 bit
* BITMAP_SCANLINE_UNIT, so check for 24 bit pixel size for pixmaps
* or framebuffers.
*/
{
Bool usesCfb24 = FALSE;
if (PIX24TOBPP(pix24) == 24)
usesCfb24 = TRUE;
for (i = 0; i < xf86NumScreens; i++)
if (xf86Screens[i]->bitsPerPixel == 24)
usesCfb24 = TRUE;
if (usesCfb24) {
FatalError("24-bit pixel size is not supported on systems with"
" 64-bit scanlines.\n");
}
}
#endif
#ifdef XKB
xf86InitXkb();
#endif