summaryrefslogtreecommitdiff
path: root/src/atiaccel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/atiaccel.c')
-rw-r--r--src/atiaccel.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/src/atiaccel.c b/src/atiaccel.c
index 050019d..99efae9 100644
--- a/src/atiaccel.c
+++ b/src/atiaccel.c
@@ -33,6 +33,7 @@
#include "atimach64accel.h"
#include "atistruct.h"
+#ifdef USE_XAA
/*
* ATIInitializeAcceleration --
*
@@ -47,8 +48,6 @@ ATIInitializeAcceleration
ATIPtr pATI
)
{
- int maxScanlines = 32767, maxPixelArea, PixelArea;
-
if (pATI->OptionAccel)
{
if (!(pATI->pXAAInfo = XAACreateInfoRec()))
@@ -57,7 +56,7 @@ ATIInitializeAcceleration
switch (pATI->Adapter)
{
case ATI_ADAPTER_MACH64:
- maxScanlines = ATIMach64AccelInit(pATI, pATI->pXAAInfo);
+ ATIMach64AccelInit(pATI, pATI->pXAAInfo);
break;
default:
@@ -65,31 +64,6 @@ ATIInitializeAcceleration
}
}
-#ifndef AVOID_CPIO
-
- if (!pATI->BankInfo.BankSize)
-
-#endif /* AVOID_CPIO */
-
-#ifdef XF86DRI_DEVEL
-
- /* If DRI is enabled, we've already set up the FB manager in ATIScreenInit */
- if (!pATI->directRenderingEnabled)
-
-#endif /* XF86DRI */
- {
- /*
- * Note: If PixelArea exceeds the engine's maximum, the excess is
- * never used, even though it would be useful for such things
- * as XVideo buffers.
- */
- maxPixelArea = maxScanlines * pScreenInfo->displayWidth;
- PixelArea = pScreenInfo->videoRam * 1024 * 8 / pATI->bitsPerPixel;
- if (PixelArea > maxPixelArea)
- PixelArea = maxPixelArea;
- xf86InitFBManagerArea(pScreen, PixelArea, 2);
- }
-
if (!pATI->OptionAccel || XAAInit(pScreen, pATI->pXAAInfo))
return TRUE;
@@ -144,3 +118,4 @@ ATIResizeOffscreenLinear
return pLinear;
}
+#endif /* USE_XAA */