xserver: Branch 'master'

[Eric Anholt]

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

New commits:
commit fd4eed69e40cf090aa16e79a8596eb1442461829
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 2 15:24:54 2009 -0700

    dri2: Enable GLX_SGI_make_current_read when the DRI driver supports it.
    
    This matches idr's 82f150d73cc9a7d8eaf7241a51b03af05bcec159 for DRI1.

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 529b2df..ed7fb4c 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -551,6 +551,15 @@ initializeExtensions(__GLXDRIscreen *screen)
     LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
 
     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_SWAP_CONTROL
 	if (strcmp(extensions[i]->name, __DRI_SWAP_CONTROL) == 0) {
 	    screen->swapControl =