Merge branch '7.8'

1 files changed, 6 insertions, 1 deletions

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 06f3d8b71c0..d09d614741d 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -185,7 +185,7 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
    pdraw->base.drawable = drawable;
    pdraw->base.psc = psc;
    pdraw->bufferCount = 0;
-   pdraw->swap_interval = 0;
+   pdraw->swap_interval = 1;
 
    DRI2CreateDrawable(psc->dpy, xDrawable);
 
@@ -200,6 +200,11 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
       return NULL;
    }
 
+   /*
+    * Make sure server has the same swap interval we do for the new
+    * drawable.
+    */
+   DRI2SwapInterval(psc->dpy, xDrawable, pdraw->swap_interval);
    return &pdraw->base;
 }