diff --git a/.pick_status.json b/.pick_status.json
index 98af8be53a5..42af69d6c93 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -674,7 +674,7 @@
         "description": "glx: Guard some of the bind_extensions() code with the same conditions as `glx_screen`s `frontend_screen` member.",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "34dea2b38eb336e0414d60b168b9209e029a8cad",
         "notes": null
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index b03554487c3..34f9f718327 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -790,6 +790,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName)
       __glXEnableDirectExtension(psc, "GLX_INTEL_swap_event");
    }
 
+#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
    mask = driGetAPIMask(psc->frontend_screen);
 
    __glXEnableDirectExtension(psc, "GLX_ARB_create_context");
@@ -846,6 +847,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName)
          psc->keep_native_window_glx_drawable = keep_native_window_glx_drawable;
       }
    }
+#endif
 }