summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2012-07-07 12:00:50 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2012-07-07 12:00:50 +0000
commitdba432f370d19e3d2f6df0a7689172fe7001862d (patch)
tree46eed749f57c88dbff20333823f1492f520a1f39
parent9a769cec8180883794c96a1c0c9a9a7021428296 (diff)
Don't enable INTEL_swap_event unconditionally and wait forever for an
event that's not coming. This unbreak clutter/cogl and probably other toolkits. Upstream commit 25620eb1d277c6b80edb136eaeca12532fcfd3ce by Adam Jackson ok ajacoutot@, jasper@, robert@
-rw-r--r--dist/Mesa/src/glx/glxextensions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/Mesa/src/glx/glxextensions.c b/dist/Mesa/src/glx/glxextensions.c
index 3a0e64c46..181f7f8fb 100644
--- a/dist/Mesa/src/glx/glxextensions.c
+++ b/dist/Mesa/src/glx/glxextensions.c
@@ -137,7 +137,7 @@ static const struct extension_info known_glx_extensions[] = {
{ GLX(SGIX_visual_select_group), VER(0,0), Y, Y, N, N },
{ GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N },
#endif
- { GLX(INTEL_swap_event), VER(1,4), Y, Y, N, N },
+ { GLX(INTEL_swap_event), VER(1,4), Y, N, N, N },
{ NULL }
};