summaryrefslogtreecommitdiffstats
path: root/hacks/glx/glknots.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/glknots.c
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
Diffstat (limited to 'hacks/glx/glknots.c')
-rw-r--r--hacks/glx/glknots.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index 730cadb..06be339 100644
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -18,7 +18,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_knot 0
# define release_knot 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -348,7 +347,7 @@ draw_knot (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);
if (bp->mode == 0)
{
@@ -440,6 +439,19 @@ draw_knot (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_knot (ModeInfo *mi)
+{
+ knot_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->colors) free (bp->colors);
+ if (glIsList(bp->knot_list)) glDeleteLists(bp->knot_list, 1);
+}
+
XSCREENSAVER_MODULE_2 ("GLKnots", glknots, knot)
#endif /* USE_GL */