diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-11 10:07:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-11 10:07:27 +0000 |
| commit | 4d5b615983744aee116fd9f459e35f2660789c63 (patch) | |
| tree | 7bfdea7a6252849474485382c761f5be51d455d6 /driver/xf86-video-i128/src/i128accel.c | |
| parent | 917dae2f82c95e6fcf4e322e45eee6481f343ec8 (diff) | |
Update to xf86-video-i128 1.3.6
Diffstat (limited to 'driver/xf86-video-i128/src/i128accel.c')
| -rw-r--r-- | driver/xf86-video-i128/src/i128accel.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/driver/xf86-video-i128/src/i128accel.c b/driver/xf86-video-i128/src/i128accel.c index 6fb8c0f07..fd65c979b 100644 --- a/driver/xf86-video-i128/src/i128accel.c +++ b/driver/xf86-video-i128/src/i128accel.c @@ -26,8 +26,7 @@ #include "config.h" #endif -#include "xaa.h" -#include "xaalocal.h" + #include "xf86fbman.h" #include "miline.h" #include "servermd.h" @@ -40,6 +39,9 @@ #include "i128.h" #include "i128reg.h" +#ifdef HAVE_XAA_H +#include "xaalocal.h" + static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h); static void I128SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, @@ -62,6 +64,7 @@ static void I128ScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox, unsigned planemask); #endif +#endif #define ENG_PIPELINE_READY() { while (pI128->mem.rbase_a[BUSY] & BUSY_BUSY) ; } #define ENG_DONE() { while (pI128->mem.rbase_a[FLOW] & (FLOW_DEB | FLOW_MCB | FLOW_PRV)) ;} @@ -100,7 +103,7 @@ I128EngineDone(ScrnInfoPtr pScrn) ENG_DONE(); } - +#ifdef HAVE_XAA_H static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h) { @@ -412,11 +415,14 @@ I128ScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox, DDXPointPtr pptSrc, } #endif +#endif + Bool I128XaaInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); BoxRec AvailFBArea; CARD32 buf_ctrl; @@ -519,4 +525,7 @@ I128XaaInit(ScreenPtr pScreen) } return(XAAInit(pScreen, infoPtr)); +#else + return FALSE; +#endif } |