diff options
| author | Christoph Bumiller <[email protected]> | 2010-08-18 14:37:47 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-08-18 14:37:47 +0200 |
| commit | 3e54d63429fe7ca5db3c75c181abbaf7a7f55724 (patch) | |
| tree | e129c36aaef712525f0a04fc5b06c445e3cf84df /src/glut/glx/glut_overlay.c | |
| parent | eaab76457818fad0926b84c663440e8987e1f19f (diff) | |
| parent | 85d9bc236d6a8ff8f12cbc2150f8c3740354f573 (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
Diffstat (limited to 'src/glut/glx/glut_overlay.c')
| -rw-r--r-- | src/glut/glx/glut_overlay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glut/glx/glut_overlay.c b/src/glut/glx/glut_overlay.c index 32434650ebe..ce8e68d164a 100644 --- a/src/glut/glx/glut_overlay.c +++ b/src/glut/glx/glut_overlay.c @@ -81,10 +81,11 @@ checkOverlayAcceptability(XVisualInfo * vi, unsigned int mode) if (GLUT_WIND_HAS_STENCIL(mode) && (value <= 0)) return 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)) /* XXX Multisampled overlay color index?? Pretty unlikely. */ /* Look for multisampling if requested. */ - if (__glutIsSupportedByGLX("GLX_SGIS_multisample")) + if (__glutIsSupportedByGLX("GLX_SGIS_multisample") || + __glutIsSupportedByGLX("GLX_ARB_multisample")) glXGetConfig(__glutDisplay, vi, GLX_SAMPLES_SGIS, &value); else value = 0; |