From: Dave Airlie <[email protected]> these were migrated to mi a while back.
Signed-off-by: Dave Airlie <[email protected]> --- fb/fb.h | 27 --------------------------- fb/fbcopy.c | 33 --------------------------------- fb/wfbrename.h | 2 -- miext/rootless/rootlessWindow.c | 6 +++--- 4 files changed, 3 insertions(+), 65 deletions(-) diff --git a/fb/fb.h b/fb/fb.h index 047452f..bab1010 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -1327,33 +1327,6 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -/* Compatibility wrapper, to be removed at next ABI change. */ -extern _X_EXPORT void -fbCopyRegion (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - RegionPtr pDstRegion, - int dx, - int dy, - fbCopyProc copyProc, - Pixel bitPlane, - void *closure); - -/* Compatibility wrapper, to be removed at next ABI change. */ -extern _X_EXPORT RegionPtr -fbDoCopy (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, - int yOut, - fbCopyProc copyProc, - Pixel bitplane, - void *closure); - extern _X_EXPORT void fbCopy1toN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 8983203..3f08345 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -28,39 +28,6 @@ #include "fb.h" -/* Compatibility wrapper, to be removed at next ABI change. */ -void -fbCopyRegion (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - RegionPtr pDstRegion, - int dx, - int dy, - fbCopyProc copyProc, - Pixel bitPlane, - void *closure) -{ - miCopyRegion(pSrcDrawable, pDstDrawable, pGC, pDstRegion, dx, dy, copyProc, bitPlane, closure); -} - -/* Compatibility wrapper, to be removed at next ABI change. */ -RegionPtr -fbDoCopy (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, - int yOut, - fbCopyProc copyProc, - Pixel bitPlane, - void *closure) -{ - return miDoCopy(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut, copyProc, bitPlane, closure); -} - void fbCopyNtoN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, diff --git a/fb/wfbrename.h b/fb/wfbrename.h index 28c751c..a0b0d51 100644 --- a/fb/wfbrename.h +++ b/fb/wfbrename.h @@ -44,7 +44,6 @@ #define fbCopyNto1 wfbCopyNto1 #define fbCopyNtoN wfbCopyNtoN #define fbCopyPlane wfbCopyPlane -#define fbCopyRegion wfbCopyRegion #define fbCopyWindow wfbCopyWindow #define fbCreateDefColormap wfbCreateDefColormap #define fbCreateGC wfbCreateGC @@ -53,7 +52,6 @@ #define fbCreateWindow wfbCreateWindow #define fbDestroyPixmap wfbDestroyPixmap #define fbDestroyWindow wfbDestroyWindow -#define fbDoCopy wfbDoCopy #define fbDots wfbDots #define fbDots16 wfbDots16 #define fbDots24 wfbDots24 diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 37f44af..a28acb5 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -683,7 +683,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, if (gResizeDeathCount == 1) { /* Simple case, we only have a single source pixmap. */ - fbCopyRegion(&gResizeDeathPix[0]->drawable, + miCopyRegion(&gResizeDeathPix[0]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, &rgnDst, dx, dy, fbCopyNtoN, 0, 0); } @@ -699,7 +699,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionNull(&clipped); RegionIntersect(&rgnDst, &clip, &clipped); - fbCopyRegion(&gResizeDeathPix[i]->drawable, + miCopyRegion(&gResizeDeathPix[i]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, &clipped, dx, dy, fbCopyNtoN, 0, 0); @@ -780,7 +780,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) else { RootlessStartDrawing(pWin); - fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin, + miCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin, 0, &rgnDst, dx, dy, fbCopyNtoN, 0, 0); /* prgnSrc has been translated to dst position */ -- 1.7.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
