frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1502) mi: drop unused miCopyPlane() 

With removal of Xwin's NATIVEGDI (back a decade ago), the last caller is
gone, and it also doesn't seem to be called by any driver.

Fixes: 8465ee788f
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-18 20:11:55 +02:00
parent 87405ebe35
commit c8bd612f75
2 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mi/mi.h
View File

@ -91,18 +91,6 @@ extern _X_EXPORT RegionPtr miCopyArea(DrawablePtr /*pSrcDrawable */ ,
int /*yOut */ int /*yOut */
); );
extern _X_EXPORT RegionPtr miCopyPlane(DrawablePtr /*pSrcDrawable */ ,
DrawablePtr /*pDstDrawable */ ,
GCPtr /*pGC */ ,
int /*srcx */ ,
int /*srcy */ ,
int /*width */ ,
int /*height */ ,
int /*dstx */ ,
int /*dsty */ ,
unsigned long /*bitPlane */
);
extern _X_EXPORT void miGetImage(DrawablePtr /*pDraw */ , extern _X_EXPORT void miGetImage(DrawablePtr /*pDraw */ ,
int /*sx */ , int /*sx */ ,
int /*sy */ , int /*sy */ ,

79
mi/mibitblt.c
View File

@ -505,85 +505,6 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
} }
/* MICOPYPLANE -- public entry for the CopyPlane request.
* strategy:
* First build up a bitmap out of the bits requested
* build a source clip
* Use the bitmap we've built up as a Stipple for the destination
*/
_X_COLD RegionPtr
miCopyPlane(DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
int srcx,
int srcy,
int width, int height, int dstx, int dsty, unsigned long bitPlane)
{
MiBits *ptile;
BoxRec box;
RegionPtr prgnSrc, prgnExposed;
/* incorporate the source clip */
box.x1 = srcx + pSrcDrawable->x;
box.y1 = srcy + pSrcDrawable->y;
box.x2 = box.x1 + width;
box.y2 = box.y1 + height;
/* clip to visible drawable */
if (box.x1 < pSrcDrawable->x)
box.x1 = pSrcDrawable->x;
if (box.y1 < pSrcDrawable->y)
box.y1 = pSrcDrawable->y;
if (box.x2 > pSrcDrawable->x + (int) pSrcDrawable->width)
box.x2 = pSrcDrawable->x + (int) pSrcDrawable->width;
if (box.y2 > pSrcDrawable->y + (int) pSrcDrawable->height)
box.y2 = pSrcDrawable->y + (int) pSrcDrawable->height;
if (box.x1 > box.x2)
box.x2 = box.x1;
if (box.y1 > box.y2)
box.y2 = box.y1;
prgnSrc = RegionCreate(&box, 1);
if (pSrcDrawable->type != DRAWABLE_PIXMAP) {
/* clip to visible drawable */
if (pGC->subWindowMode == IncludeInferiors) {
RegionPtr clipList = NotClippedByChildren((WindowPtr) pSrcDrawable);
RegionIntersect(prgnSrc, prgnSrc, clipList);
RegionDestroy(clipList);
}
else
RegionIntersect(prgnSrc, prgnSrc,
&((WindowPtr) pSrcDrawable)->clipList);
}
box = *RegionExtents(prgnSrc);
RegionTranslate(prgnSrc, -box.x1, -box.y1);
if ((box.x2 > box.x1) && (box.y2 > box.y1)) {
/* minimize the size of the data extracted */
/* note that we convert the plane mask bitPlane into a plane number */
box.x1 -= pSrcDrawable->x;
box.x2 -= pSrcDrawable->x;
box.y1 -= pSrcDrawable->y;
box.y2 -= pSrcDrawable->y;
ptile = miGetPlane(pSrcDrawable, ffs(bitPlane) - 1,
box.x1, box.y1,
box.x2 - box.x1, box.y2 - box.y1, (MiBits *) NULL);
if (ptile) {
miOpqStipDrawable(pDstDrawable, pGC, prgnSrc, ptile, 0,
box.x2 - box.x1, box.y2 - box.y1,
dstx + box.x1 - srcx, dsty + box.y1 - srcy);
free(ptile);
}
}
prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, srcx, srcy,
width, height, dstx, dsty);
RegionDestroy(prgnSrc);
return prgnExposed;
}
/* MIGETIMAGE -- public entry for the GetImage Request /* MIGETIMAGE -- public entry for the GetImage Request
* We're getting the image into a memory buffer. While we have to use GetSpans * We're getting the image into a memory buffer. While we have to use GetSpans
* to read a line from the device (since we don't know what that looks like), * to read a line from the device (since we don't know what that looks like),