[PATCH xserver 7/8] glx: Enable GLX_SGI_make_current_read in the core

[Adam Jackson]

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

diff --git a/glx/extension_string.c b/glx/extension_string.c
index 616c793..565813a 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -92,7 +92,7 @@ static const struct extension_info known_glx_extensions[] = {
 
     { GLX(MESA_copy_sub_buffer),        VER(0,0), N, },
     { GLX(OML_swap_method),             VER(0,0), Y, },
-    { GLX(SGI_make_current_read),       VER(1,3), N, },
+    { GLX(SGI_make_current_read),       VER(1,3), Y, },
     { GLX(SGI_swap_control),            VER(0,0), N, },
     { GLX(SGIS_multisample),            VER(0,0), Y, },
     { GLX(SGIX_fbconfig),               VER(1,3), Y, },
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 948d653..4c2290b 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -902,13 +902,6 @@ initializeExtensions(__GLXDRIscreen * screen)
     }
 
     for (i = 0; extensions[i]; i++) {
-        if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) {
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_SGI_make_current_read");
-
-            LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
-        }
-
         if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
             screen->texBuffer = (const __DRItexBufferExtension *) extensions[i];
             /* GLX_EXT_texture_from_pixmap is always enabled. */
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index cb57e9a..27d1aa4 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -414,7 +414,6 @@ initializeExtensions(__GLXDRIscreen * screen)
     __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_framebuffer_sRGB");
     __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_fbconfig_float");
     __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_fbconfig_packed_float");
-    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read");
 
     extensions = screen->core->getExtensions(screen->driScreen);
 
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 220ad7e..a5a6739 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -639,7 +639,6 @@ glxWinScreenProbe(ScreenPtr pScreen)
         __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
         __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
         __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
-        __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read");
 
         // GLX_ARB_multisample is always enabled, even if no configs support it
         if (strstr(wgl_extensions, "WGL_ARB_multisample"))
-- 
2.5.0