support for GLX_ARB_multisample

diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index ec8ad07f221a1038a9a3490e1afa6a41dc0fb518..6483b97e569ca1fa330e16b7bd77b7913ec5c727 100644 (file)
--- a/src/glut/glx/glut_win.c
+++ b/src/glut/glx/glut_win.c
@@ -328,11 +328,16 @@ getVisualInfoRGB(unsigned int mode)
       list[n++] = 1;
     }
   }
-#if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
+#if defined(GLX_VERSION_1_1) && (defined(GLX_SGIS_multisample) || defined(GLX_ARB_multisample))
   if (GLUT_WIND_IS_MULTISAMPLE(mode)) {
-    if (!__glutIsSupportedByGLX("GLX_SGIS_multisample"))
+    if (!__glutIsSupportedByGLX("GLX_SGIS_multisample") &&
+        !__glutIsSupportedByGLX("GLX_ARB_multisample"))
       return NULL;
+#if defined(GLX_ARB_multisample)
+    list[n++] = GLX_SAMPLES_ARB;
+#elif defined(GLX_SGIS_multisample)
     list[n++] = GLX_SAMPLES_SGIS;
+#endif
     /* XXX Is 4 a reasonable minimum acceptable number of
        samples? */
     list[n++] = 4;