diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
| commit | 666141b21e89c617ca466af62ebcb56dc4f5450c (patch) | |
| tree | 4d0cddde47b6d8cbc92395dc2091849f89d68138 /xorg-server/glx | |
| parent | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (diff) | |
| parent | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (diff) | |
| download | vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.gz vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.bz2 vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwindow.h
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/extension_string.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glxext.c | 1 | ||||
| -rw-r--r-- | xorg-server/glx/glxscreens.c | 2 |
3 files changed, 3 insertions, 2 deletions
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 0436e2cff..01597849e 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -44,6 +44,7 @@ #include "privates.h" #include <os.h> #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 ca0e5254b..4ed3f9c59 100644 --- a/xorg-server/glx/glxscreens.c +++ b/xorg-server/glx/glxscreens.c @@ -178,7 +178,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) |