Index: vmwarexaa.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v
retrieving revision 1.2
diff -u -r1.2 vmwarexaa.c
--- vmwarexaa.c	23 Apr 2004 19:53:57 -0000	1.2
+++ vmwarexaa.c	7 Sep 2004 03:57:21 -0000
@@ -51,14 +51,15 @@
 static Bool vmwareSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op,
                                                   CARD16 red, CARD16 green,
                                                   CARD16 blue, CARD16 alpha,
-                                                  int alphaType, CARD8 *alphaPtr,
+						  CARD32 maskFormat,
+						  CARD32 dstformat,
+                                                  CARD8 *alphaPtr,
                                                   int alphaPitch,
                                                   int width, int height,
                                                   int flags);
 
 static Bool vmwareSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op,
-                                             int texType, CARD8 *texPtr,
-                                             int texPitch,
+                                             CARD32 srcFormat, CARD32 dstFormat,					     CARD8 *texPtr, int texPitch,
                                              int width, int height,
                                              int flags);
 
@@ -173,7 +174,7 @@
 
                 vmwareXAACreateHeap(pScreen, pScrn, pVMWARE);
 
-                xaaInfo->SetupForCPUToScreenAlphaTexture =
+                xaaInfo->SetupForCPUToScreenAlphaTexture2 =
                    vmwareSetupForCPUToScreenAlphaTexture;
                 xaaInfo->SubsequentCPUToScreenAlphaTexture =
                    vmwareSubsequentCPUToScreenTexture;
@@ -181,7 +182,7 @@
                    XAA_RENDER_NO_SRC_ALPHA;
                 xaaInfo->CPUToScreenAlphaTextureFormats = vmwareAlphaTextureFormats;
 
-                xaaInfo->SetupForCPUToScreenTexture =
+                xaaInfo->SetupForCPUToScreenTexture2 =
                    vmwareSetupForCPUToScreenTexture;
                 xaaInfo->SubsequentCPUToScreenTexture = 
                    vmwareSubsequentCPUToScreenTexture;
@@ -471,8 +472,8 @@
 vmwareSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op,
                                       CARD16 red, CARD16 green,
                                       CARD16 blue, CARD16 alpha,
-                                      int alphaType, CARD8 *alphaPtr,
-                                      int alphaPitch,
+				      CARD32 maskFormat, CARD32 dstFormat,
+                                      CARD8 *alphaPtr, int alphaPitch,
                                       int width, int height,
                                       int flags)
 {
@@ -480,9 +481,9 @@
     SVGASurface* surf;
 
     VmwareLog(("Setup alpha texture (op = %d, r = %d, g = %d, b = %d,"
-               " a = %d, alphaType = %d, alphaPitch = %d, w = %d, h = %d,"
-               " flags = %d)\n", op, red, green, blue, alpha, alphaType,
-               alphaPitch, width, height, flags));
+               " a = %d, maskFormat = %d, dstFormat = %d, alphaPitch = %d,"
+	       " w = %d, h = %d, flags = %d)\n", op, red, green, blue, alpha,
+	       maskFormat, dstFormat, alphaPitch, width, height, flags));
 
     if (op > PictOpSaturate) {
         return FALSE;
@@ -508,17 +509,17 @@
 
 Bool
 vmwareSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op,
-                                 int texType, CARD8 *texPtr,
-                                 int texPitch,
+                                 CARD32 srcFormat, CARD32 dstFormat,
+				 CARD8 *texPtr, int texPitch,
                                  int width, int height,
                                  int flags)
 {
     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
     SVGASurface* surf;
 
-    VmwareLog(("Setup texture (op = %d, texType = %d, texPitch = %d,"
-               " w = %d, h = %d, flags = %d)\n", op, texType, texPitch,
-               width, height, flags));
+    VmwareLog(("Setup texture (op = %d, srcFormat = %d, dstFormat = %d,"
+               " texPitch = %d, w = %d, h = %d, flags = %d)\n", op, srcFormat,
+	       dstFormat, texPitch, width, height, flags));
 
     if (op > PictOpSaturate) {
         return FALSE;