From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 18 Feb 2019 11:55:41 +0100 Subject: Update to 5.42 --- hacks/glx/peepers.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'hacks/glx/peepers.c') diff --git a/hacks/glx/peepers.c b/hacks/glx/peepers.c index 02ebab8..4d15ff8 100644 --- a/hacks/glx/peepers.c +++ b/hacks/glx/peepers.c @@ -22,7 +22,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" \ -# define free_peepers 0 # define release_peepers 0 #define DEF_SPEED "1.0" @@ -1375,7 +1374,7 @@ draw_peepers (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); @@ -1450,6 +1449,25 @@ draw_peepers (ModeInfo *mi) glXSwapBuffers(dpy, window); } + +ENTRYPOINT void +free_peepers (ModeInfo *mi) +{ + peepers_configuration *bp = &bps[MI_SCREEN(mi)]; + int i; + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + for (i = 0; i < bp->nfloaters; i++) + free_rotator (bp->floaters[i].rot); + if (bp->floaters) free (bp->floaters); + if (glIsList(bp->lens_list)) glDeleteLists(bp->lens_list, 1); + if (glIsList(bp->sclera_list)) glDeleteLists(bp->sclera_list, 1); + if (glIsList(bp->iris_list)) glDeleteLists(bp->iris_list, 1); + if (glIsList(bp->retina_list)) glDeleteLists(bp->retina_list, 1); + if (bp->sclera_texture) glDeleteTextures (1, &bp->sclera_texture); + if (bp->iris_texture) glDeleteTextures (1, &bp->iris_texture); +} + XSCREENSAVER_MODULE ("Peepers", peepers) #endif /* USE_GL */ -- cgit v1.2.3-55-g7522