diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/atunnel.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/atunnel.c')
-rw-r--r-- | hacks/glx/atunnel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hacks/glx/atunnel.c b/hacks/glx/atunnel.c index f21d04f..1b8fb07 100644 --- a/hacks/glx/atunnel.c +++ b/hacks/glx/atunnel.c @@ -267,7 +267,7 @@ ENTRYPOINT void draw_atunnel(ModeInfo * mi) if (!sa->glx_context) return; - glXMakeCurrent(display, window, *(sa->glx_context)); + glXMakeCurrent(display, window, *sa->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -303,13 +303,13 @@ ENTRYPOINT void init_atunnel(ModeInfo * mi) } -/* all sorts of nice cleanup code should go here! */ ENTRYPOINT void free_atunnel(ModeInfo * mi) { -#if 0 atunnelstruct *sa = &Atunnel[MI_SCREEN(mi)]; - FreeTunnel(sa->ts); -#endif + if (!sa->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sa->glx_context); + atunnel_FreeTunnel(sa->ts); + glDeleteTextures (MAX_TEXTURE, sa->texture); } XSCREENSAVER_MODULE ("Atunnel", atunnel) |