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/menger.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/menger.c')
| -rw-r--r-- | hacks/glx/menger.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/hacks/glx/menger.c b/hacks/glx/menger.c index 249d224..96582e3 100644 --- a/hacks/glx/menger.c +++ b/hacks/glx/menger.c @@ -56,7 +56,6 @@ "*suppressRotationAnimation: True\n" \ -# define free_sponge 0 # define release_sponge 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -481,7 +480,7 @@ draw_sponge (ModeInfo *mi) if (!sp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sp->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -557,6 +556,21 @@ draw_sponge (ModeInfo *mi) glXSwapBuffers(dpy, window); } + +ENTRYPOINT void +free_sponge (ModeInfo *mi) +{ + sponge_configuration *sp = &sps[MI_SCREEN(mi)]; + if (!sp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sp->glx_context); + if (sp->colors) free (sp->colors); + if (sp->rot) free_rotator (sp->rot); + if (sp->trackball) gltrackball_free (sp->trackball); + if (glIsList(sp->sponge_list0)) glDeleteLists(sp->sponge_list0, 1); + if (glIsList(sp->sponge_list1)) glDeleteLists(sp->sponge_list1, 1); + if (glIsList(sp->sponge_list2)) glDeleteLists(sp->sponge_list2, 1); +} + XSCREENSAVER_MODULE_2 ("Menger", menger, sponge) #endif /* USE_GL */ |