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/flipscreen3d.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'hacks/glx/flipscreen3d.c')

diff --git a/hacks/glx/flipscreen3d.c b/hacks/glx/flipscreen3d.c
index e4db5df..ce3dc76 100644
--- a/hacks/glx/flipscreen3d.c
+++ b/hacks/glx/flipscreen3d.c
@@ -21,7 +21,6 @@
                  "*useSHM:    True  \n" \
 		 "*suppressRotationAnimation: True\n" \
 
-# define free_screenflip 0
 # define release_screenflip 0
 # include "xlockmore.h"                         /* from the xscreensaver distribution */
 # include "gltrackball.h"
@@ -499,7 +498,7 @@ ENTRYPOINT void draw_screenflip(ModeInfo *mi)
   if (c->waiting_for_image_p && c->first_image_p)
     return;
 
-  glXMakeCurrent(disp, w, *(c->glx_context));
+  glXMakeCurrent(disp, w, *c->glx_context);
 
   glBindTexture(GL_TEXTURE_2D, c->texid);
 
@@ -513,6 +512,16 @@ ENTRYPOINT void draw_screenflip(ModeInfo *mi)
   glXSwapBuffers(disp, w);
 }
 
+
+ENTRYPOINT void free_screenflip(ModeInfo *mi)
+{
+  Screenflip *c = &screenflip[MI_SCREEN(mi)];
+  if (!c->glx_context) return;
+  glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context);
+  gltrackball_free (c->trackball);
+  if (c->texid) glDeleteTextures (1, &c->texid);
+}
+
 XSCREENSAVER_MODULE_2 ("FlipScreen3D", flipscreen3d, screenflip)
 
 #endif
-- 
cgit v1.2.3-55-g7522