xserver: Branch 'master'

[Ian Romanick]

 glx/glxdri.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 82f150d73cc9a7d8eaf7241a51b03af05bcec159
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Sep 24 16:56:45 2008 -0700

    GLX: Make sure GLX_SGI_make_current_read is enabled when possible

diff --git a/glx/glxdri.c b/glx/glxdri.c
index aa763de..c33b5bd 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -871,6 +871,15 @@ initializeExtensions(__GLXDRIscreen *screen)
     extensions = screen->core->getExtensions(screen->driScreen);
 
     for (i = 0; extensions[i]; i++) {
+#ifdef __DRI_READ_DRAWABLE
+	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");
+	}
+#endif
+
 #ifdef __DRI_COPY_SUB_BUFFER
 	if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
 	    screen->copySubBuffer = (__DRIcopySubBufferExtension *) extensions[i];