Attachment 825 Details for Bug 1294 – xaa-wrap-new-render-hooks.patch

[patch] xaa-wrap-new-render-hooks.patch

xaa-wrap-new-render-hooks.patch (text/plain), 5.06 KB, created by Adam Jackson on 2004-09-05 17:12:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2004-09-05 17:12:56 UTC

Size: 5.06 KB

patch

obsolete

>Index: xaaStateChange.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v
>retrieving revision 1.2
>diff -u -r1.2 xaaStateChange.c
>--- xaaStateChange.c	23 Apr 2004 19:54:16 -0000	1.2
>+++ xaaStateChange.c	6 Sep 2004 00:10:36 -0000
>@@ -263,13 +263,14 @@
>    BackingStoreSaveAreasProcPtr SaveAreas;
>    BackingStoreRestoreAreasProcPtr RestoreAreas;
> #ifdef RENDER
>-   Bool (*SetupForCPUToScreenAlphaTexture)(ScrnInfoPtr pScrn, int op,
>+   Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,
>                                            CARD16 red, CARD16 green,
>                                            CARD16 blue, CARD16 alpha,
>-                                           int alphaType, CARD8 *alphaPtr,
>-                                           int alphaPitch, int width,
>-                                           int height, int flags);
>-   Bool (*SetupForCPUToScreenTexture)(ScrnInfoPtr pScrn, int op, int texType,
>+					   CARD32 maskFormat, CARD32 dstFormat,
>+                                           CARD8 *alphaPtr, int alphaPitch,
>+					   int width, int height, int flags);
>+   Bool (*SetupForCPUToScreenTexture2)(ScrnInfoPtr pScrn, int op,
>+                                      CARD32 srcFormat, CARD32 dstFormat,
>                                       CARD8 *texPtr, int texPitch,
>                                       int width, int height, int flags);
> #endif
>@@ -1499,38 +1500,41 @@
> }
> 
> #ifdef RENDER
>-static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn,
>-                                                        int op, CARD16 red,
>-                                                        CARD16 green,
>-                                                        CARD16 blue,
>-                                                        CARD16 alpha,
>-                                                        int alphaType,
>-                                                        CARD8 *alphaPtr,
>-                                                        int alphaPitch,
>-                                                        int width, int height,
>-                                                        int flags)
>+static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
>+                                                         int op, CARD16 red,
>+                                                         CARD16 green,
>+                                                         CARD16 blue,
>+                                                         CARD16 alpha,
>+							 CARD32 srcFormat,
>+							 CARD32 dstFormat,
>+                                                         CARD8 *alphaPtr,
>+                                                         int alphaPitch,
>+                                                         int width, int height,
>+                                                         int flags)
> {
>    GET_STATEPRIV_PSCRN(pScrn);
>    STATE_CHECK_PSCRN(pScrn);
> 
>-   return (*pStatePriv->SetupForCPUToScreenAlphaTexture)(pScrn, op, red, green,
>-                                                         blue, alpha, alphaType,
>-                                                         alphaPtr, alphaPitch,
>-                                                         width, height, flags);
>+   return (*pStatePriv->SetupForCPUToScreenAlphaTexture2)(pScrn, op, red, green,
>+                                                         blue, alpha, srcFormat,
>+							 dstFormat, alphaPtr,
>+							 alphaPitch, width,
>+							 height, flags);
> }
> 
>-static Bool XAAStateWrapSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op,
>-                                                   int texType, CARD8 *texPtr,
>-                                                   int texPitch,
>-                                                   int width, int height,
>-                                                   int flags)
>+static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
>+                                                    CARD32 srcFormat,
>+						    CARD32 dstFormat,
>+						    CARD8 *texPtr, int texPitch,
>+                                                    int width, int height,
>+                                                    int flags)
> {
>    GET_STATEPRIV_PSCRN(pScrn);
>    STATE_CHECK_PSCRN(pScrn);
> 
>-   return (*pStatePriv->SetupForCPUToScreenTexture)(pScrn, op, texType, texPtr,
>-                                                    texPitch, width, height,
>-                                                    flags);
>+   return (*pStatePriv->SetupForCPUToScreenTexture2)(pScrn, op, srcFormat,
>+                                                    dstFormat, texPtr, texPitch,
>+						    width, height, flags);
> }
> #endif
> 
>@@ -1671,8 +1675,8 @@
>    XAA_STATE_WRAP(SaveAreas);
>    XAA_STATE_WRAP(RestoreAreas);
> #ifdef RENDER
>-   XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture);
>-   XAA_STATE_WRAP(SetupForCPUToScreenTexture);
>+   XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
>+   XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
> #endif
>    return TRUE;
> }

Actions: View | Splinter Review

Attachments on bug 1294: 825

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.