diff options
Diffstat (limited to 'src/s3v_accel.c')
| -rw-r--r-- | src/s3v_accel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/s3v_accel.c b/src/s3v_accel.c index 7837e4a..cf9a4e2 100644 --- a/src/s3v_accel.c +++ b/src/s3v_accel.c @@ -34,11 +34,11 @@ in this Software without prior written authorization from the XFree86 Project. #include "miline.h" /* fb includes are in s3v.h */ -#include "xaalocal.h" #include "xaarop.h" #include "servermd.h" /* LOG2_BYTES_PER_SCANLINE_PAD */ +#ifdef HAVE_XAA_H static void S3VWriteMask(CARD32*, int); static void S3VEngineReset(ScrnInfoPtr pScrn); @@ -75,11 +75,12 @@ static void S3VPolylinesThinSolidWrapper(DrawablePtr, GCPtr, int, int, static void S3VPolySegmentThinSolidWrapper(DrawablePtr, GCPtr, int, xSegment*); #endif static void S3VNopAllCmdSets(ScrnInfoPtr pScrn); - +#endif Bool S3VAccelInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; S3VPtr ps3v = S3VPTR(pScrn); @@ -232,9 +233,11 @@ S3VAccelInit(ScreenPtr pScreen) infoPtr->maxOffPixHeight = 2048; return (XAAInit(pScreen, infoPtr)); +#else + return FALSE; +#endif } - Bool S3VAccelInit32(ScreenPtr pScreen) { @@ -537,6 +540,7 @@ S3VWriteMask( return; } +#ifdef HAVE_XAA_H /************************\ | Solid Filled Rects | @@ -967,6 +971,7 @@ S3VSubsequentSolidHorVertLinePlaneMask( S3VWriteMask((CARD32*)ps3v->MapBaseDense, dwords); } +#endif void S3VWaitFifoGX2(S3VPtr ps3v, int slots ) |