[PATCH xserver 06/13] 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 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/glx/extension_string.c b/glx/extension_string.c
index 30c3416..7e74090 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 c56a376..71dab2a 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -900,13 +900,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];
             __glXEnableExtension(screen->glx_enable_bits,
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 84fd3a1..aaf55ca 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);
 
-- 
2.5.0