diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 5be7e0c..e6f1219 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -148,7 +148,7 @@ static void dri2DestroyDrawable(__GLXDRIdrawable *pdraw)
     const __DRIcoreExtension *core = pdraw->psc->core;
 
     (*core->destroyDrawable)(pdraw->driDrawable);
-    DRI2DestroyDrawable(pdraw->psc->dpy, pdraw->drawable);
+    DRI2DestroyDrawable(pdraw->psc->dpy, pdraw->xDrawable);
     Xfree(pdraw);
 }
 
@@ -178,7 +178,7 @@ static __GLXDRIdrawable *dri2CreateDrawable(__GLXscreenConfigs *psc,
 					config->driConfig, pdraw);
 
     if (!pdraw->base.driDrawable) {
-	DRI2DestroyDrawable(psc->dpy, drawable);
+	DRI2DestroyDrawable(psc->dpy, xDrawable);
 	Xfree(pdraw);
 	return NULL;
     }
@@ -209,7 +209,7 @@ static void dri2CopySubBuffer(__GLXDRIdrawable *pdraw,
 
     region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1);
     /* should get a fence ID back from here at some point */
-    DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region,
+    DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region,
 		   DRI2BufferFrontLeft, DRI2BufferBackLeft);
     XFixesDestroyRegion(pdraw->psc->dpy, region);
 }
@@ -242,7 +242,7 @@ static void dri2WaitX(__GLXDRIdrawable *pdraw)
 #endif
 
     region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1);
-    DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region,
+    DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region,
 		   DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft);
     XFixesDestroyRegion(pdraw->psc->dpy, region);
 }
@@ -267,7 +267,7 @@ static void dri2WaitGL(__GLXDRIdrawable *pdraw)
 #endif
 
     region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1);
-    DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region,
+    DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region,
 		   DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft);
     XFixesDestroyRegion(pdraw->psc->dpy, region);
 }