glamor: Drop the set of the context to NULL at the end of glamor ops.

The theory here was that it (which I copied from EGL) existed to fix
up context switching with indirect GLX.  But indirect GLX won't even
try to set the context again unless its lastContext field is cleared,
so we need to solve this a different way.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-01-05 02:45:05 -08:00
parent f31911ff8f
commit a895f6a165

View File

@ -53,13 +53,7 @@ glamor_glx_get_context(struct glamor_context *glamor_ctx)
static void
glamor_glx_put_context(struct glamor_context *glamor_ctx)
{
if (--glamor_ctx->get_count)
return;
/* We actually reset the context, so that indirect GLX's EGL usage
* won't get confused by ours.
*/
glXMakeCurrent(glamor_ctx->display, None, NULL);
--glamor_ctx->get_count;
}
Bool