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/boxed.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/boxed.c')
-rw-r--r-- | hacks/glx/boxed.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/hacks/glx/boxed.c b/hacks/glx/boxed.c index 136d468..6ce82bb 100644 --- a/hacks/glx/boxed.c +++ b/hacks/glx/boxed.c @@ -1330,7 +1330,7 @@ draw_boxed(ModeInfo * mi) glDrawBuffer(GL_BACK); - glXMakeCurrent(display, window, *(gp->glx_context)); + glXMakeCurrent(display, window, *gp->glx_context); draw(mi); if (mi->fps_p) do_fps (mi); @@ -1343,23 +1343,17 @@ free_boxed(ModeInfo * mi) { boxedstruct *gp = &boxed[MI_SCREEN(mi)]; int i; - - if (gp->glx_context) { - /* Display lists MUST be freed while their glXContext is current. */ - glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); - - if (glIsList(gp->listobjects)) - glDeleteLists(gp->listobjects, 3); - - for (i=0;i<gp->bman.num_balls;i++) { - if (gp->bman.balls[i].bounced) freetris(&gp->tman[i]); - } - free (gp->bman.balls); - free (gp->tman); - free (gp->tex1); - - - } + if (!gp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), gp->window, *gp->glx_context); + if (glIsList(gp->listobjects)) glDeleteLists(gp->listobjects, 3); + for (i=0;i<gp->bman.num_balls;i++) + if (gp->bman.balls[i].bounced) freetris(&gp->tman[i]); + glDeleteLists (gp->gllists[0], 1); + glDeleteLists (gp->gllists[1], 1); + glDeleteLists (gp->gllists[2], 1); + free (gp->bman.balls); + free (gp->tman); + free (gp->tex1); } |