diff options
| author | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
| commit | ae69a754244c4e475c8d2591772ca8e005071d83 (patch) | |
| tree | 58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/hilbert.c | |
| parent | Update gitignore (diff) | |
| download | xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip | |
Update to 5.42
Diffstat (limited to 'hacks/glx/hilbert.c')
| -rw-r--r-- | hacks/glx/hilbert.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/hacks/glx/hilbert.c b/hacks/glx/hilbert.c index dbb2ce6..98faa4b 100644 --- a/hacks/glx/hilbert.c +++ b/hacks/glx/hilbert.c @@ -21,7 +21,6 @@ "*geometry: 800x800\n" \ "*suppressRotationAnimation: True\n" \ -# define free_hilbert 0 # define release_hilbert 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -987,7 +986,7 @@ draw_hilbert (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); glShadeModel(GL_SMOOTH); @@ -1139,6 +1138,30 @@ draw_hilbert (ModeInfo *mi) glXSwapBuffers(dpy, window); } + +ENTRYPOINT void +free_hilbert (ModeInfo *mi) +{ + hilbert_configuration *bp = &bps[MI_SCREEN(mi)]; + int i; + + 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); + if (bp->caches) + for (i = 0; i < max_depth + 2; i++) + if (bp->caches[i]) + { + free (bp->caches[i]->values); + free (bp->caches[i]); + } + /* #### free dlists */ +} + XSCREENSAVER_MODULE ("Hilbert", hilbert) #endif /* USE_GL */ |