diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-30 01:03:14 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-30 01:03:14 +0000 |
| commit | 45416a255f304c53ef14c5d78a079f0979b72600 (patch) | |
| tree | ede8552f71a8bac982db57f64614d80064951a7b | |
| parent | fb3f7c0bc599f705dec0024188f1cb5deed93495 (diff) | |
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
| -rw-r--r-- | src/glx/dri3_glx.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 1ddc723d508..0bda6703970 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); |