glx: Fix the GLXFBConfig attrib sort priorities

The sort priorites for GLX_SAMPLES and GLX_SAMPLE_BUFFERS are
not defined in GL_ARB_multisample, but they are defined in
the GLX 1.4 specification.

Cc: "9.2 10.0 10.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Fredrik Höglund 2014-02-15 18:48:40 +01:00
parent f41c2f6c33
commit 3616e862f2

View file

@ -1105,7 +1105,7 @@ static int
fbconfig_compare(struct glx_config **a, struct glx_config **b)
{
/* The order of these comparisons must NOT change. It is defined by
* the GLX 1.3 spec and ARB_multisample.
* the GLX 1.4 specification.
*/
PREFER_SMALLER(visualSelectGroup);
@ -1134,6 +1134,9 @@ fbconfig_compare(struct glx_config **a, struct glx_config **b)
PREFER_SMALLER(numAuxBuffers);
PREFER_SMALLER(sampleBuffers);
PREFER_SMALLER(samples);
PREFER_LARGER_OR_ZERO(depthBits);
PREFER_SMALLER(stencilBits);
@ -1147,12 +1150,6 @@ fbconfig_compare(struct glx_config **a, struct glx_config **b)
PREFER_SMALLER(visualType);
/* None of the multisample specs say where this comparison should happen,
* so I put it near the end.
*/
PREFER_SMALLER(sampleBuffers);
PREFER_SMALLER(samples);
/* None of the pbuffer or fbconfig specs say that this comparison needs
* to happen at all, but it seems like it should.
*/