xf86-video-intel: src/i830_dri.c

[Jesse Barnes]

 src/i830_dri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00eb73286c3512a362dce00efdeae740772d0dcd
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Jun 29 09:12:28 2009 -0700

    Use swapbuffers_wait control
    
    Commit 1eec83a203c48822400742a1fb184b2cb52c62f7, which added the new
    SwapbuffersWait option, didn't actually include the code which used it.  So
    add a test to DRI2's CopyRegion call, only emitting the scanline wait
    command if the swapbuffers_wait option is set.
    
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

diff --git a/src/i830_dri.c b/src/i830_dri.c
index be09126..7e2d97e 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -299,7 +299,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
     ValidateGC(dst, pGC);
 
     /* Wait for the scanline to be outside the region to be copied */
-    if (pixmap_is_scanout(get_drawable_pixmap(dst))) {
+    if (pixmap_is_scanout(get_drawable_pixmap(dst)) && pI830->swapbuffers_wait) {
 	BoxPtr box;
 	BoxRec crtcbox;
 	int y1, y2;