Merge branch 'mesa_7_6_branch'

[mesa.git] / src / egl / main / eglconfigutil.c

diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c
index a5fcdcd2876ebfceedf76b72f592cbb61e3564ad..36e94f0d2de841203db50eccb0e7951209594793 100644 (file)
--- a/src/egl/main/eglconfigutil.c
+++ b/src/egl/main/eglconfigutil.c
@@ -102,7 +102,12 @@ _eglConfigFromContextModesRec(_EGLConfig *conf, const __GLcontextModes *m,
 
    SET_CONFIG_ATTRIB(conf, EGL_NATIVE_RENDERABLE, m->xRenderable);
    SET_CONFIG_ATTRIB(conf, EGL_NATIVE_VISUAL_ID, m->visualID);
-   SET_CONFIG_ATTRIB(conf, EGL_NATIVE_VISUAL_TYPE, m->visualType);
+
+   if (m->visualType != GLX_NONE)
+      SET_CONFIG_ATTRIB(conf, EGL_NATIVE_VISUAL_TYPE, m->visualType);
+   else
+      SET_CONFIG_ATTRIB(conf, EGL_NATIVE_VISUAL_TYPE, EGL_NONE);
+
    SET_CONFIG_ATTRIB(conf, EGL_RENDERABLE_TYPE, renderable_type);
    SET_CONFIG_ATTRIB(conf, EGL_SAMPLE_BUFFERS, m->sampleBuffers);
    SET_CONFIG_ATTRIB(conf, EGL_SAMPLES, m->samples);