glx: Fix another case of using req outside of the display lock
authorAdam Jackson <ajax@redhat.com>
Wed, 1 Jun 2011 15:33:48 +0000 (11:33 -0400)
committerAdam Jackson <ajax@redhat.com>
Thu, 2 Jun 2011 19:37:21 +0000 (15:37 -0400)
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
src/glx/glxcmds.c

index dbfa0edff9832ce6e66a9b927b5b2780abba1cc4..8b4151d0b4b78b81003c352b80ab85759aa71ecb 100644 (file)
@@ -644,13 +644,13 @@ glXCreateGLXPixmap(Display * dpy, XVisualInfo * vis, Pixmap pixmap)
       if (psc->driScreen == NULL)
          break;
       config = glx_config_find_visual(psc->visuals, vis->visualid);
-      pdraw = psc->driScreen->createDrawable(psc, pixmap, req->glxpixmap, config);
+      pdraw = psc->driScreen->createDrawable(psc, pixmap, xid, config);
       if (pdraw == NULL) {
          fprintf(stderr, "failed to create pixmap\n");
          break;
       }
 
-      if (__glxHashInsert(priv->drawHash, req->glxpixmap, pdraw)) {
+      if (__glxHashInsert(priv->drawHash, xid, pdraw)) {
          (*pdraw->destroyDrawable) (pdraw);
          return None;           /* FIXME: Check what we're supposed to do here... */
       }