From 11ff12d4e74c0b514cb62cc47df9770c91e5002a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 14 Mar 2014 17:29:31 -0700 Subject: [PATCH] glamor: Stop unsetting the EGL context in put_context(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer Reviewed-by: Adam Jackson --- glamor/glamor_egl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 33a95a066..a16022b5e 100644 --- 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