fbFillRegionTiled() is now dead code.
Only ever called from the old PaintWindow* screen hooks, but those are gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
This commit is contained in:
parent
ee21aba6be
commit
24bebdded4
5
fb/fb.h
5
fb/fb.h
|
@ -2087,11 +2087,6 @@ fbFillRegionSolid (DrawablePtr pDrawable,
|
|||
FbBits and,
|
||||
FbBits xor);
|
||||
|
||||
void
|
||||
fbFillRegionTiled (DrawablePtr pDrawable,
|
||||
RegionPtr pRegion,
|
||||
PixmapPtr pTile);
|
||||
|
||||
pixman_image_t *image_from_pict (PicturePtr pict,
|
||||
Bool has_clip);
|
||||
void free_pixman_pict (PicturePtr, pixman_image_t *);
|
||||
|
|
|
@ -250,68 +250,3 @@ fbFillRegionSolid (DrawablePtr pDrawable,
|
|||
|
||||
fbFinishAccess (pDrawable);
|
||||
}
|
||||
|
||||
#ifdef PANORAMIX
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
void
|
||||
fbFillRegionTiled (DrawablePtr pDrawable,
|
||||
RegionPtr pRegion,
|
||||
PixmapPtr pTile)
|
||||
{
|
||||
FbBits *dst;
|
||||
FbStride dstStride;
|
||||
int dstBpp;
|
||||
int dstXoff, dstYoff;
|
||||
FbBits *tile;
|
||||
FbStride tileStride;
|
||||
int tileBpp;
|
||||
int tileXoff, tileYoff; /* XXX assumed to be zero */
|
||||
int tileWidth, tileHeight;
|
||||
int n = REGION_NUM_RECTS(pRegion);
|
||||
BoxPtr pbox = REGION_RECTS(pRegion);
|
||||
int xRot = pDrawable->x;
|
||||
int yRot = pDrawable->y;
|
||||
|
||||
#ifdef PANORAMIX
|
||||
if(!noPanoramiXExtension)
|
||||
{
|
||||
int index = pDrawable->pScreen->myNum;
|
||||
if(&WindowTable[index]->drawable == pDrawable)
|
||||
{
|
||||
xRot -= panoramiXdataPtr[index].x;
|
||||
yRot -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
|
||||
fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
|
||||
tileWidth = pTile->drawable.width;
|
||||
tileHeight = pTile->drawable.height;
|
||||
xRot += dstXoff;
|
||||
yRot += dstYoff;
|
||||
|
||||
while (n--)
|
||||
{
|
||||
fbTile (dst + (pbox->y1 + dstYoff) * dstStride,
|
||||
dstStride,
|
||||
(pbox->x1 + dstXoff) * dstBpp,
|
||||
(pbox->x2 - pbox->x1) * dstBpp,
|
||||
pbox->y2 - pbox->y1,
|
||||
tile,
|
||||
tileStride,
|
||||
tileWidth * dstBpp,
|
||||
tileHeight,
|
||||
GXcopy,
|
||||
FB_ALLONES,
|
||||
dstBpp,
|
||||
xRot * dstBpp,
|
||||
yRot - (pbox->y1 + dstYoff));
|
||||
pbox++;
|
||||
}
|
||||
|
||||
fbFinishAccess (&pTile->drawable);
|
||||
fbFinishAccess (pDrawable);
|
||||
}
|
||||
|
|
|
@ -79,7 +79,6 @@
|
|||
#define fbExpandDirectColors wfbExpandDirectColors
|
||||
#define fbFill wfbFill
|
||||
#define fbFillRegionSolid wfbFillRegionSolid
|
||||
#define fbFillRegionTiled wfbFillRegionTiled
|
||||
#define fbFillSpans wfbFillSpans
|
||||
#define fbFixCoordModePrevious wfbFixCoordModePrevious
|
||||
#define fbGCFuncs wfbGCFuncs
|
||||
|
|
|
@ -996,18 +996,6 @@ kaaFillRegionSolid (DrawablePtr pDrawable,
|
|||
kaaDrawableDirty (pDrawable);
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void
|
||||
kaaFillRegionTiled (DrawablePtr pDrawable,
|
||||
RegionPtr pRegion,
|
||||
Pixmap pTile)
|
||||
{
|
||||
else
|
||||
{
|
||||
kaaWaitSync
|
||||
}
|
||||
#endif
|
||||
|
||||
Bool
|
||||
kaaDrawInit (ScreenPtr pScreen,
|
||||
KaaScreenInfoPtr pScreenInfo)
|
||||
|
|
Loading…
Reference in New Issue
Block a user