summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-07-13 14:33:47 +1000
committerDave Airlie <airlied@gmail.com>2012-07-13 14:33:47 +1000
commit138d1ea01298aedbe414ecc48374e433d6960010 (patch)
tree9285a6c55d4bcff924497644e95e81192455ff50 /src
parenteafaa2666fa43d6b06bec013feb254ea92759406 (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')
-rw-r--r--src/ast.h6
-rw-r--r--src/ast_2dtool.c2
-rw-r--r--src/ast_accel.c12
-rw-r--r--src/ast_cursor.c1
-rw-r--r--src/ast_driver.c6
-rw-r--r--src/ast_mode.c1
-rw-r--r--src/ast_tool.c1
-rw-r--r--src/ast_vgatool.c1
8 files changed, 20 insertions, 10 deletions
diff --git a/src/ast.h b/src/ast.h
index 09bf1bd..83ce1a6 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -23,6 +23,10 @@
#include <string.h>
#include <stdlib.h>
+#ifdef HAVE_XAA_H
+#include "xaa.h"
+#endif
+
#include "ast_pcirename.h"
#include "compat-api.h"
@@ -204,7 +208,9 @@ typedef struct _ASTRec {
OptionInfoPtr Options;
DisplayModePtr ModePtr;
FBLinearPtr pCMDQPtr;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoPtr;
+#endif
xf86CursorInfoPtr HWCInfoPtr;
FBLinearPtr pHWCPtr;
diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
index ba58a08..bb99f9d 100644
--- a/src/ast_2dtool.c
+++ b/src/ast_2dtool.c
@@ -44,8 +44,6 @@
/* framebuffer offscreen manager */
#include "xf86fbman.h"
-/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */
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
/*
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index 4fcbf95..f967ce9 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -45,7 +45,6 @@
#include "xf86fbman.h"
/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 7d7c035..080b051 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -49,7 +49,6 @@
#include "xf86fbman.h"
/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */
@@ -714,7 +713,9 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Accelaration Check */
pAST->noAccel = TRUE;
+#ifdef HAVE_XAA_H
pAST->AccelInfoPtr = NULL;
+#endif
pAST->pCMDQPtr = NULL;
pAST->CMDQInfo.ulCMDQSize = 0;
#ifdef Accel_2D
@@ -1246,11 +1247,12 @@ ASTCloseScreen(CLOSE_SCREEN_ARGS_DECL)
vgaHWUnmapMem(pScrn);
#endif
+#ifdef HAVE_XAA_H
if(pAST->AccelInfoPtr) {
XAADestroyInfoRec(pAST->AccelInfoPtr);
pAST->AccelInfoPtr = NULL;
}
-
+#endif
if(pAST->HWCInfoPtr) {
xf86DestroyCursorInfoRec(pAST->HWCInfoPtr);
pAST->HWCInfoPtr = NULL;
diff --git a/src/ast_mode.c b/src/ast_mode.c
index 6073ed1..3238f39 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -45,7 +45,6 @@
#include "xf86fbman.h"
/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */
diff --git a/src/ast_tool.c b/src/ast_tool.c
index 1dd87f0..d11f20d 100644
--- a/src/ast_tool.c
+++ b/src/ast_tool.c
@@ -45,7 +45,6 @@
#include "xf86fbman.h"
/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index 152db1d..ed8c906 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -45,7 +45,6 @@
#include "xf86fbman.h"
/* include xaa includes */
-#include "xaa.h"
#include "xaarop.h"
/* H/W cursor support */