summaryrefslogtreecommitdiffstats
path: root/hacks/glx/cubenetic.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/cubenetic.c
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
Diffstat (limited to 'hacks/glx/cubenetic.c')
-rw-r--r--hacks/glx/cubenetic.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/hacks/glx/cubenetic.c b/hacks/glx/cubenetic.c
index cc9b0d6..0ddbb29 100644
--- a/hacks/glx/cubenetic.c
+++ b/hacks/glx/cubenetic.c
@@ -15,7 +15,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_cube 0
# define release_cube 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -530,7 +529,7 @@ draw_cube (ModeInfo *mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
glShadeModel(GL_FLAT);
@@ -593,6 +592,27 @@ draw_cube (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *cc = &ccs[MI_SCREEN(mi)];
+ if (!cc->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
+ if (cc->waves) {
+ free (cc->waves->srcs);
+ free (cc->waves->heights);
+ free (cc->waves);
+ }
+ if (glIsList(cc->cube_list)) glDeleteLists(cc->cube_list, 1);
+ if (cc->rot) free_rotator (cc->rot);
+ if (cc->trackball) gltrackball_free (cc->trackball);
+ if (cc->texture_colors) free (cc->texture_colors);
+ if (cc->cube_colors) free (cc->cube_colors);
+ if (cc->texture) free (cc->texture);
+ if (cc->texture_id) glDeleteTextures (1, &cc->texture_id);
+}
+
XSCREENSAVER_MODULE_2 ("Cubenetic", cubenetic, cube)
#endif /* USE_GL */