Mesa (10.4): Revert "glx/dri3: Request non-vsynced Present for swapinterval zero. (v3)"

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 45416a255f304c53ef14c5d78a079f0979b72600
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=45416a255f304c53ef14c5d78a079f0979b72600

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Dec 30 01:03:14 2014 +0000

Revert "glx/dri3: Request non-vsynced Present for swapinterval zero. (v3)"

This reverts commit ee241a688904211663e9445ed90e6d51aca3204f.

May not be the correct fix. Discussion is ongoing.

http://lists.freedesktop.org/archives/mesa-dev/2014-December/072969.html

---

 src/glx/dri3_glx.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 1ddc723..0bda670 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1526,7 +1526,6 @@ dri3_swap_buffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
    xcb_connection_t *c = XGetXCBConnection(dpy);
    struct dri3_buffer *back;
    int64_t ret = 0;
-   uint32_t options = XCB_PRESENT_OPTION_NONE;
 
    unsigned flags = __DRI2_FLUSH_DRAWABLE;
    if (flush)
@@ -1579,17 +1578,6 @@ dri3_swap_buffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
          remainder = 0;
       }
 
-      /* From the GLX_EXT_swap_control spec:
-       *
-       *     "If <interval> is set to a value of 0, buffer swaps are not
-       *      synchronized to a video frame."
-       *
-       * Implementation note: It is possible to enable triple buffering behaviour
-       * by not using XCB_PRESENT_OPTION_ASYNC, but this should not be the default.
-       */
-      if (priv->swap_interval == 0)
-          options |= XCB_PRESENT_OPTION_ASYNC;
-
       back->busy = 1;
       back->last_swap = priv->send_sbc;
       xcb_present_pixmap(c,
@@ -1603,7 +1591,7 @@ dri3_swap_buffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
                          None,                                 /* target_crtc */
                          None,
                          back->sync_fence,
-                         options,
+                         XCB_PRESENT_OPTION_NONE,
                          target_msc,
                          divisor,
                          remainder, 0, NULL);