diff --git a/.pick_status.json b/.pick_status.json
index 393c5f96271..60e80ae7cc4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2164,7 +2164,7 @@
         "description": "glx/dri3: fix glXQueryContext does not return GLX_RENDER_TYPE value",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 3b3918cf6c1..55e58dd35eb 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -306,6 +306,8 @@ dri3_create_context_attribs(struct glx_screen *base,
          pcp->base.noError = GL_TRUE;
    }
 
+   pcp->base.renderType = dca.render_type;
+
    pcp->driContext =
       (*psc->image_driver->createContextAttribs) (psc->driScreen,
                                                   dca.api,