summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2007-12-24 15:07:49 -0500
committerAdam Jackson <ajax@redhat.com>2008-02-22 15:22:38 -0500
commit24bebdded44a9e184455b4fee7800257fee81efb (patch)
tree8517e45158770cf2c81876a1393ec98c06011539 /fb
parentee21aba6be0078949204e315ddfffd99de60c2f1 (diff)
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.
Diffstat (limited to 'fb')
-rw-r--r--fb/fb.h5
-rw-r--r--fb/fbwindow.c65
-rw-r--r--fb/wfbrename.h1
3 files changed, 0 insertions, 71 deletions
diff --git a/fb/fb.h b/fb/fb.h
index 5b56d96a2..01000d79c 100644
--- a/fb/fb.h
+++ b/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 *);
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 89f601f29..f6fe8aa83 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -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);
-}
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 93822442f..dc0528559 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -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