diff options
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fb.h | 15 | ||||
| -rw-r--r-- | fb/fb24_32.c | 6 | ||||
| -rw-r--r-- | fb/fbcopy.c | 22 | ||||
| -rw-r--r-- | fb/fbfill.c | 1 | ||||
| -rw-r--r-- | fb/fbpixmap.c | 7 |
5 files changed, 10 insertions, 41 deletions
@@ -1262,17 +1262,6 @@ fbCopyNto1 (PixmapPtr pSrcPixmap, Pixel bitplane, void *closure); -extern _X_EXPORT RegionPtr -fbCopyArea (PixmapPtr pSrcPixmap, - PixmapPtr pDstPixmap, - DrvGCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, - int yOut); - drvCopyProc fbGetCopyAreaFunction(PixmapPtr pSrc, PixmapPtr pDst); @@ -1486,11 +1475,11 @@ fbPictureInit (ScreenPtr pScreen, extern _X_EXPORT PixmapPtr fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, - unsigned usage_hint); + unsigned usage_hint, ProtoPixmapPtr parent); extern _X_EXPORT PixmapPtr fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, - unsigned usage_hint); + unsigned usage_hint, ProtoPixmapPtr parent); extern _X_EXPORT Bool fbDestroyPixmap (PixmapPtr pPixmap); diff --git a/fb/fb24_32.c b/fb/fb24_32.c index ef0ac09e4..356749e64 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -541,9 +541,9 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) int newXoff, newYoff; pNewTile = pScreen->gpu.CreatePixmap(pScreen, pOldTile->width, - pOldTile->height, - pOldTile->depth, - pOldTile->usage_hint); + pOldTile->height, + pOldTile->depth, + pOldTile->usage_hint, NULL); if (!pNewTile) return 0; fbGetDrawable (pOldTile, diff --git a/fb/fbcopy.c b/fb/fbcopy.c index a9c676de7..4dbba78f5 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -289,28 +289,6 @@ fbCopyNto1 (PixmapPtr pSrcPixmap, } } -/* todo for ephyr EXA */ -RegionPtr -fbCopyArea (PixmapPtr pSrcPixmap, - PixmapPtr pDstPixmap, - DrvGCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, - int yOut) -{ - drvCopyProc copy; - - if (pSrcPixmap->bitsPerPixel != pDstPixmap->bitsPerPixel) - copy = fb24_32CopyMtoN; - else - copy = fbCopyNtoN; - return miDoCopy (pSrcPixmap, pDstPixmap, pGC, xIn, yIn, - widthSrc, heightSrc, xOut, yOut, copy, 0, 0); -} - drvCopyProc fbGetCopyAreaFunction(PixmapPtr pSrc, PixmapPtr pDst) diff --git a/fb/fbfill.c b/fb/fbfill.c index f1a5c018f..e7931829f 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -42,6 +42,7 @@ fbFill (PixmapPtr pPixmap, fbGetDrawable (pPixmap, dst, dstStride, dstBpp, dstXoff, dstYoff); + ErrorF("fill %p %dx%d %dx%d %08x %08x\n", pPixmap, x, y, width, height, pGC->fgPixel, pGC->planemask); switch (pGC->fillStyle) { case FillSolid: #ifndef FB_ACCESS_WRAPPER diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index a45d7e7c5..bba18553c 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -30,7 +30,7 @@ PixmapPtr fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, - unsigned usage_hint) + unsigned usage_hint, ProtoPixmapPtr parent) { PixmapPtr pPixmap; size_t datasize; @@ -67,6 +67,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, pPixmap->devKind = paddedWidth; pPixmap->refcnt = 1; pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust); + pPixmap->protoPixmap = parent; #ifdef FB_DEBUG pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth); @@ -79,13 +80,13 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, PixmapPtr fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, - unsigned usage_hint) + unsigned usage_hint, ProtoPixmapPtr parent) { int bpp; bpp = BitsPerPixel (depth); if (bpp == 32 && depth <= 24) bpp = fbGetScreenPrivate(pScreen)->pix32bpp; - return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint); + return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint, parent); } Bool |