diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-01-27 00:15:30 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-01-27 00:15:30 +0100 |
| commit | c6d57b8878419959d3035b1ff961ff6937af3827 (patch) | |
| tree | 2185bc9a06d527b3969d5527c026a36bf1455b79 /src/glamo-draw.c | |
| parent | 642c90b3feb6e117bcd0b6c6be9bfe9f3b2c0eb9 (diff) | |
Fix exaMarkSync/exaWaitSync usage.
Diffstat (limited to 'src/glamo-draw.c')
| -rw-r--r-- | src/glamo-draw.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/glamo-draw.c b/src/glamo-draw.c index 28c36e4..2cc92bf 100644 --- a/src/glamo-draw.c +++ b/src/glamo-draw.c @@ -320,9 +320,8 @@ GLAMOExaDoneSolid(PixmapPtr pPix) ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; GlamoPtr pGlamo = GlamoPTR(pScrn); - exaWaitSync(pGlamo->pScreen); - if (pGlamo->cmd_queue_cache) - GLAMOFlushCMDQCache(pGlamo, 1); + GLAMOFlushCMDQCache(pGlamo, 1); + exaMarkSync(pGlamo->pScreen); } Bool @@ -336,7 +335,6 @@ GLAMOExaPrepareCopy(PixmapPtr pSrc, ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; GlamoPtr pGlamo = GlamoPTR(pScrn); FbBits mask; - GLAMO_LOG("enter\n"); if (pSrc->drawable.bitsPerPixel != 16 || @@ -363,7 +361,7 @@ GLAMOExaPrepareCopy(PixmapPtr pSrc, pGlamo->fbstart); pGlamo->settings = GLAMOBltRop[alu] << 8; - exaMarkSync(pDst->drawable.pScreen); + GLAMO_LOG("leave\n"); return TRUE; } @@ -425,11 +423,8 @@ GLAMOExaDoneCopy(PixmapPtr pDst) ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; GlamoPtr pGlamo = GlamoPTR(pScrn); - GLAMO_LOG("enter\n"); - exaWaitSync(pGlamo->pScreen); - if (pGlamo->cmd_queue_cache) - GLAMOFlushCMDQCache(pGlamo, 1); - GLAMO_LOG("leave\n"); + GLAMOFlushCMDQCache(pGlamo, 1); + exaMarkSync(pGlamo->pScreen); } Bool @@ -540,6 +535,7 @@ GLAMOExaWaitMarker (ScreenPtr pScreen, int marker) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; GlamoPtr pGlamo = GlamoPTR(pScrn); + GLAMO_LOG("enter\n"); GLAMOEngineWait(pGlamo, GLAMO_ENGINE_ALL); GLAMO_LOG("leave\n"); |