summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-11-04 22:20:28 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-11-04 22:20:28 +0000
commit8a738db519a3cfb7a0a87a3c97090709bbbd6024 (patch)
tree72afc99a3a4ee045848a4eda550ca13f3af62081
parent4b01eb6e08c7df44728a3e1c578b1cd8595e12eb (diff)
support for GLX_ARB_multisample
-rw-r--r--src/glut/glx/glut_win.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index ec8ad07f22..6483b97e56 100644
--- 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;