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/antmaze.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/antmaze.c')
-rw-r--r-- | hacks/glx/antmaze.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/hacks/glx/antmaze.c b/hacks/glx/antmaze.c index 79b7e0b..6853b35 100644 --- a/hacks/glx/antmaze.c +++ b/hacks/glx/antmaze.c @@ -25,7 +25,6 @@ static const char sccsid[] = "@(#)antmaze.c 5.01 2001/03/01 xlockmore"; "*showFPS: False \n" \ "*fpsSolid: True \n" -# define free_antmaze 0 # define release_antmaze 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ @@ -1442,7 +1441,7 @@ ENTRYPOINT void draw_antmaze(ModeInfo * mi) return; mi->polygon_count = 0; - glXMakeCurrent(display, window, *(mp->glx_context)); + glXMakeCurrent(display, window, *mp->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -1603,11 +1602,22 @@ ENTRYPOINT void change_antmaze(ModeInfo * mi) if (!mp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context); pinit(); } #endif /* !STANDALONE */ +ENTRYPOINT void free_antmaze(ModeInfo * mi) +{ + antmazestruct *mp = &antmaze[MI_SCREEN(mi)]; + if (!mp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context); + gltrackball_free (mp->trackball); + free_rotator (mp->rot); + if (mp->checktexture) glDeleteTextures (1, &mp->checktexture); + if (mp->brushedtexture) glDeleteTextures (1, &mp->brushedtexture); +} + XSCREENSAVER_MODULE ("AntMaze", antmaze) #endif |