summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--uxa/uxa-accel.c8
-rw-r--r--uxa/uxa-priv.h7
2 files changed, 10 insertions, 5 deletions
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 785855cc..1b0af9c4 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -493,9 +493,9 @@ uxa_copy_area(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
srcx, srcy, width, height, dstx, dsty);
}
- return fbDoCopy (pSrcDrawable, pDstDrawable, pGC,
- srcx, srcy, width, height,
- dstx, dsty, uxa_copy_n_to_n, 0, NULL);
+ return miDoCopy (pSrcDrawable, pDstDrawable, pGC,
+ srcx, srcy, width, height,
+ dstx, dsty, uxa_copy_n_to_n, 0, NULL);
}
static void
@@ -841,7 +841,7 @@ uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-pPixmap->screen_x, -pPixmap->screen_y);
#endif
- fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
+ miCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
NULL,
&rgnDst, dx, dy, uxa_copy_n_to_n, 0, NULL);
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
index 463749a7..ae3fb2a9 100644
--- a/uxa/uxa-priv.h
+++ b/uxa/uxa-priv.h
@@ -61,7 +61,12 @@
#endif
#include "damage.h"
-#define DEBUG_TRACE_FALL 0
+/* 1.6 and earlier server compat */
+#ifndef miGetCompositeClip
+#define miCopyRegion fbCopyRegion
+#define miDoCopy fbDoCopy
+#endif
+
#define DEBUG_MIGRATE 0
#define DEBUG_PIXMAP 0
#define DEBUG_OFFSCREEN 0