diff options
Diffstat (limited to 'driver/xf86-video-savage/src/savage_xaa.c')
| -rw-r--r-- | driver/xf86-video-savage/src/savage_xaa.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/driver/xf86-video-savage/src/savage_xaa.c b/driver/xf86-video-savage/src/savage_xaa.c index 4565ffdcb..858cb9775 100644 --- a/driver/xf86-video-savage/src/savage_xaa.c +++ b/driver/xf86-video-savage/src/savage_xaa.c @@ -14,10 +14,13 @@ #endif #include <X11/Xarch.h> +#include "savage_driver.h" +#ifdef HAVE_XAA_H #include "xaalocal.h" #include "xaarop.h" + #include "miline.h" -#include "savage_driver.h" + #include "savage_bci.h" extern int gSavageEntityIndex; @@ -146,12 +149,13 @@ void SavageRestoreAccelState(ScrnInfoPtr pScrn) return; } - +#endif Bool SavageXAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; +#ifdef HAVE_XAA_H + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SavagePtr psav = SAVPTR(pScrn); XAAInfoRecPtr xaaptr; BoxRec AvailFBArea; @@ -344,7 +348,9 @@ SavageXAAInit(ScreenPtr pScreen) return XAAInit(pScreen, xaaptr); - +#else + return FALSE; +#endif } /* The sync function for the GE */ @@ -355,7 +361,7 @@ SavageAccelSync(ScrnInfoPtr pScrn) psav->WaitIdleEmpty(psav); } - +#ifdef HAVE_XAA_H /* * The XAA ROP helper routines all assume that a solid color is a * "pattern". The Savage chips, however, apply a non-stippled solid @@ -1020,3 +1026,4 @@ void SavageSubsequentImageWriteRect BCI_SEND(BCI_W_H(w, h)); } +#endif |