diff options
Diffstat (limited to 'src/savage_dga.c')
| -rw-r--r-- | src/savage_dga.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/savage_dga.c b/src/savage_dga.c index cb541d3..413e0e7 100644 --- a/src/savage_dga.c +++ b/src/savage_dga.c @@ -34,8 +34,9 @@ in this Software without prior written authorization from the XFree86 Project. * */ - +#ifdef HAVE_XAA_H #include "xaalocal.h" +#endif #include "savage_driver.h" #include "dgaproc.h" @@ -46,9 +47,10 @@ static Bool Savage_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, static Bool Savage_SetMode(ScrnInfoPtr, DGAModePtr); static int Savage_GetViewport(ScrnInfoPtr); static void Savage_SetViewport(ScrnInfoPtr, int, int, int); +#ifdef HAVE_XAA_H static void Savage_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); static void Savage_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); - +#endif static DGAFunctionRec Savage_DGAFuncs = { @@ -58,8 +60,12 @@ DGAFunctionRec Savage_DGAFuncs = { Savage_SetViewport, Savage_GetViewport, SavageAccelSync, +#ifdef HAVE_XAA_H Savage_FillRect, Savage_BlitRect, +#else + NULL, NULL, +#endif NULL /* BlitTransRect */ }; @@ -127,8 +133,10 @@ SECOND_PASS: mode->mode = pMode; mode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; +#ifdef HAVE_XAA_H if(!psav->NoAccel) mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT; +#endif if(pMode->Flags & V_DBLSCAN) mode->flags |= DGA_DOUBLESCAN; if(pMode->Flags & V_INTERLACE) @@ -341,6 +349,7 @@ Savage_SetViewport( psav->DGAViewportStatus = 0; /* MGAAdjustFrame loops until finished */ } +#ifdef HAVE_XAA_H static void Savage_FillRect ( ScrnInfoPtr pScrn, @@ -376,7 +385,7 @@ Savage_BlitRect( SET_SYNC_FLAG(psav->AccelInfoRec); } } - +#endif static Bool Savage_OpenFramebuffer( |