diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-07-13 14:33:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-07-13 14:33:47 +1000 |
| commit | 138d1ea01298aedbe414ecc48374e433d6960010 (patch) | |
| tree | 9285a6c55d4bcff924497644e95e81192455ff50 /src/ast_accel.c | |
| parent | eafaa2666fa43d6b06bec013feb254ea92759406 (diff) | |
ast: deal with XAA removal.
This deals with the removal of XAA from the server, should
fix tinderbox.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/ast_accel.c')
| -rw-r--r-- | src/ast_accel.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ast_accel.c b/src/ast_accel.c index f85692b..34f9c65 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -45,7 +45,9 @@ #include "xf86fbman.h" /* include xaa includes */ +#ifdef HAVE_XAA_H #include "xaa.h" +#endif #include "xaarop.h" /* H/W cursor support */ @@ -103,6 +105,7 @@ extern Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam); /* Prototype type declaration */ Bool ASTAccelInit(ScreenPtr pScreen); +#ifdef HAVE_XAA_H static void ASTSync(ScrnInfoPtr pScrn); static void ASTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir, int rop, @@ -157,10 +160,12 @@ static void AIPSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn, static void AIPSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int flags, int phase); +#endif Bool ASTAccelInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ASTRecPtr pAST = ASTPTR(pScrn); @@ -283,10 +288,12 @@ ASTAccelInit(ScreenPtr pScreen) } return(XAAInit(pScreen, infoPtr)); - +#else + return TRUE; +#endif } /* end of ASTAccelInit */ - +#ifdef HAVE_XAA_H static void ASTSync(ScrnInfoPtr pScrn) { @@ -1684,6 +1691,7 @@ AIPSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn, } } +#endif #ifdef AstVideo /* |