xf86-video-intel: uxa/uxa-accel.c

[Chris Wilson]

 uxa/uxa-accel.c |   26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 28024f6c5f351ce4cb3434998d5dbfbeded7c606
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Apr 12 13:44:01 2010 +0100

    Revert "uxa: Add fallback warnings for PutImage."
    
    This reverts commit 299b0338d0811192dc4f8eae5d79453e9882c5d1.
    A debugging patch, it was never intended to go into master

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index c022956..4f7fd41 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;