diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-11-11 21:34:16 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-11-11 21:34:16 +0000 |
| commit | 968aa0484af82695d00d90190a06367843f7c16f (patch) | |
| tree | a010f9e295325a1092a4e98f7ba7563281f970d5 /driver/xf86-video-openchrome/src/via_accel.c | |
| parent | ac98071c55b1f3e9283d36052e328c9bf8d0d1a2 (diff) | |
Patch the driver a bit more, to be able to build without XAA.
Diffstat (limited to 'driver/xf86-video-openchrome/src/via_accel.c')
| -rw-r--r-- | driver/xf86-video-openchrome/src/via_accel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/driver/xf86-video-openchrome/src/via_accel.c b/driver/xf86-video-openchrome/src/via_accel.c index 28cba70c5..4dee1c9ba 100644 --- a/driver/xf86-video-openchrome/src/via_accel.c +++ b/driver/xf86-video-openchrome/src/via_accel.c @@ -34,7 +34,9 @@ #endif #include <X11/Xarch.h> +#ifdef USE_XAA #include "xaalocal.h" +#endif #include "miline.h" #include "via.h" @@ -1073,6 +1075,7 @@ viaSetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop, ADVANCE_RING; } +#ifdef USE_XAA static void viaSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int flags) @@ -1349,6 +1352,7 @@ viaInitXAA(ScreenPtr pScreen) } +#endif /* * Mark Sync using the 2D blitter for AGP. NoOp for PCI. * In the future one could even launch a NULL PCI DMA command @@ -2594,10 +2598,12 @@ viaExitAccel(ScreenPtr pScreen) pVia->exaDriverPtr = NULL; return; } +#ifdef _USE_XAA if (pVia->AccelInfoRec) { XAADestroyInfoRec(pVia->AccelInfoRec); pVia->AccelInfoRec = NULL; } +#endif } /* |