From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 9 Apr 2009 14:15:12 +0000 (+0100)
Subject: wgl: Catch the attempt of releasing a context which is not current.
X-Git-Tag: android-x86-1.6~16^2~406^2~788
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=564ba2538691bd15df21da9fc378f0070235e286;p=android-x86%2Fexternal-mesa.git

wgl: Catch the attempt of releasing a context which is not current.
---

diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.c b/src/gallium/state_trackers/wgl/shared/stw_context.c
index 07d7452eb56..6eb1bd08d56 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_context.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_context.c
@@ -231,10 +231,17 @@ stw_release_context(
    if (!ctx)
       return FALSE;
    
-   /* XXX: The expectation is that ctx is the same context which is
+   /* The expectation is that ctx is the same context which is
     * current for this thread.  We should check that and return False
     * if not the case.
     */
+   {
+      GLcontext *glctx = ctx->st->ctx;
+      GET_CURRENT_CONTEXT( glcurctx );
+
+      if (glcurctx != glctx)
+         return FALSE;
+   }
 
    if (stw_make_current( NULL, 0 ) == FALSE)
       return FALSE;