glint: build against server with no XAA support.

This removes the XAA bits so it builds against latest server.

Signed-off-by: Dave Airlie <airlied@redhat.com>

10 files changed, 83 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index 0f068b5..2d49e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,23 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
+AC_ARG_ENABLE(xaa,
+              AS_HELP_STRING([--enable-xaa],
+                             [Enable legacy X Acceleration Architecture (XAA) [default=auto]]),
+              [XAA="$enableval"],
+              [XAA=auto])
+if test "x$XAA" != xno; then
+        save_CFLAGS=$CFLAGS
+        save_CPPFLAGS=$CPPFLAGS
+        CFLAGS=$XORG_CFLAGS
+        CPPFLAGS="$XORG_CFLAGS"
+        AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+        CFLAGS=$save_CFLAGS
+        CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
 
 AC_SUBST([moduledir])
 
diff --git a/src/glint.h b/src/glint.h
index 2d4cf47..b58be67 100644
--- a/src/glint.h
+++ b/src/glint.h
@@ -35,7 +35,10 @@
 
 #include "glintpcirename.h"
 
+#ifdef HAVE_XAA_H
 #include "xaa.h"
+#endif
+#include "xf86fbman.h"
 #include "xf86RamDac.h"
 #include "xf86cmap.h"
 #include "xf86i2c.h"
@@ -142,7 +145,9 @@ typedef struct {
     CARD32		PixelWidth;
     RamDacRecPtr	RamDacRec;
     xf86CursorInfoPtr	CursorInfoRec;
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr	AccelInfoRec;
+#endif
     CloseScreenProcPtr	CloseScreen;
     ScreenBlockHandlerProcPtr BlockHandler;
     GCPtr		CurrentGC;
diff --git a/src/glint_dga.c b/src/glint_dga.c
index 6e62e8c..24bf6c9 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -29,9 +29,10 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xaa.h"
-#include "xaalocal.h"
 #include "glint.h"
+#ifdef HAVE_XAA_H
+#include "xaalocal.h"
+#endif
 #include "glint_regs.h"
 #include "dgaproc.h"
 
@@ -41,8 +42,10 @@ static Bool GLINT_SetMode(ScrnInfoPtr, DGAModePtr);
 static void GLINT_Sync(ScrnInfoPtr);
 static int  GLINT_GetViewport(ScrnInfoPtr);
 static void GLINT_SetViewport(ScrnInfoPtr, int, int, int);
+#ifdef HAVE_XAA_H
 static void GLINT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
 static void GLINT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+#endif
 
 static
 DGAFunctionRec GLINTDGAFuncs = {
@@ -52,8 +55,12 @@ DGAFunctionRec GLINTDGAFuncs = {
    GLINT_SetViewport,
    GLINT_GetViewport,
    GLINT_Sync,
+#ifdef HAVE_XAA_H
    GLINT_FillRect,
    GLINT_BlitRect,
+#else
+   NULL, NULL,
+#endif
    NULL
 };
 
@@ -93,8 +100,10 @@ SECOND_PASS:
 
 	currentMode->mode = pMode;
 	currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+#ifdef HAVE_XAA_H
 	if(!pGlint->NoAccel)
 	   currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+#endif
 	if(pMode->Flags & V_DBLSCAN)
 	   currentMode->flags |= DGA_DOUBLESCAN;
 	if(pMode->Flags & V_INTERLACE)
@@ -206,6 +215,7 @@ GLINT_SetViewport(
    pGlint->DGAViewportStatus = 0;  /* GLINTAdjustFrame loops until finished */
 }
 
+#ifdef HAVE_XAA_H
 static void 
 GLINT_FillRect (
    ScrnInfoPtr pScrn, 
@@ -220,18 +230,21 @@ GLINT_FillRect (
 	SET_SYNC_FLAG(pGlint->AccelInfoRec);
     }
 }
+#endif
 
 static void 
 GLINT_Sync(
    ScrnInfoPtr pScrn
 ){
     GLINTPtr pGlint = GLINTPTR(pScrn);
-
+#ifdef HAVE_XAA_H
     if(pGlint->AccelInfoRec) {
 	(*pGlint->AccelInfoRec->Sync)(pScrn);
     }
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void 
 GLINT_BlitRect(
    ScrnInfoPtr pScrn, 
@@ -252,7 +265,7 @@ GLINT_BlitRect(
 	SET_SYNC_FLAG(pGlint->AccelInfoRec);
     }
 }
-
+#endif
 static Bool 
 GLINT_OpenFramebuffer(
    ScrnInfoPtr pScrn, 
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 19e39a8..b6d20a9 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -3301,8 +3301,10 @@ GLINTCloseScreen(CLOSE_SCREEN_ARGS_DECL)
 	}
         GLINTUnmapMem(pScrn);
     }
+#ifdef HAVE_XAA_H
     if(pGlint->AccelInfoRec)
 	XAADestroyInfoRec(pGlint->AccelInfoRec);
+#endif
     if(pGlint->CursorInfoRec)
 	xf86DestroyCursorInfoRec(pGlint->CursorInfoRec);
     free(pGlint->ShadowPtr);
diff --git a/src/pm2_accel.c b/src/pm2_accel.c
index 9309789..921df94 100644
--- a/src/pm2_accel.c
+++ b/src/pm2_accel.c
@@ -48,6 +48,7 @@
 #include "glint_regs.h"
 #include "glint.h"
 
+#ifdef HAVE_XAA_H
 #include "xaalocal.h"		/* For replacements */
 
 #define DEBUG 0
@@ -241,10 +242,12 @@ Permedia2InitializeEngine(ScrnInfoPtr pScrn)
 
     TRACE_EXIT("Permedia2InitializeEngine");
 }
+#endif
 
 Bool
 Permedia2AccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -368,8 +371,12 @@ Permedia2AccelInit(ScreenPtr pScreen)
     xf86InitFBManager(pScreen, &AvailFBArea);
 
     return(XAAInit(pScreen, infoPtr));
+#else
+    return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void Permedia2LoadCoord(
 	ScrnInfoPtr pScrn,
 	int x, int y,
@@ -1501,3 +1508,4 @@ Permedia2WritePixmap32bpp(
     Permedia2DisableClipping(pScrn);
     SET_SYNC_FLAG(infoRec);
 }
+#endif
diff --git a/src/pm3_accel.c b/src/pm3_accel.c
index 646bd4f..bd108a3 100644
--- a/src/pm3_accel.c
+++ b/src/pm3_accel.c
@@ -45,6 +45,7 @@
 #include "pm3_regs.h"
 #include "glint.h"
 
+#ifdef HAVE_XAA_H
 #include "xaalocal.h"		/* For replacements */
 
 #define DEBUG 0
@@ -380,10 +381,11 @@ Permedia3InitializeEngine(ScrnInfoPtr pScrn)
     	(*pGlint->AccelInfoRec->Sync)(pScrn);
     TRACE_EXIT("Permedia3InitializeEngine");
 }
-
+#endif
 Bool
 Permedia3AccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -487,6 +489,9 @@ Permedia3AccelInit(ScreenPtr pScreen)
     Permedia3EnableOffscreen(pScreen);
 
     return(XAAInit(pScreen, infoPtr));
+#else
+    return FALSE;
+#endif
 }
 
 void
@@ -510,6 +515,9 @@ Permedia3EnableOffscreen (ScreenPtr pScreen)
 
     xf86InitFBManager(pScreen, &AvailFBArea);
 }
+
+#ifdef HAVE_XAA_H
+
 #define CHECKCLIPPING				\
 {						\
     if (pGlint->ClippingOn) {			\
@@ -1211,3 +1219,4 @@ Permedia3WriteBitmap(ScrnInfoPtr pScrn,
     Permedia3DisableClipping(pScrn);
     Permedia3Sync(pScrn);
 }
+#endif
diff --git a/src/pm3_video.c b/src/pm3_video.c
index db27d41..6883796 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -38,8 +38,6 @@
 #include "glint_regs.h"
 #include "pm3_regs.h"
 #include <X11/extensions/Xv.h>
-#include "xaa.h"
-#include "xaalocal.h"
 #include "dixstruct.h"
 #include "fourcc.h"
 
diff --git a/src/pm_accel.c b/src/pm_accel.c
index 16f32e2..f6a201a 100644
--- a/src/pm_accel.c
+++ b/src/pm_accel.c
@@ -43,6 +43,7 @@
 #include "glint_regs.h"
 #include "glint.h"
 
+#ifdef HAVE_XAA_H
 #include "miline.h"		/* for octants */
 #include "xaalocal.h"		/* For replacements */
 
@@ -176,10 +177,12 @@ PermediaInitializeEngine(ScrnInfoPtr pScrn)
     GLINT_WRITE_REG(0,dXDom);
     GLINT_WRITE_REG(1<<16,dY);
 }
+#endif
 
 Bool
 PermediaAccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -276,8 +279,12 @@ PermediaAccelInit(ScreenPtr pScreen)
     xf86InitFBManager(pScreen, &AvailFBArea);
 
     return (XAAInit(pScreen, infoPtr));
+#else
+    return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void PermediaLoadCoord(
 	ScrnInfoPtr pScrn,
 	int x, int y,
@@ -1195,3 +1202,4 @@ PermediaSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
                 x, y,  e, dmin, -dmaj, len);
 }
+#endif
diff --git a/src/sx_accel.c b/src/sx_accel.c
index 22aa873..2aadd10 100644
--- a/src/sx_accel.c
+++ b/src/sx_accel.c
@@ -45,6 +45,7 @@
 #include "glint_regs.h"
 #include "glint.h"
 
+#ifdef HAVE_XAA_H
 #include "xaalocal.h"	/* For replacements */
 
 static void SXSync(ScrnInfoPtr pScrn);
@@ -160,10 +161,11 @@ SXInitializeEngine(ScrnInfoPtr pScrn)
     GLINT_SLOW_WRITE_REG(0, dXSub);
     GLINT_SLOW_WRITE_REG(1<<16, dY);
 }
-
+#endif
 Bool
 SXAccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -252,8 +254,12 @@ SXAccelInit(ScreenPtr pScreen)
     xf86InitFBManager(pScreen, &AvailFBArea);
 
     return (XAAInit(pScreen, infoPtr));
+#else
+    return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void SXLoadCoord(
 	ScrnInfoPtr pScrn,
 	int x, int y,
@@ -871,3 +877,4 @@ SXSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
                 x, y,  e, dmin, -dmaj, len);
 }
+#endif
diff --git a/src/tx_accel.c b/src/tx_accel.c
index 099d60c..3e48f34 100644
--- a/src/tx_accel.c
+++ b/src/tx_accel.c
@@ -45,6 +45,7 @@
 #include "glint_regs.h"
 #include "glint.h"
 
+#ifdef HAVE_XAA_H
 #include "xaalocal.h"	/* For replacements */
 
 static void TXSync(ScrnInfoPtr pScrn);
@@ -187,10 +188,12 @@ TXInitializeEngine(ScrnInfoPtr pScrn)
     GLINT_SLOW_WRITE_REG(0, dXDom);
     GLINT_SLOW_WRITE_REG(1<<16, dY);
 }
+#endif
 
 Bool
 TXAccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -282,8 +285,12 @@ TXAccelInit(ScreenPtr pScreen)
     xf86InitFBManager(pScreen, &AvailFBArea);
 
     return (XAAInit(pScreen, infoPtr));
+#else
+    return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void TXLoadCoord(
 	ScrnInfoPtr pScrn,
 	int x, int y,
@@ -943,3 +950,4 @@ TXSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
                 x, y,  e, dmin, -dmaj, len);
 }
+#endif