diff options
| author | Eric Anholt <eric@anholt.net> | 2014-01-05 02:45:05 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-17 14:30:41 -0700 |
| commit | a895f6a16588024e03218d8d0e77dd8bd8494329 (patch) | |
| tree | 963579fd3e69df5db6e52d81bbc36230339cf5e0 /glamor/glamor_glx.c | |
| parent | f31911ff8f3f3707101b7771d5dc994ed1ca5c70 (diff) | |
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>
Diffstat (limited to 'glamor/glamor_glx.c')
| -rw-r--r-- | glamor/glamor_glx.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/glamor/glamor_glx.c b/glamor/glamor_glx.c index 311bf758d..8f47c3d2c 100644 --- a/glamor/glamor_glx.c +++ b/glamor/glamor_glx.c @@ -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 |