From 6ac82a70579eaed53a2c8ad6cf9fee195447fdaf Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Thu, 2 Feb 2006 21:01:11 +0000
Subject: [PATCH] Use prevglxc->{draw,read}Priv->drawId for previously bound
 drawables when     unbinding context.

---
 ChangeLog        | 6 ++++++
 GL/glx/glxcmds.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89cfefba1..ef9891cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* GL/glx/glxcmds.c: (DoMakeCurrent):
+	Use prevglxc->{draw,read}Priv->drawId for previously bound
+	drawables when unbinding context.
+
 2006-02-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* GL/glx/glxcmds.c: (DoMakeCurrent):
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index e2ce3e93a..47367cb23 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -619,8 +619,8 @@ int DoMakeCurrent( __GLXclientState *cl,
 	 * in the DRIcontext interface. */
 
 	if (!(*prevglxc->driContext.unbindContext)(NULL, prevglxc->pScreen->myNum,
-						   0, /* prev draw */
-						   0, /* prev read */
+						   prevglxc->drawPriv->drawId, /* prev draw */
+						   prevglxc->readPriv->drawId, /* prev read */
 						   &prevglxc->driContext)) {
 	    return __glXBadContext;
 	}