diff options
| author | Matt Turner <mattst88@gmail.com> | 2010-09-23 00:05:09 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2010-09-23 00:31:25 -0400 |
| commit | b4acf1fb50f1560d177e8e7912ef27ddca80d209 (patch) | |
| tree | e2c4776925f736aeb6474e3145f7b9a3cf784bf2 | |
| parent | 7669aeb2a170c246089043bb4d203c25cbfe5e95 (diff) | |
Delete CFB
ajax killed cfb in April 2008 (0dab6fa3582b70ccd0f01459902415c28dbc81ff).
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/glint_driver.c | 35 |
2 files changed, 1 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index acef5c7..c4d1f5e 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,6 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) -AC_CHECK_HEADER(cfb8_32.h,[AC_DEFINE(HAVE_CFB8_32, 1, [Have cfb8_32 support])],[]) CPPFLAGS="$SAVE_CPPFLAGS" if test "x$XSERVER_LIBPCIACCESS" = xyes; then diff --git a/src/glint_driver.c b/src/glint_driver.c index a0b378a..6c78363 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -2725,9 +2725,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; GLINTPtr pGlint = GLINTPTR(pScrn); int ret, displayWidth; -#if HAVE_CFB8_32 - int init_picture = 0; -#endif unsigned char *FBStart; VisualPtr visual; @@ -2819,30 +2816,11 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) case 8: case 16: case 24: -#if !HAVE_CFB8_32 case 32: -#endif ret = fbScreenInit(pScreen, FBStart, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, displayWidth, pScrn->bitsPerPixel); -#if HAVE_CFB8_32 - init_picture = 1; - break; - case 32: - if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR) - ret = cfb8_32ScreenInit(pScreen, FBStart, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - displayWidth); - else { - ret = fbScreenInit(pScreen, FBStart, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - displayWidth, pScrn->bitsPerPixel); - init_picture = 1; - } -#endif break; default: xf86DrvMsg(scrnIndex, X_ERROR, @@ -2880,10 +2858,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } /* must be after RGB ordering fixed */ -#if HAVE_CFB8_32 - if (init_picture) -#endif - fbPictureInit(pScreen, 0, 0); + fbPictureInit(pScreen, 0, 0); if (!pGlint->NoAccel) { switch (pGlint->Chipset) { @@ -3011,14 +2986,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } -#if HAVE_CFB8_32 - if((pScrn->overlayFlags & OVERLAY_8_32_PLANAR) && - (pScrn->bitsPerPixel == 32)) { - if(!xf86Overlay8Plus32Init(pScreen)) - return FALSE; - } -#endif - if(pGlint->ShadowFB) ShadowFBInit(pScreen, GLINTRefreshArea); |