dri1: Remove unused DRI{,Post}ValidateTree
i810, mga, savage, and tdfx do reference these slots, but only to set them to NULL, so while this does have API impact it's not actually used. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
5486c834fa
commit
a08e7a098a
|
@ -595,14 +595,6 @@ DRIFinishScreenInit(ScreenPtr pScreen)
|
|||
DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
|
||||
|
||||
/* Wrap DRI support */
|
||||
if (pDRIInfo->wrap.ValidateTree) {
|
||||
pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
|
||||
pScreen->ValidateTree = pDRIInfo->wrap.ValidateTree;
|
||||
}
|
||||
if (pDRIInfo->wrap.PostValidateTree) {
|
||||
pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
|
||||
pScreen->PostValidateTree = pDRIInfo->wrap.PostValidateTree;
|
||||
}
|
||||
if (pDRIInfo->wrap.WindowExposures) {
|
||||
pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
|
||||
pScreen->WindowExposures = pDRIInfo->wrap.WindowExposures;
|
||||
|
@ -652,14 +644,6 @@ DRICloseScreen(ScreenPtr pScreen)
|
|||
|
||||
if (pDRIPriv->wrapped) {
|
||||
/* Unwrap DRI Functions */
|
||||
if (pDRIInfo->wrap.ValidateTree) {
|
||||
pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
|
||||
pDRIPriv->wrap.ValidateTree = NULL;
|
||||
}
|
||||
if (pDRIInfo->wrap.PostValidateTree) {
|
||||
pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
|
||||
pDRIPriv->wrap.PostValidateTree = NULL;
|
||||
}
|
||||
if (pDRIInfo->wrap.WindowExposures) {
|
||||
pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
|
||||
pDRIPriv->wrap.WindowExposures = NULL;
|
||||
|
@ -1601,8 +1585,6 @@ DRICreateInfoRec(void)
|
|||
inforec->wrap.BlockHandler = DRIDoBlockHandler;
|
||||
inforec->wrap.WindowExposures = DRIWindowExposures;
|
||||
inforec->wrap.CopyWindow = DRICopyWindow;
|
||||
inforec->wrap.ValidateTree = DRIValidateTree;
|
||||
inforec->wrap.PostValidateTree = DRIPostValidateTree;
|
||||
inforec->wrap.ClipNotify = DRIClipNotify;
|
||||
inforec->wrap.AdjustFrame = DRIAdjustFrame;
|
||||
|
||||
|
@ -2064,61 +2046,6 @@ DRILockTree(ScreenPtr pScreen)
|
|||
}
|
||||
}
|
||||
|
||||
int
|
||||
DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
|
||||
{
|
||||
ScreenPtr pScreen = pParent->drawable.pScreen;
|
||||
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
|
||||
|
||||
int returnValue = 1; /* always return 1, not checked by dix/window.c */
|
||||
|
||||
if (!pDRIPriv)
|
||||
return returnValue;
|
||||
|
||||
/* call lower wrapped functions */
|
||||
if (pDRIPriv->wrap.ValidateTree) {
|
||||
/* unwrap */
|
||||
pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
|
||||
|
||||
/* call lower layers */
|
||||
returnValue = (*pScreen->ValidateTree) (pParent, pChild, kind);
|
||||
|
||||
/* rewrap */
|
||||
pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
|
||||
pScreen->ValidateTree = DRIValidateTree;
|
||||
}
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
void
|
||||
DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
|
||||
{
|
||||
ScreenPtr pScreen;
|
||||
DRIScreenPrivPtr pDRIPriv;
|
||||
|
||||
if (pParent) {
|
||||
pScreen = pParent->drawable.pScreen;
|
||||
}
|
||||
else {
|
||||
pScreen = pChild->drawable.pScreen;
|
||||
}
|
||||
if (!(pDRIPriv = DRI_SCREEN_PRIV(pScreen)))
|
||||
return;
|
||||
|
||||
if (pDRIPriv->wrap.PostValidateTree) {
|
||||
/* unwrap */
|
||||
pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
|
||||
|
||||
/* call lower layers */
|
||||
(*pScreen->PostValidateTree) (pParent, pChild, kind);
|
||||
|
||||
/* rewrap */
|
||||
pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
|
||||
pScreen->PostValidateTree = DRIPostValidateTree;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
DRIClipNotify(WindowPtr pWin, int dx, int dy)
|
||||
{
|
||||
|
|
|
@ -85,8 +85,6 @@ typedef struct {
|
|||
ScreenBlockHandlerProcPtr BlockHandler;
|
||||
WindowExposuresProcPtr WindowExposures;
|
||||
CopyWindowProcPtr CopyWindow;
|
||||
ValidateTreeProcPtr ValidateTree;
|
||||
PostValidateTreeProcPtr PostValidateTree;
|
||||
ClipNotifyProcPtr ClipNotify;
|
||||
AdjustFramePtr AdjustFrame;
|
||||
} DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
|
||||
|
@ -290,12 +288,6 @@ extern _X_EXPORT Bool DRIDestroyWindow(WindowPtr pWin);
|
|||
extern _X_EXPORT void DRICopyWindow(WindowPtr pWin,
|
||||
DDXPointRec ptOldOrg, RegionPtr prgnSrc);
|
||||
|
||||
extern _X_EXPORT int DRIValidateTree(WindowPtr pParent,
|
||||
WindowPtr pChild, VTKind kind);
|
||||
|
||||
extern _X_EXPORT void DRIPostValidateTree(WindowPtr pParent,
|
||||
WindowPtr pChild, VTKind kind);
|
||||
|
||||
extern _X_EXPORT void DRIClipNotify(WindowPtr pWin, int dx, int dy);
|
||||
|
||||
extern _X_EXPORT CARD32 DRIGetDrawableIndex(WindowPtr pWin);
|
||||
|
|
Loading…
Reference in New Issue