diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-04-12 13:44:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-04-12 13:44:01 +0100 |
| commit | 28024f6c5f351ce4cb3434998d5dbfbeded7c606 (patch) | |
| tree | 3322520e0c557c8d344e1781ea20f85c301a2be4 /uxa/uxa-accel.c | |
| parent | 27195d7dba0f3ff08b92f3fd916cdf5113cbef58 (diff) | |
Revert "uxa: Add fallback warnings for PutImage."
This reverts commit 299b0338d0811192dc4f8eae5d79453e9882c5d1.
A debugging patch, it was never intended to go into master
Diffstat (limited to 'uxa/uxa-accel.c')
| -rw-r--r-- | uxa/uxa-accel.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c index c022956c..4f7fd41c 100644 --- a/uxa/uxa-accel.c +++ b/uxa/uxa-accel.c @@ -130,37 +130,17 @@ uxa_do_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int bpp = pDrawable->bitsPerPixel; /* Don't bother with under 8bpp, XYPixmaps. */ - if (format != ZPixmap || bpp < 8) { - ScrnInfoPtr scrn = xf86Screens[pDrawable->pScreen->myNum]; - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s %p: format=%d, bpp=%d\n", __FUNCTION__, pDrawable, - format, bpp); + if (format != ZPixmap || bpp < 8) return FALSE; - } /* Only accelerate copies: no rop or planemask. */ - if (!UXA_PM_IS_SOLID(pDrawable, pGC->planemask) || pGC->alu != GXcopy) { - ScrnInfoPtr scrn = xf86Screens[pDrawable->pScreen->myNum]; - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s %p: solid=%d, alu=%d\n", __FUNCTION__, pDrawable, - UXA_PM_IS_SOLID(pDrawable, pGC->planemask), pGC->alu); + if (!UXA_PM_IS_SOLID(pDrawable, pGC->planemask) || pGC->alu != GXcopy) return FALSE; - } - if (uxa_screen->swappedOut) { - ScrnInfoPtr scrn = xf86Screens[pDrawable->pScreen->myNum]; - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s %p: swapped out\n", __FUNCTION__, pDrawable); + if (uxa_screen->swappedOut) return FALSE; - } pPix = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff); - if (!pPix) { - ScrnInfoPtr scrn = xf86Screens[pDrawable->pScreen->myNum]; - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s %p: not offscreen pixmap\n", __FUNCTION__, pDrawable); - return FALSE; - } if (!pPix || !uxa_screen->info->put_image) return FALSE; |