summaryrefslogtreecommitdiff
path: root/src/atiscreen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/atiscreen.c')
-rw-r--r--src/atiscreen.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/atiscreen.c b/src/atiscreen.c
index ca41ff1a..b9984ae9 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -61,9 +61,6 @@
#include "shadowfb.h"
#include "xf86cmap.h"
-#include "xf1bpp.h"
-#include "xf4bpp.h"
-
#include "fb.h"
#include "mibank.h"
@@ -457,23 +454,6 @@ ATIScreenInit
/* Initialise framebuffer layer */
switch (pATI->bitsPerPixel)
{
-
-#ifndef AVOID_CPIO
-
- case 1:
- pATI->Closeable = xf1bppScreenInit(pScreen, pFB,
- pScreenInfo->virtualX, pScreenInfo->virtualY,
- pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
- break;
-
- case 4:
- pATI->Closeable = xf4bppScreenInit(pScreen, pFB,
- pScreenInfo->virtualX, pScreenInfo->virtualY,
- pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
- break;
-
-#endif /* AVOID_CPIO */
-
case 8:
case 16:
case 24:
@@ -512,7 +492,6 @@ ATIScreenInit
}
/* If applicable, initialise RENDER extension */
- if (pATI->bitsPerPixel > 4)
{
if (pATI->OptionShadowFB)
{
@@ -612,24 +591,11 @@ ATIScreenInit
if (!miCreateDefColormap(pScreen))
return FALSE;
-#ifdef AVOID_CPIO
-
if (!xf86HandleColormaps(pScreen, 256, pATI->rgbBits, ATILoadPalette, NULL,
CMAP_PALETTED_TRUECOLOR |
CMAP_LOAD_EVEN_IF_OFFSCREEN))
return FALSE;
-#else /* AVOID_CPIO */
-
- if (pATI->depth > 1)
- if (!xf86HandleColormaps(pScreen, (pATI->depth == 4) ? 16 : 256,
- pATI->rgbBits, ATILoadPalette, NULL,
- CMAP_PALETTED_TRUECOLOR |
- CMAP_LOAD_EVEN_IF_OFFSCREEN))
- return FALSE;
-
-#endif /* AVOID_CPIO */
-
/* Initialise shadow framebuffer */
if (pATI->OptionShadowFB &&
!ShadowFBInit(pScreen, ATIRefreshArea))