[PATCH xserver 02/13] glx: Remove server-side mention of GLX_MESA_swap_control

[Adam Jackson]

This extension is direct-only and has no GLX protocol. We don't even
track an enable bit for it, trying to turn it on is pointless.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glx/glxdri2.c          | 4 +---
 hw/xwin/glx/indirect.c | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 948d653..2a7c1e3 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -876,10 +876,8 @@ 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");
-        LogMessage(X_INFO,
-                   "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
+        LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control\n");
     }
 
     /* enable EXT_framebuffer_sRGB extension (even if there are no sRGB capable fbconfigs) */
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index e515d18..c4be791 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -667,10 +667,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
         if (strstr(wgl_extensions, "WGL_EXT_swap_control")) {
             __glXEnableExtension(screen->glx_enable_bits,
                                  "GLX_SGI_swap_control");
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_MESA_swap_control");
-            LogMessage(X_INFO,
-                       "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
+            LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control\n");
         }
 
 /*       // Hmm?  screen->texOffset */
-- 
2.5.0