diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-16 16:35:28 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-16 16:35:28 +0000 |
| commit | e8bb11871da3e4cf4aaba6a49966f19deffa1b83 (patch) | |
| tree | 0294e09591cfa362113bf0b93d8a1f2ffd13596e /driver/xf86-video-nv/src/g80_xaa.c | |
| parent | ff80fe58611b5db1d325e426eea516503bed5430 (diff) | |
Update to xf86-video-nv 2.1.20
Diffstat (limited to 'driver/xf86-video-nv/src/g80_xaa.c')
| -rw-r--r-- | driver/xf86-video-nv/src/g80_xaa.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/driver/xf86-video-nv/src/g80_xaa.c b/driver/xf86-video-nv/src/g80_xaa.c index ce218991e..f7276f24c 100644 --- a/driver/xf86-video-nv/src/g80_xaa.c +++ b/driver/xf86-video-nv/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,12 +482,13 @@ G80DisableClipping(ScrnInfoPtr pScrn) G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); } - +#endif Bool G80XAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; +#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 } |