glamor: Stop unsetting the EGL context in put_context().

This matches the Xephyr behavior.  Now that we know when to reset the
context in the presence of GLX, we don't need to try to keep our stuff
from being smashed by GLX.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 33a95a0..a16022b 100644 (file)
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -112,11 +112,7 @@ glamor_egl_get_context(struct glamor_context *glamor_ctx)
 static void
 glamor_egl_put_context(struct glamor_context *glamor_ctx)
 {
-    if (--glamor_ctx->get_count)
-        return;
-
-    eglMakeCurrent(glamor_ctx->display, EGL_NO_SURFACE,
-                   EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    --glamor_ctx->get_count;
 }
 
 static EGLImageKHR