xserver: Branch 'xorg-server-1.4-apple'

[George Peter Staplin]

 GL/glx/glxcmds.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5bc78b9f96a5458747dcc1a69ae625656d23f065
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date:   Tue Nov 4 15:46:58 2008 -0700

    GL/glx: WRITE_PAIR the GLX_SAMPLE_BUFFERS_SGIS, and GLX_SAMPLES_SGIS mode data.
    
    More recent versions of glxcmds.c already do this.
    
    This enables glxinfo to correctly detect the multisampling with output like so
    from glxinfo -v:
     multiSample=6  multiSampleBuffers=1

diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index ca4b023..b45e7c3 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1088,7 +1088,7 @@ __glXCreateARGBConfig(__GLXscreen *screen)
 }
 
 
-#define __GLX_TOTAL_FBCONFIG_ATTRIBS (28)
+#define __GLX_TOTAL_FBCONFIG_ATTRIBS (30)
 #define __GLX_FBCONFIG_ATTRIBS_LENGTH (__GLX_TOTAL_FBCONFIG_ATTRIBS * 2)
 /**
  * Send the set of GLXFBConfigs to the client.  There is not currently
@@ -1185,6 +1185,9 @@ int DoGetFBConfigs(__GLXclientState *cl, unsigned screen, GLboolean do_swap)
 	WRITE_PAIR( GLX_TRANSPARENT_INDEX_VALUE, modes->transparentIndex );
 	WRITE_PAIR( GLX_SWAP_METHOD_OML, modes->swapMethod );
 
+	WRITE_PAIR( GLX_SAMPLE_BUFFERS_SGIS, modes->sampleBuffers );
+	WRITE_PAIR( GLX_SAMPLES_SGIS, modes->samples );
+
 	if ( do_swap ) {
 	    __GLX_SWAP_INT_ARRAY(buf, __GLX_FBCONFIG_ATTRIBS_LENGTH);
 	}