Module: Mesa Branch: 7.10 Commit: a96360a9517c38ead6c1381362ec49d7f7afd41c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a96360a9517c38ead6c1381362ec49d7f7afd41c
Author: Jeremy Huddleston <[email protected]> Date: Mon Oct 24 16:21:28 2011 -0700 apple: Implement applegl_unbind_context glXMakeCurrent(dpy, None, NULL) would not correctly unbind the context causing subsequent GLX requests to fail in peculiar ways http://xquartz.macosforge.org/trac/ticket/514 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 5c44c1348ea13f51a1616968daa7034bb48e42b1) --- src/glx/applegl_glx.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c index 92c785f..1fd30bf 100644 --- a/src/glx/applegl_glx.c +++ b/src/glx/applegl_glx.c @@ -65,6 +65,24 @@ applegl_bind_context(struct glx_context *gc, struct glx_context *old, static void applegl_unbind_context(struct glx_context *gc, struct glx_context *new) { + Display *dpy; + bool error; + + /* If we don't have a context, then we have nothing to unbind */ + if (!gc) + return; + + /* If we have a new context, keep this one around and remove it during bind. */ + if (new) + return; + + dpy = gc->psc->dpy; + + error = apple_glx_make_current_context(dpy, + (gc != &dummyContext) ? gc->driContext : NULL, + NULL, None); + + apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO"); } static void _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
