diff options
author | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
commit | 8f2c5e2f41f211bed814be2889da16fc43e6f147 (patch) | |
tree | e1f2715f63544d39302d6daa2cb0d4f53d295ebc /xorg-server/exa/exa_render.c | |
parent | b404fe88bb87f42267cab4682b81f38cc442e617 (diff) | |
parent | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (diff) | |
download | vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.gz vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.bz2 vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/exa/exa_render.c')
-rw-r--r-- | xorg-server/exa/exa_render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c index db355d6c3..1b68e1cdc 100644 --- a/xorg-server/exa/exa_render.c +++ b/xorg-server/exa/exa_render.c @@ -320,7 +320,7 @@ exaTryDriverSolidFill(PicturePtr pSrc, exaDoMigration(pixmaps, 1, TRUE); } - if (!exaPixmapIsOffscreen(pDstPix)) { + if (!exaPixmapHasGpuCopy(pDstPix)) { REGION_UNINIT(pDst->pDrawable->pScreen, ®ion); return 0; } @@ -540,7 +540,7 @@ exaCompositeRects(CARD8 op, /* We have to manage the damage ourselves, since CompositeRects isn't * something in the screen that can be managed by the damage extension, * and EXA depends on damage to track what needs to be migrated between - * offscreen and onscreen. + * the gpu and the cpu. */ /* Compute the overall extents of the composited region - we're making @@ -752,7 +752,7 @@ exaTryDriverComposite(CARD8 op, } } - if (!exaPixmapIsOffscreen(pDstPix)) { + if (!exaPixmapHasGpuCopy(pDstPix)) { REGION_UNINIT(pDst->pDrawable->pScreen, ®ion); return 0; } |