diff options
author | Adam Jackson <ajax@redhat.com> | 2019-10-09 12:05:56 -0400 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2019-10-30 16:26:01 +0000 |
commit | 77f614eb331b0240c699f7aef13a8046c9c2c70a (patch) | |
tree | faa0503e82807da553351bac40ba6f09aee383bf /composite | |
parent | 516e75dbb6bbf97c7af9c2226242ffd9259fec11 (diff) | |
download | xserver-77f614eb331b0240c699f7aef13a8046c9c2c70a.tar.gz |
composite: Stop wrapping GetImage/GetSpans
SourceValidate handles this for us consistently now.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to 'composite')
-rw-r--r-- | composite/compinit.c | 41 | ||||
-rw-r--r-- | composite/compint.h | 2 |
2 files changed, 0 insertions, 43 deletions
diff --git a/composite/compinit.c b/composite/compinit.c index 69abb0a40..a62c8d3c4 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -76,9 +76,6 @@ compCloseScreen(ScreenPtr pScreen) pScreen->CreateWindow = cs->CreateWindow; pScreen->CopyWindow = cs->CopyWindow; pScreen->PositionWindow = cs->PositionWindow; - - pScreen->GetImage = cs->GetImage; - pScreen->GetSpans = cs->GetSpans; pScreen->SourceValidate = cs->SourceValidate; free(cs); @@ -138,38 +135,6 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask) } 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 compSourceValidate(DrawablePtr pDrawable, int x, int y, int width, int height, unsigned int subWindowMode) @@ -444,12 +409,6 @@ compScreenInit(ScreenPtr pScreen) cs->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = compCloseScreen; - cs->GetImage = pScreen->GetImage; - pScreen->GetImage = compGetImage; - - cs->GetSpans = pScreen->GetSpans; - pScreen->GetSpans = compGetSpans; - cs->SourceValidate = pScreen->SourceValidate; pScreen->SourceValidate = compSourceValidate; diff --git a/composite/compint.h b/composite/compint.h index d501bad65..423b641ff 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -168,8 +168,6 @@ typedef struct _CompScreen { Window overlayWid; CompOverlayClientPtr pOverlayClients; - GetImageProcPtr GetImage; - GetSpansProcPtr GetSpans; SourceValidateProcPtr SourceValidate; } CompScreenRec, *CompScreenPtr; |