vmwgfx: Fix up driver build process for Xserver >= 1.7.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

4 files changed, 13 insertions, 5 deletions

diff --git a/saa/saa.c b/saa/saa.c
index e9567e3..9d7436b 100644
--- a/saa/saa.c
+++ b/saa/saa.c
@@ -39,6 +39,7 @@
 #include "dixfontstr.h"
 #include "regionstr.h"
 #include "saa.h"
+#include "saa_priv.h"
 
 #ifdef SAA_DEVPRIVATEKEYREC
 DevPrivateKeyRec saa_screen_index;
diff --git a/saa/saa_accel.c b/saa/saa_accel.c
index be33170..7bd5d61 100644
--- a/saa/saa_accel.c
+++ b/saa/saa_accel.c
@@ -30,6 +30,7 @@
 
 #include "saa.h"
 #include "saa_priv.h"
+#include <mi.h>
 
 Bool
 saa_hw_copy_nton(DrawablePtr pSrcDrawable,
@@ -135,7 +136,13 @@ saa_copy_area(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
 				   srcx, srcy, width, height, dstx, dsty);
     }
 
+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 6)
     return miDoCopy(pSrcDrawable, pDstDrawable, pGC,
 		    srcx, srcy, width, height,
 		    dstx, dsty, saa_copy_nton, 0, NULL);
+#else
+    return fbDoCopy(pSrcDrawable, pDstDrawable, pGC,
+		    srcx, srcy, width, height,
+		    dstx, dsty, saa_copy_nton, 0, NULL);
+#endif
 }
diff --git a/saa/saa_priv.h b/saa/saa_priv.h
index f86f196..c961345 100644
--- a/saa/saa_priv.h
+++ b/saa/saa_priv.h
@@ -181,10 +181,10 @@ saa_gc(GCPtr gc)
 						      &saa_gc_index);
 }
 
-static inline struct saa_pixmap_priv *
+static inline struct saa_pixmap *
 saa_pixmap(PixmapPtr pix)
 {
-    return (struct saa_pixmap_priv *)dixLookupPrivateAddr(&pix->devPrivates,
+    return (struct saa_pixmap *)dixLookupPrivateAddr(&pix->devPrivates,
 							  &saa_pixmap_index);
 }
 
diff --git a/saa/saa_render.c b/saa/saa_render.c
index 1df0dff..8c6e1e6 100644
--- a/saa/saa_render.c
+++ b/saa/saa_render.c
@@ -259,10 +259,10 @@ saa_copy_composite(CARD8 op,
 	}
 
 	ret = saa_hw_copy_nton(pSrc->pDrawable, pDst->pDrawable, NULL,
-			       RegionRects(&region),
-			       RegionNumRects(&region),
+			       REGION_RECTS(&region),
+			       REGION_NUM_RECTS(&region),
 			       xSrc - xDst, ySrc - yDst, FALSE, FALSE);
-	RegionUninit(&region);
+	REGION_UNINIT(pDst->pDrwable.pScreen, &region);
 	if (ret)
 	    return TRUE;
     }