frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EXA: Don't attempt to move in pixmaps that can't be accelerated. 

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
This commit is contained in:
Michel Dänzer 2007-10-18 17:44:14 +02:00
parent feac075952
commit 5d74416740
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exa/exa_accel.c
View File

@ -152,6 +152,9 @@ exaDoPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
int bpp = pDrawable->bitsPerPixel; int bpp = pDrawable->bitsPerPixel;
Bool access_prepared = FALSE; Bool access_prepared = FALSE;
if (pExaPixmap->accel_blocked)
return FALSE;
/* Don't bother with under 8bpp, XYPixmaps. */ /* Don't bother with under 8bpp, XYPixmaps. */
if (format != ZPixmap || bpp < 8) if (format != ZPixmap || bpp < 8)
return FALSE; return FALSE;

3
exa/exa_migration.c
View File

@ -299,6 +299,9 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate)
if (pPixmap->drawable.bitsPerPixel < 8) if (pPixmap->drawable.bitsPerPixel < 8)
return; return;
if (pExaPixmap->accel_blocked)
return;
if (pExaPixmap->area == NULL) { if (pExaPixmap->area == NULL) {
pExaPixmap->area = pExaPixmap->area =
exaOffscreenAlloc (pScreen, pExaPixmap->fb_size, exaOffscreenAlloc (pScreen, pExaPixmap->fb_size,

16
exa/exa_render.c
View File

@ -247,10 +247,24 @@ exaTryDriverSolidFill(PicturePtr pSrc,
int nbox; int nbox;
int dst_off_x, dst_off_y; int dst_off_x, dst_off_y;
PixmapPtr pSrcPix, pDstPix; PixmapPtr pSrcPix, pDstPix;
ExaPixmapPrivPtr pSrcExaPix, pDstExaPix;
CARD32 pixel; CARD32 pixel;
CARD16 red, green, blue, alpha; CARD16 red, green, blue, alpha;
ExaMigrationRec pixmaps[1]; ExaMigrationRec pixmaps[1];
pDstPix = exaGetDrawablePixmap (pDst->pDrawable);
pSrcPix = exaGetDrawablePixmap (pSrc->pDrawable);
pSrcExaPix = ExaGetPixmapPriv(pSrcPix);
pDstExaPix = ExaGetPixmapPriv(pDstPix);
/* Check whether the accelerator can use these pixmaps.
*/
if (pSrcExaPix->accel_blocked || pDstExaPix->accel_blocked)
{
return -1;
}
xDst += pDst->pDrawable->x; xDst += pDst->pDrawable->x;
yDst += pDst->pDrawable->y; yDst += pDst->pDrawable->y;
xSrc += pSrc->pDrawable->x; xSrc += pSrc->pDrawable->x;
@ -261,12 +275,10 @@ exaTryDriverSolidFill(PicturePtr pSrc,
width, height)) width, height))
return 1; return 1;
pDstPix = exaGetDrawablePixmap (pDst->pDrawable);
exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y); exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y);
REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y); REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
pSrcPix = exaGetDrawablePixmap (pSrc->pDrawable);
pixel = exaGetPixmapFirstPixel (pSrcPix); pixel = exaGetPixmapFirstPixel (pSrcPix);
pixmaps[0].as_dst = TRUE; pixmaps[0].as_dst = TRUE;