summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-03-14 17:29:31 -0700
committerEric Anholt <eric@anholt.net>2014-04-23 10:32:20 -0700
commit11ff12d4e74c0b514cb62cc47df9770c91e5002a (patch)
treea1700521b01e4cc7a076dca30935e4c00e25f231
parentb5e394b3f5d80749af0148611df2eb009e7bf823 (diff)
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>
-rw-r--r--glamor/glamor_egl.c6
1 files changed, 1 insertions, 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