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/raverhoop.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/raverhoop.c')
| -rw-r--r-- | hacks/glx/raverhoop.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/hacks/glx/raverhoop.c b/hacks/glx/raverhoop.c index 5cf35f7..e08fdad 100644 --- a/hacks/glx/raverhoop.c +++ b/hacks/glx/raverhoop.c @@ -16,7 +16,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" \ -# define free_hoop 0 # define release_hoop 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -715,7 +714,7 @@ draw_hoop (ModeInfo *mi) if (!bp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -762,6 +761,31 @@ draw_hoop (ModeInfo *mi) glXSwapBuffers(dpy, window); } + +ENTRYPOINT void +free_hoop (ModeInfo *mi) +{ + hoop_configuration *bp = &bps[MI_SCREEN(mi)]; + + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + + if (bp->trackball) gltrackball_free (bp->trackball); + if (bp->rot) free_rotator (bp->rot); + if (bp->lights) free (bp->lights); + while (bp->trail) { + afterimage *n = bp->trail->next; + free (bp->trail); + bp->trail = n; + } + while (bp->oscillators) { + oscillator *n = bp->oscillators->next; + free (bp->oscillators); + bp->oscillators = n; + } + +} + XSCREENSAVER_MODULE_2 ("RaverHoop", raverhoop, hoop) #endif /* USE_GL */ |