From 2415e2dce918efd49d5e6d71f705255a234a866b Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Mon, 20 Jul 2009 02:08:31 +0200 Subject: EXA: Bail earlier from exaDoPutImage if the driver has no UploadToScreen hook. Also remove dead code associated with access_prepared local variable. --- exa/exa_accel.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'exa/exa_accel.c') diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 1466bf577..a554fc9c3 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -149,10 +149,9 @@ exaDoPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int nbox; int xoff, yoff; int bpp = pDrawable->bitsPerPixel; - Bool access_prepared = FALSE; Bool ret = TRUE; - if (pExaPixmap->accel_blocked) + if (pExaPixmap->accel_blocked || !pExaScr->info->UploadToScreen) return FALSE; /* Don't bother with under 8bpp, XYPixmaps. */ @@ -179,7 +178,7 @@ exaDoPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, pPix = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff); - if (!pPix || !pExaScr->info->UploadToScreen) + if (!pPix) return FALSE; x += pDrawable->x; @@ -221,9 +220,7 @@ exaDoPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, } } - if (access_prepared) - exaFinishAccess(pDrawable, EXA_PREPARE_DEST); - else + if (ret) exaMarkSync(pDrawable->pScreen); return ret; -- cgit v1.2.3