From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 17 Jun 2011 19:28:05 +0000 (-0700)
Subject: glx: Destroy the old context only after the new one has been bound
X-Git-Tag: android-x86-4.4-r1~10754
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=517614141be2a1f392a4ea87c1077911ccadf35f;p=android-x86%2Fexternal-mesa.git

glx: Destroy the old context only after the new one has been bound

This fixes a regression introduced by 49d7e48b33264d94e30af6129c281b6acafa9427

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---

diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 9eb7d5ac546..0f39ee50737 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -255,13 +255,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       if (--oldGC->thread_refcount == 0) {
 	 oldGC->vtable->unbind(oldGC, gc);
 	 oldGC->currentDpy = 0;
-
-	 if (oldGC->xid == None && oldGC != gc) {
-	    /* We are switching away from a context that was
-	     * previously destroyed, so we need to free the memory
-	     * for the old handle. */
-	    oldGC->vtable->destroy(oldGC);
-	 }
       }
    }
 
@@ -279,6 +272,13 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       __glXSetCurrentContextNull();
    }
 
+   if (oldGC->thread_refcount == 0 && oldGC != &dummyContext && oldGC->xid == None) {
+      /* We are switching away from a context that was
+       * previously destroyed, so we need to free the memory
+       * for the old handle. */
+      oldGC->vtable->destroy(oldGC);
+   }
+
    __glXUnlock();
 
    if (ret) {