Mesa (mesa_7_7_branch): glx: Set GL context to null in __glXSetCurrentContextNull

[Brian Paul]

Module: Mesa
Branch: mesa_7_7_branch
Commit: e88294328cb71dc32941556da5bd4ed40e8b95f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e88294328cb71dc32941556da5bd4ed40e8b95f1

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Sat Jan 16 23:19:19 2010 -0800

glx: Set GL context to null in __glXSetCurrentContextNull

__glXSetCurrentContextNull currently does not set the GL context to null
in the direct rendering case.

This can result in a segfault trying to flush an invalid old context
in glXMakeCurrent.

This fixes a crash starting the Unigine demos (they still don't work due
to missing extensions though).

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/glx/x11/glxcurrent.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/glx/x11/glxcurrent.c b/src/glx/x11/glxcurrent.c
index fae1bd9..50de7d6 100644
--- a/src/glx/x11/glxcurrent.c
+++ b/src/glx/x11/glxcurrent.c
@@ -162,6 +162,7 @@ __glXSetCurrentContextNull(void)
    __glXSetCurrentContext(&dummyContext);
 #ifdef GLX_DIRECT_RENDERING
    _glapi_set_dispatch(NULL);   /* no-op functions */
+   _glapi_set_context(NULL);
 #endif
 }