Pull workaround for unset GLX_DRAWABLE_TYPE back in.

The old version just set GLX_DRAWABLE_TYPE to GLX_WINDOW_BIT for
configs received through glXGetVisualConfigs and to
GLX_WINDOW_BIT | GLX_PIXMAP_BIT for configs received as FBConfigs.
The X server needs to send this info, but keep the workaround for now.

Fixes #12835.

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 2a1fcf2b84b8e04e2e67bf7a09146fe15d3e033b..4b78ca85c68d5b5cf65793fa19720c743230bd53 100644 (file)
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1033,6 +1033,8 @@ createConfigsFromProperties(Display *dpy, int nvisuals, int nprops,
     m = modes;
     for (i = 0; i < nvisuals; i++) {
        _XRead(dpy, (char *)props, prop_size);
+       /* Older X servers don't send this so we default it here. */
+       m->drawableType = GLX_WINDOW_BIT;
        __glXInitializeVisualConfigFromTags(m, nprops, props,
                                            tagged_only, GL_TRUE);
        m->screen = screen;