diff options
Diffstat (limited to 'src/glint_dga.c')
| -rw-r--r-- | src/glint_dga.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/glint_dga.c b/src/glint_dga.c index 6e62e8c..24bf6c9 100644 --- a/src/glint_dga.c +++ b/src/glint_dga.c @@ -29,9 +29,10 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xaa.h" -#include "xaalocal.h" #include "glint.h" +#ifdef HAVE_XAA_H +#include "xaalocal.h" +#endif #include "glint_regs.h" #include "dgaproc.h" @@ -41,8 +42,10 @@ static Bool GLINT_SetMode(ScrnInfoPtr, DGAModePtr); static void GLINT_Sync(ScrnInfoPtr); static int GLINT_GetViewport(ScrnInfoPtr); static void GLINT_SetViewport(ScrnInfoPtr, int, int, int); +#ifdef HAVE_XAA_H static void GLINT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); static void GLINT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); +#endif static DGAFunctionRec GLINTDGAFuncs = { @@ -52,8 +55,12 @@ DGAFunctionRec GLINTDGAFuncs = { GLINT_SetViewport, GLINT_GetViewport, GLINT_Sync, +#ifdef HAVE_XAA_H GLINT_FillRect, GLINT_BlitRect, +#else + NULL, NULL, +#endif NULL }; @@ -93,8 +100,10 @@ SECOND_PASS: currentMode->mode = pMode; currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; +#ifdef HAVE_XAA_H if(!pGlint->NoAccel) currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT; +#endif if(pMode->Flags & V_DBLSCAN) currentMode->flags |= DGA_DOUBLESCAN; if(pMode->Flags & V_INTERLACE) @@ -206,6 +215,7 @@ GLINT_SetViewport( pGlint->DGAViewportStatus = 0; /* GLINTAdjustFrame loops until finished */ } +#ifdef HAVE_XAA_H static void GLINT_FillRect ( ScrnInfoPtr pScrn, @@ -220,18 +230,21 @@ GLINT_FillRect ( SET_SYNC_FLAG(pGlint->AccelInfoRec); } } +#endif static void GLINT_Sync( ScrnInfoPtr pScrn ){ GLINTPtr pGlint = GLINTPTR(pScrn); - +#ifdef HAVE_XAA_H if(pGlint->AccelInfoRec) { (*pGlint->AccelInfoRec->Sync)(pScrn); } +#endif } +#ifdef HAVE_XAA_H static void GLINT_BlitRect( ScrnInfoPtr pScrn, @@ -252,7 +265,7 @@ GLINT_BlitRect( SET_SYNC_FLAG(pGlint->AccelInfoRec); } } - +#endif static Bool GLINT_OpenFramebuffer( ScrnInfoPtr pScrn, |