summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-09-16 07:57:19 -0700
committerIan Romanick <[email protected]>2009-09-16 07:57:19 -0700
commit88e3a5760559e6ced00a57b7157abe156c22be2e (patch)
tree8e609a807590d9f98b9dfbf7d5ffd64ffc7c0d86 /src/mesa/drivers/dri
parent76e836a41ad47237f80195c5dacb8bc57a7f2b69 (diff)
parent2921a2555d0a76fa649b23c31e3264bbc78b2ff5 (diff)
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts: src/mesa/main/dlist.c
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 2364829a1e4..3dffc82445a 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -926,6 +926,14 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
GLboolean
intelUnbindContext(__DRIcontextPrivate * driContextPriv)
{
+ struct intel_context *intel =
+ (struct intel_context *) driContextPriv->driverPrivate;
+
+ /* Deassociate the context with the drawables.
+ */
+ intel->driDrawable = NULL;
+ intel->driReadDrawable = NULL;
+
return GL_TRUE;
}