Commit 190b0321 authored by Zack Rusin's avatar Zack Rusin Committed by Keith Packard

GLX/DRI2: Do not expose INTEL_swap_event without swap control

Swap events depent on the implementation of ScheduleSwap. By
unconditionally enabling GLX_INTEL_swap_event we're breaking
the system with drivers that don't support it because the apps
are forever stuck waiting for an event that will never be
delivered. So lets enable the extension only if the hooks it
depends on are actually there.
Signed-off-by: default avatarZack Rusin <>
Reviewed-by: default avatarIan Romanick <>
Signed-off-by: Keith Packard's avatarKeith Packard <>
parent 116f0201
......@@ -857,8 +857,6 @@ initializeExtensions(__GLXDRIscreen * screen)
__glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
__glXEnableExtension(screen->glx_enable_bits, "GLX_INTEL_swap_event");
LogMessage(X_INFO, "AIGLX: enabled GLX_INTEL_swap_event\n");
#if __DRI_DRI2_VERSION >= 3
if (screen->dri2->base.version >= 3) {
......@@ -876,8 +874,10 @@ initializeExtensions(__GLXDRIscreen * screen)
if (DRI2HasSwapControl(pScreen)) {
__glXEnableExtension(screen->glx_enable_bits, "GLX_INTEL_swap_event");
__glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_swap_control");
__glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_swap_control");
LogMessage(X_INFO, "AIGLX: enabled GLX_INTEL_swap_event\n");
"AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment