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/extrusion.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'hacks/glx/extrusion.c') diff --git a/hacks/glx/extrusion.c b/hacks/glx/extrusion.c index 3dee71c..f8aaeb5 100644 --- a/hacks/glx/extrusion.c +++ b/hacks/glx/extrusion.c @@ -31,7 +31,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" -# define free_extrusion 0 # define release_extrusion 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ @@ -314,7 +313,7 @@ draw_extrusion(ModeInfo * mi) if (!gp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context); glPushMatrix(); @@ -551,6 +550,17 @@ init_extrusion (ModeInfo * mi) } + +ENTRYPOINT void +free_extrusion (ModeInfo * mi) +{ + extrusionstruct *gp = &Extrusion[MI_SCREEN(mi)]; + if (!gp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context); + if (gp->trackball) gltrackball_free (gp->trackball); + if (gp->rot) free_rotator (gp->rot); +} + XSCREENSAVER_MODULE ("Extrusion", extrusion) #endif /* USE_GL */ -- cgit v1.2.3-55-g7522