XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-06 19:34:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

EXA: Bail earlier from exaDoPutImage if the driver has no UploadToScreen hook.

Browse Source 
Also remove dead code associated with access_prepared local variable.
This commit is contained in:
Michel Dänzer
2009-07-20 02:08:31 +02:00
parent 00fe4a2977
commit 2415e2dce9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
exa/exa_accel.c
View File

@@ -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;