Attachment 897 Details for Bug 1300 – vmware-new-render-hooks-2.patch

[patch] vmware-new-render-hooks-2.patch

vmware-new-render-hooks-2.patch (text/plain), 4.76 KB, created by Adam Jackson on 2004-09-14 09:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2004-09-14 09:20:58 UTC

Size: 4.76 KB

patch

obsolete

>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	14 Sep 2004 16:20:02 -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,20 +174,22 @@
> 
>                 vmwareXAACreateHeap(pScreen, pScrn, pVMWARE);
> 
>-                xaaInfo->SetupForCPUToScreenAlphaTexture =
>+                xaaInfo->SetupForCPUToScreenAlphaTexture2 =
>                    vmwareSetupForCPUToScreenAlphaTexture;
>                 xaaInfo->SubsequentCPUToScreenAlphaTexture =
>                    vmwareSubsequentCPUToScreenTexture;
>                 xaaInfo->CPUToScreenAlphaTextureFlags = XAA_RENDER_NO_TILE |
>                    XAA_RENDER_NO_SRC_ALPHA;
>                 xaaInfo->CPUToScreenAlphaTextureFormats = vmwareAlphaTextureFormats;
>+		xaaInfo->CPUToScreenAlphaTextureDstFormats = vmwareAlphaTextureFormats;
> 
>-                xaaInfo->SetupForCPUToScreenTexture =
>+                xaaInfo->SetupForCPUToScreenTexture2 =
>                    vmwareSetupForCPUToScreenTexture;
>                 xaaInfo->SubsequentCPUToScreenTexture = 
>                    vmwareSubsequentCPUToScreenTexture;
>                 xaaInfo->CPUToScreenTextureFlags = XAA_RENDER_NO_TILE;
>                 xaaInfo->CPUToScreenTextureFormats = vmwareTextureFormats;
>+		xaaInfo->CPUToScreenTextureDstFormats = vmwareTextureFormats;
>             } else {
>                 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Allocation of offscreen "
>                            "scratch area for alpha blending failed\n");
>@@ -471,8 +474,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 +483,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 +511,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;

Actions: View | Splinter Review

Attachments on bug 1300: 832 | 897 | 977

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.