1 files changed, 4 insertions, 1 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 8927976f587..85041ad5c51 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -238,7 +238,7 @@ validate_renderType_against_config(const struct glx_config *config,
 {
    /* GLX_EXT_no_config_context supports any render type */
    if (!config)
-      return True;
+      return renderType == GLX_DONT_CARE;
 
    switch (renderType) {
       case GLX_RGBA_TYPE:
@@ -269,6 +269,9 @@ glx_context_init(struct glx_context *gc,
    gc->isDirect = GL_TRUE;
    gc->currentContextTag = -1;
 
+   if (!config)
+      gc->renderType = GLX_DONT_CARE;
+
    return True;
 }