diff options
Diffstat (limited to 'hw/xfree86/xaa/xaaPict.c')
-rw-r--r-- | hw/xfree86/xaa/xaaPict.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index 4b7e3d0f0..fecbbcfa0 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.17 2002/12/10 04:17:21 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -432,10 +432,11 @@ XAAComposite (CARD8 op, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height)) { - if(pSrc->pDrawable->type == DRAWABLE_WINDOW || + if((pSrc->pDrawable->type == DRAWABLE_WINDOW || pDst->pDrawable->type == DRAWABLE_WINDOW || IS_OFFSCREEN_PIXMAP(pSrc->pDrawable) || - IS_OFFSCREEN_PIXMAP(pDst->pDrawable)) { + IS_OFFSCREEN_PIXMAP(pDst->pDrawable)) + && infoRec->pScrn->vtSema) { SYNC_CHECK(pDst->pDrawable); } (*GetPictureScreen(pScreen)->Composite) (op, @@ -666,10 +667,11 @@ XAAGlyphs (CARD8 op, !(*infoRec->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs)) { - if((pSrc->pDrawable->type == DRAWABLE_WINDOW) || + if(((pSrc->pDrawable->type == DRAWABLE_WINDOW) || (pDst->pDrawable->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc->pDrawable) || - IS_OFFSCREEN_PIXMAP(pDst->pDrawable)) { + IS_OFFSCREEN_PIXMAP(pDst->pDrawable)) + && infoRec->pScrn->vtSema) { SYNC_CHECK(pDst->pDrawable); } (*GetPictureScreen(pScreen)->Glyphs) (op, pSrc, pDst, maskFormat, |