diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
| commit | d2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch) | |
| tree | 676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/hw/xfree86/xaa/xaaStateChange.c | |
| parent | a46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff) | |
| download | vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2 vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip | |
git update 22/4/2010
Diffstat (limited to 'xorg-server/hw/xfree86/xaa/xaaStateChange.c')
| -rw-r--r-- | xorg-server/hw/xfree86/xaa/xaaStateChange.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/xaa/xaaStateChange.c b/xorg-server/hw/xfree86/xaa/xaaStateChange.c index 57d8aa318..f33261453 100644 --- a/xorg-server/hw/xfree86/xaa/xaaStateChange.c +++ b/xorg-server/hw/xfree86/xaa/xaaStateChange.c @@ -260,7 +260,6 @@ typedef struct _XAAStateWrapRec { GetImageProcPtr GetImage; GetSpansProcPtr GetSpans; CopyWindowProcPtr CopyWindow; -#ifdef RENDER Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op, CARD16 red, CARD16 green, CARD16 blue, CARD16 alpha, @@ -271,7 +270,6 @@ typedef struct _XAAStateWrapRec { CARD32 srcFormat, CARD32 dstFormat, CARD8 *texPtr, int texPitch, int width, int height, int flags); -#endif } XAAStateWrapRec, *XAAStateWrapPtr; static int XAAStateKeyIndex; @@ -1457,7 +1455,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, prgnSrc); } -#ifdef RENDER static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn, int op, CARD16 red, CARD16 green, @@ -1494,7 +1491,6 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op, dstFormat, texPtr, texPitch, width, height, flags); } -#endif /* Setup Function */ Bool @@ -1624,9 +1620,7 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAA_STATE_WRAP(GetImage); XAA_STATE_WRAP(GetSpans); XAA_STATE_WRAP(CopyWindow); -#ifdef RENDER XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2); XAA_STATE_WRAP(SetupForCPUToScreenTexture2); -#endif return TRUE; } |