From f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 7 Aug 2012 07:51:02 +0200 Subject: mesa xserver xkeyboard-config git update 7 Aug 2012 --- xorg-server/glx/extension_string.c | 2 +- xorg-server/glx/glxext.c | 1 + xorg-server/glx/glxscreens.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'xorg-server/glx') diff --git a/xorg-server/glx/extension_string.c b/xorg-server/glx/extension_string.c index ee9864e64..544ca1f5e 100644 --- a/xorg-server/glx/extension_string.c +++ b/xorg-server/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/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index 70f0df892..bc7fe8217 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -40,6 +40,7 @@ #include "privates.h" #include #include "extinit.h" +#include "glx_extinit.h" #include "unpack.h" #include "glxutil.h" #include "glxext.h" diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c index 386987e26..037b03765 100644 --- a/xorg-server/glx/glxscreens.c +++ b/xorg-server/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) -- cgit v1.2.3