1 files changed, 0 insertions, 66 deletions
diff --git a/src/cir_dga.c b/src/cir_dga.c
index bf3a9dd..92d32da 100644
--- a/src/cir_dga.c
+++ b/src/cir_dga.c
@@ -30,10 +30,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#ifdef HAVE_XAA_H
-#include "xaa.h"
-#include "xaalocal.h"
-#endif
 #include "vgaHW.h"
 #include "cir.h"
 #include "dgaproc.h"
@@ -43,15 +39,6 @@ static Bool Cir_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
 static Bool Cir_SetMode(ScrnInfoPtr, DGAModePtr);
 static int  Cir_GetViewport(ScrnInfoPtr);
 static void Cir_SetViewport(ScrnInfoPtr, int, int, int);
-#ifdef HAVE_XAA_H
-static void Cir_Sync(ScrnInfoPtr);
-static void Cir_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
-static void Cir_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
-/*
-static void Cir_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
-                                unsigned long);
-*/
-#endif
 
 static
 DGAFunctionRec CirDGAFuncs = {
@@ -60,13 +47,7 @@ DGAFunctionRec CirDGAFuncs = {
    Cir_SetMode,
    Cir_SetViewport,
    Cir_GetViewport,
-#ifdef HAVE_XAA_H
-   Cir_Sync,
-   Cir_FillRect,
-   Cir_BlitRect,
-#else
    NULL, NULL, NULL,
-#endif
    NULL  /* Cir_BlitTransRect */
 };
 
@@ -215,50 +196,3 @@ Cir_GetViewport(
     return pCir->DGAViewportStatus;
 }
 
-#ifdef HAVE_XAA_H
-static void 
-Cir_Sync(
-   ScrnInfoPtr pScrn
-){
-    CirPtr pCir = CIRPTR(pScrn);
-    if(pCir->AccelInfoRec) {
-	(*pCir->AccelInfoRec->Sync)(pScrn);
-    }
-}
-
-static void 
-Cir_FillRect (
-   ScrnInfoPtr pScrn, 
-   int x, int y, int w, int h, 
-   unsigned long color
-){
-    CirPtr pCir = CIRPTR(pScrn);
-
-    if(pCir->AccelInfoRec) {
-	(*pCir->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
-	(*pCir->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
-	SET_SYNC_FLAG(pCir->AccelInfoRec);
-    }
-}
-
-static void 
-Cir_BlitRect(
-   ScrnInfoPtr pScrn, 
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty
-){
-    CirPtr pCir = CIRPTR(pScrn);
-
-    if(pCir->AccelInfoRec) {
-	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
-	int ydir = (srcy < dsty) ? -1 : 1;
-
-	(*pCir->AccelInfoRec->SetupForScreenToScreenCopy)(
-		pScrn, xdir, ydir, GXcopy, ~0, -1);
-	(*pCir->AccelInfoRec->SubsequentScreenToScreenCopy)(
-		pScrn, srcx, srcy, dstx, dsty, w, h);
-	SET_SYNC_FLAG(pCir->AccelInfoRec);
-    }
-}
-#endif