[Mesa-dev] [PATCH 2/2] st/dri: Update the old drawable context bindings in make current

[Jakob Bornecrantz]

We never removed the bindings from the drawables in the old code, that doesn't
seem to cause any troubles and could just be paranioa on my part.

Signed-off-by: Jakob Bornecrantz <wallbraker at gmail.com>

NOTE: This is a candidate for the 7.10 branch.
---
 .../state_trackers/dri/common/dri_context.c        |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index d23655a..0d6b881 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -177,6 +177,12 @@ dri_make_current(__DRIcontext * cPriv,
    if (!driDrawPriv ^ !driReadPriv)
       return GL_FALSE;
 
+   /* These bindings are setup again below */
+   if (ctx->dPriv)
+      dri_drawable(ctx->dPriv)->context = NULL;
+   if (ctx->rPriv)
+      dri_drawable(ctx->rPriv)->context = NULL;
+
    ++ctx->bind_count;
 
    if (!driDrawPriv && !driReadPriv)
-- 
1.7.1