--- glx/glxdri2.c
+++ glx/glxdri2.c
@@ -393,7 +393,8 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
 }
 
 static Bool
-dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
+dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
+                         const uint32_t *attribs,
                          unsigned *major_ver, unsigned *minor_ver,
                          uint32_t *flags, int *api, int *reset, unsigned *error)
 {
@@ -486,7 +487,7 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
      */
     if (*api == __DRI_API_OPENGL_CORE
         && (*major_ver < 3 || (*major_ver < 3 && *minor_ver < 2))) {
-        *api == __DRI_API_OPENGL;
+        *api = __DRI_API_OPENGL;
     }
 
     *error = Success;
@@ -516,7 +517,7 @@ create_driver_context(__GLXDRIcontext * context,
         int api;
 
         if (num_attribs != 0) {
-            if (!dri2_convert_glx_attribs(num_attribs, attribs,
+            if (!dri2_convert_glx_attribs(screen, num_attribs, attribs,
                                           &major_ver, &minor_ver,
                                           &flags, &api, &reset,
                                           (unsigned *) error))
@@ -537,9 +538,9 @@ create_driver_context(__GLXDRIcontext * context,
             }
 
 #ifdef __DRI2_ROBUSTNESS
-            if (reset != __DRI_CTX_NO_RESET_NOTIFICATION) {
+            if (reset != __DRI_CTX_RESET_NO_NOTIFICATION) {
                 ctx_attribs[num_ctx_attribs++] =
-                    __DRI_CTX_ATTRIB_RESET_NOTIFICATION;
+                    __DRI_CTX_ATTRIB_RESET_STRATEGY;
                 ctx_attribs[num_ctx_attribs++] = reset;
             }
 #endif