composite: Stop wrapping GetImage/GetSpans
SourceValidate handles this for us consistently now. Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
parent
516e75dbb6
commit
77f614eb33
|
@ -76,9 +76,6 @@ compCloseScreen(ScreenPtr pScreen)
|
||||||
pScreen->CreateWindow = cs->CreateWindow;
|
pScreen->CreateWindow = cs->CreateWindow;
|
||||||
pScreen->CopyWindow = cs->CopyWindow;
|
pScreen->CopyWindow = cs->CopyWindow;
|
||||||
pScreen->PositionWindow = cs->PositionWindow;
|
pScreen->PositionWindow = cs->PositionWindow;
|
||||||
|
|
||||||
pScreen->GetImage = cs->GetImage;
|
|
||||||
pScreen->GetSpans = cs->GetSpans;
|
|
||||||
pScreen->SourceValidate = cs->SourceValidate;
|
pScreen->SourceValidate = cs->SourceValidate;
|
||||||
|
|
||||||
free(cs);
|
free(cs);
|
||||||
|
@ -137,38 +134,6 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
compGetImage(DrawablePtr pDrawable,
|
|
||||||
int sx, int sy,
|
|
||||||
int w, int h,
|
|
||||||
unsigned int format, unsigned long planemask, char *pdstLine)
|
|
||||||
{
|
|
||||||
ScreenPtr pScreen = pDrawable->pScreen;
|
|
||||||
CompScreenPtr cs = GetCompScreen(pScreen);
|
|
||||||
|
|
||||||
pScreen->GetImage = cs->GetImage;
|
|
||||||
if (pDrawable->type == DRAWABLE_WINDOW)
|
|
||||||
compPaintChildrenToWindow((WindowPtr) pDrawable);
|
|
||||||
(*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine);
|
|
||||||
cs->GetImage = pScreen->GetImage;
|
|
||||||
pScreen->GetImage = compGetImage;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
compGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth,
|
|
||||||
int nspans, char *pdstStart)
|
|
||||||
{
|
|
||||||
ScreenPtr pScreen = pDrawable->pScreen;
|
|
||||||
CompScreenPtr cs = GetCompScreen(pScreen);
|
|
||||||
|
|
||||||
pScreen->GetSpans = cs->GetSpans;
|
|
||||||
if (pDrawable->type == DRAWABLE_WINDOW)
|
|
||||||
compPaintChildrenToWindow((WindowPtr) pDrawable);
|
|
||||||
(*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
|
|
||||||
cs->GetSpans = pScreen->GetSpans;
|
|
||||||
pScreen->GetSpans = compGetSpans;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
compSourceValidate(DrawablePtr pDrawable,
|
compSourceValidate(DrawablePtr pDrawable,
|
||||||
int x, int y,
|
int x, int y,
|
||||||
|
@ -444,12 +409,6 @@ compScreenInit(ScreenPtr pScreen)
|
||||||
cs->CloseScreen = pScreen->CloseScreen;
|
cs->CloseScreen = pScreen->CloseScreen;
|
||||||
pScreen->CloseScreen = compCloseScreen;
|
pScreen->CloseScreen = compCloseScreen;
|
||||||
|
|
||||||
cs->GetImage = pScreen->GetImage;
|
|
||||||
pScreen->GetImage = compGetImage;
|
|
||||||
|
|
||||||
cs->GetSpans = pScreen->GetSpans;
|
|
||||||
pScreen->GetSpans = compGetSpans;
|
|
||||||
|
|
||||||
cs->SourceValidate = pScreen->SourceValidate;
|
cs->SourceValidate = pScreen->SourceValidate;
|
||||||
pScreen->SourceValidate = compSourceValidate;
|
pScreen->SourceValidate = compSourceValidate;
|
||||||
|
|
||||||
|
|
|
@ -168,8 +168,6 @@ typedef struct _CompScreen {
|
||||||
Window overlayWid;
|
Window overlayWid;
|
||||||
CompOverlayClientPtr pOverlayClients;
|
CompOverlayClientPtr pOverlayClients;
|
||||||
|
|
||||||
GetImageProcPtr GetImage;
|
|
||||||
GetSpansProcPtr GetSpans;
|
|
||||||
SourceValidateProcPtr SourceValidate;
|
SourceValidateProcPtr SourceValidate;
|
||||||
} CompScreenRec, *CompScreenPtr;
|
} CompScreenRec, *CompScreenPtr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user