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/g80_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/g80_xaa.c')
-rw-r--r-- | src/g80_xaa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/g80_xaa.c b/src/g80_xaa.c index a8ae4ae..f7276f2 100644 --- a/src/g80_xaa.c +++ b/src/g80_xaa.c @@ -105,6 +105,7 @@ G80SetClip(G80Ptr pNv, int x, int y, int w, int h) G80DmaNext (pNv, h); } +#ifdef HAVE_XAA_H /* Screen to screen copies */ static void @@ -481,11 +482,12 @@ G80DisableClipping(ScrnInfoPtr pScrn) G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); } - +#endif Bool G80XAAInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); G80Ptr pNv = G80PTR(pScrn); XAAInfoRecPtr xaa; @@ -551,4 +553,7 @@ G80XAAInit(ScreenPtr pScreen) miSetZeroLineBias(pScreen, OCTANT1 | OCTANT3 | OCTANT4 | OCTANT6); return XAAInit(pScreen, xaa); +#else + return FALSE; +#endif } |