diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-09-12 11:56:28 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-09 11:14:53 +0200 |
| commit | 5d3bd8a3dc6456ea1ccf7b5f71b972379d7565ec (patch) | |
| tree | 97551d5b4e0d1ebb261f3368867da479fe595d80 /mi | |
| parent | 7eddc80bc4a6c1902746a9fbe79ab553f9fd5821 (diff) | |
mi: Drop plane argument from miHandleExposures
This existed to be passed to the bs recovery routine; since we back all
planes, we don't care.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mi.h | 3 | ||||
| -rw-r--r-- | mi/mibitblt.c | 5 | ||||
| -rw-r--r-- | mi/micopy.c | 3 | ||||
| -rw-r--r-- | mi/miexpose.c | 8 |
4 files changed, 5 insertions, 14 deletions
@@ -229,8 +229,7 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ , int /*width */ , int /*height */ , int /*dstx */ , - int /*dsty */ , - unsigned long /*plane */ + int /*dsty */ ); extern _X_EXPORT void miSendGraphicsExpose(ClientPtr /*client */ , diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 3ed4ed1cc..08bd1c5b2 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -242,8 +242,7 @@ miCopyArea(DrawablePtr pSrcDrawable, } } prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, - widthSrc, heightSrc, xOut, yOut, - (unsigned long) 0); + widthSrc, heightSrc, xOut, yOut); if (realSrcClip) RegionDestroy(prgnSrcClip); @@ -579,7 +578,7 @@ miCopyPlane(DrawablePtr pSrcDrawable, } } prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, - width, height, dstx, dsty, bitPlane); + width, height, dstx, dsty); RegionDestroy(prgnSrc); return prgnExposed; } diff --git a/mi/micopy.c b/mi/micopy.c index 30795114d..a52b0a786 100644 --- a/mi/micopy.c +++ b/mi/micopy.c @@ -304,8 +304,7 @@ miDoCopy(DrawablePtr pSrcDrawable, yIn - pSrcDrawable->y, widthSrc, heightSrc, xOut - pDstDrawable->x, - yOut - pDstDrawable->y, - (unsigned long) bitPlane); + yOut - pDstDrawable->y); RegionUninit(&rgnDst); if (freeSrcClip) RegionDestroy(prgnSrcClip); diff --git a/mi/miexpose.c b/mi/miexpose.c index de0e148a0..7a1c17225 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -116,18 +116,12 @@ NOTE: this should generally be called, even if graphicsExposures is false, because this is where bits get recovered from backing store. -NOTE: - added argument 'plane' is used to indicate how exposures from backing -store should be accomplished. If plane is 0 (i.e. no bit plane), CopyArea -should be used, else a CopyPlane of the indicated plane will be used. The -exposing is done by the backing store's GraphicsExpose function, of course. - */ RegionPtr miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, int srcx, int srcy, int width, int height, - int dstx, int dsty, unsigned long plane) + int dstx, int dsty) { RegionPtr prgnSrcClip; /* drawable-relative source clip */ RegionRec rgnSrcRec; |