From 7df46d26fdb7044d79f19fff7a1dbb372acafe8d Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 5 Nov 2008 19:22:42 -0800 Subject: [PATCH] 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 (cherry picked from commit 5bc78b9f96a5458747dcc1a69ae625656d23f065) --- glx/glxcmds.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 35fc3ef35..6db5ee607 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -959,7 +959,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc) return Success; } -#define __GLX_TOTAL_FBCONFIG_ATTRIBS (36) +#define __GLX_TOTAL_FBCONFIG_ATTRIBS (38) #define __GLX_FBCONFIG_ATTRIBS_LENGTH (__GLX_TOTAL_FBCONFIG_ATTRIBS * 2) /** * Send the set of GLXFBConfigs to the client. There is not currently @@ -1048,6 +1048,9 @@ DoGetFBConfigs(__GLXclientState *cl, unsigned screen) WRITE_PAIR( GLX_BIND_TO_MIPMAP_TEXTURE_EXT, modes->bindToMipmapTexture ); WRITE_PAIR( GLX_BIND_TO_TEXTURE_TARGETS_EXT, modes->bindToTextureTargets ); + WRITE_PAIR( GLX_SAMPLE_BUFFERS_SGIS, modes->sampleBuffers ); + WRITE_PAIR( GLX_SAMPLES_SGIS, modes->samples ); + if (client->swapped) { __GLX_SWAP_INT_ARRAY(buf, __GLX_FBCONFIG_ATTRIBS_LENGTH); }