diff options
| author | Keith Packard <keithp@keithp.com> | 2012-08-06 15:11:13 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-08-06 15:11:13 -0700 |
| commit | 7d87545ba7395ade507cca7bdca7052b26ed18d8 (patch) | |
| tree | 9aecfdb7689c2b517cda4e8e4885b2f3ade74f3d /glx | |
| parent | ad707a7dcc65c30e030c7600b54f734090e56a91 (diff) | |
| parent | 988d7ace19a009991a4528e783d1a94c2444c66a (diff) | |
Merge remote-tracking branch 'jturney/master'
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/extension_string.c | 2 | ||||
| -rw-r--r-- | glx/glxscreens.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/glx/extension_string.c b/glx/extension_string.c index ee9864e64..544ca1f5e 100644 --- a/glx/extension_string.c +++ b/glx/extension_string.c @@ -87,7 +87,7 @@ static const struct extension_info known_glx_extensions[] = { { GLX(SGIX_fbconfig), VER(1,3), Y, }, { GLX(SGIX_pbuffer), VER(1,3), Y, }, { GLX(SGIX_visual_select_group), VER(0,0), Y, }, - { GLX(INTEL_swap_event), VER(1,4), N, }, + { GLX(INTEL_swap_event), VER(0,0), N, }, { NULL } /* *INDENT-ON* */ }; diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 386987e26..037b03765 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -174,7 +174,7 @@ static char GLXServerExtensions[] = "GLX_SGIS_multisample " #endif "GLX_SGIX_fbconfig " - "GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer " "GLX_INTEL_swap_event"; + "GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer "; static Bool glxCloseScreen(ScreenPtr pScreen) |