summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-06-29 09:12:28 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-06-29 09:15:19 -0700
commit00eb73286c3512a362dce00efdeae740772d0dcd (patch)
tree8f1fa659c60cfee8284aac25420288e13df8991e
parentf53b3239dbc0ed723774e386e07ac9d8ce96bb89 (diff)
downloadxf86-video-intel-00eb73286c3512a362dce00efdeae740772d0dcd.tar.gz
xf86-video-intel-00eb73286c3512a362dce00efdeae740772d0dcd.tar.bz2
xf86-video-intel-00eb73286c3512a362dce00efdeae740772d0dcd.zip
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@virtuousgeek.org>
-rw-r--r--src/i830_dri.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c
index be09126b2..7e2d97e99 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;