frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #1294: Make sure RenderAccel hooks get wrapped in XAA init.

This commit is contained in:
Adam Jackson 2005-02-02 04:07:04 +00:00
parent 44e2d91679
commit b532bfb483
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hw/xfree86/xaa/xaaStateChange.c
View File

@ -263,13 +263,14 @@ typedef struct _XAAStateWrapRec {
BackingStoreSaveAreasProcPtr SaveAreas; BackingStoreSaveAreasProcPtr SaveAreas;
BackingStoreRestoreAreasProcPtr RestoreAreas; BackingStoreRestoreAreasProcPtr RestoreAreas;
#ifdef RENDER #ifdef RENDER
Bool (*SetupForCPUToScreenAlphaTexture)(ScrnInfoPtr pScrn, int op, Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,
CARD16 red, CARD16 green, CARD16 red, CARD16 green,
CARD16 blue, CARD16 alpha, CARD16 blue, CARD16 alpha,
int alphaType, CARD8 *alphaPtr, CARD32 maskFormat, CARD32 dstFormat,
int alphaPitch, int width, CARD8 *alphaPtr, int alphaPitch,
int height, int flags); int width, int height, int flags);
Bool (*SetupForCPUToScreenTexture)(ScrnInfoPtr pScrn, int op, int texType, Bool (*SetupForCPUToScreenTexture2)(ScrnInfoPtr pScrn, int op,
CARD32 srcFormat, CARD32 dstFormat,
CARD8 *texPtr, int texPitch, CARD8 *texPtr, int texPitch,
int width, int height, int flags); int width, int height, int flags);
#endif #endif
@ -1499,38 +1500,41 @@ static void XAAStateWrapRestoreAreas(PixmapPtr pBackingPixmap, RegionPtr pExpose
} }
#ifdef RENDER #ifdef RENDER
static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
int op, CARD16 red, int op, CARD16 red,
CARD16 green, CARD16 green,
CARD16 blue, CARD16 blue,
CARD16 alpha, CARD16 alpha,
int alphaType, CARD32 srcFormat,
CARD8 *alphaPtr, CARD32 dstFormat,
int alphaPitch, CARD8 *alphaPtr,
int width, int height, int alphaPitch,
int flags) int width, int height,
int flags)
{ {
GET_STATEPRIV_PSCRN(pScrn); GET_STATEPRIV_PSCRN(pScrn);
STATE_CHECK_PSCRN(pScrn); STATE_CHECK_PSCRN(pScrn);
return (*pStatePriv->SetupForCPUToScreenAlphaTexture)(pScrn, op, red, green, return (*pStatePriv->SetupForCPUToScreenAlphaTexture2)(pScrn, op, red, green,
blue, alpha, alphaType, blue, alpha, srcFormat,
alphaPtr, alphaPitch, dstFormat, alphaPtr,
width, height, flags); alphaPitch, width,
height, flags);
} }
static Bool XAAStateWrapSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op, static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
int texType, CARD8 *texPtr, CARD32 srcFormat,
int texPitch, CARD32 dstFormat,
int width, int height, CARD8 *texPtr, int texPitch,
int flags) int width, int height,
int flags)
{ {
GET_STATEPRIV_PSCRN(pScrn); GET_STATEPRIV_PSCRN(pScrn);
STATE_CHECK_PSCRN(pScrn); STATE_CHECK_PSCRN(pScrn);
return (*pStatePriv->SetupForCPUToScreenTexture)(pScrn, op, texType, texPtr, return (*pStatePriv->SetupForCPUToScreenTexture2)(pScrn, op, srcFormat,
texPitch, width, height, dstFormat, texPtr, texPitch,
flags); width, height, flags);
} }
#endif #endif
@ -1671,8 +1675,8 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
XAA_STATE_WRAP(SaveAreas); XAA_STATE_WRAP(SaveAreas);
XAA_STATE_WRAP(RestoreAreas); XAA_STATE_WRAP(RestoreAreas);
#ifdef RENDER #ifdef RENDER
XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture); XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
XAA_STATE_WRAP(SetupForCPUToScreenTexture); XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
#endif #endif
return TRUE; return TRUE;
} }