summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-25 21:24:54 -0800
committerEric Anholt <eric@anholt.net>2014-01-30 16:40:06 -0800
commit09d6c1972037a5519488094afd225f793d2188d0 (patch)
tree91970f8843368c4df6882d01d199588cf9aa6e03
parent1525474eadf5ca000162e05b99d591998d1ed3f6 (diff)
dri3: Enable GLX_INTEL_swap_event
Now that we're tracking SBC values correctly, and the X server has the ability to send the GLX swap events from a PresentPixmap request, enable this extension. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--src/glx/dri3_glx.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 8efc2709fb..79bc5f0214 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1524,23 +1524,7 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
__glXEnableDirectExtension(&psc->base, "GLX_SGI_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_make_current_read");
-
- /*
- * GLX_INTEL_swap_event is broken on the server side, where it's
- * currently unconditionally enabled. This completely breaks
- * systems running on drivers which don't support that extension.
- * There's no way to test for its presence on this side, so instead
- * of disabling it unconditionally, just disable it for drivers
- * which are known to not support it, or for DDX drivers supporting
- * only an older (pre-ScheduleSwap) version of DRI2.
- *
- * This is a hack which is required until:
- * http://lists.x.org/archives/xorg-devel/2013-February/035449.html
- * is merged and updated xserver makes it's way into distros:
- */
-// if (pdp->swapAvailable && strcmp(driverName, "vmwgfx") != 0) {
-// __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
-// }
+ __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
mask = psc->image_driver->getAPIMask(psc->driScreen);