summaryrefslogtreecommitdiffstats
path: root/hacks/glx/kaleidocycle.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:41 +0100
committerSimon Rettberg2019-02-18 11:55:41 +0100
commitae69a754244c4e475c8d2591772ca8e005071d83 (patch)
tree58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/kaleidocycle.c
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
Diffstat (limited to 'hacks/glx/kaleidocycle.c')
-rw-r--r--hacks/glx/kaleidocycle.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/hacks/glx/kaleidocycle.c b/hacks/glx/kaleidocycle.c
index 884400f..b3a7fee 100644
--- a/hacks/glx/kaleidocycle.c
+++ b/hacks/glx/kaleidocycle.c
@@ -21,7 +21,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_kaleidocycle 0
# define release_kaleidocycle 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -414,7 +413,7 @@ draw_kaleidocycle (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);
@@ -569,6 +568,19 @@ draw_kaleidocycle (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_kaleidocycle (ModeInfo *mi)
+{
+ kaleidocycle_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->rot2) free_rotator (bp->rot2);
+ if (bp->colors) free (bp->colors);
+}
+
XSCREENSAVER_MODULE ("Kaleidocycle", kaleidocycle)
#endif /* USE_GL */