diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-07-16 18:48:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-07-16 18:48:32 +1000 |
| commit | e5e3e733d933fc3accdd6c3c7a02df5950530cae (patch) | |
| tree | b681c75b4536050a4165ed4f129db8ec8d21f14e /src/nv_xaa.c | |
| parent | 713e9501b87465cf2a62c27605b6fc4a454dad95 (diff) | |
nv: make XAA optional.
This allows nv to build without XAA.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/nv_xaa.c')
| -rw-r--r-- | src/nv_xaa.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nv_xaa.c b/src/nv_xaa.c index c179f1f..bf2b4d2 100644 --- a/src/nv_xaa.c +++ b/src/nv_xaa.c @@ -26,7 +26,9 @@ #endif #include "nv_include.h" +#ifdef HAVE_XAA_H #include "xaalocal.h" +#endif #include "miline.h" #include "nv_dma.h" @@ -298,7 +300,7 @@ NVDMAKickoffCallback (ScrnInfoPtr pScrn) pNv->DMAKickoffCallback = NULL; } - +#ifdef HAVE_XAA_H static void NVSetupForScreenToScreenCopy( ScrnInfoPtr pScrn, @@ -646,11 +648,13 @@ NVDisableClipping(ScrnInfoPtr pScrn) NVDmaNext (pNv, 0x7FFF7FFF); } +#endif /* Initialize XAA acceleration info */ Bool NVAccelInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); NVPtr pNv = NVPTR(pScrn); XAAInfoRecPtr accel; @@ -710,4 +714,7 @@ NVAccelInit(ScreenPtr pScreen) miSetZeroLineBias(pScreen, OCTANT1 | OCTANT3 | OCTANT4 | OCTANT6); return (XAAInit(pScreen, accel)); +#else + return FALSE; +#endif } |