diff options
| author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
| commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
| tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/morph3d.c | |
| parent | Forgot one DPMS killing instance (diff) | |
| parent | Update to 5.42 (diff) | |
| download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip | |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/morph3d.c')
| -rw-r--r-- | hacks/glx/morph3d.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hacks/glx/morph3d.c b/hacks/glx/morph3d.c index 0780444..0f37223 100644 --- a/hacks/glx/morph3d.c +++ b/hacks/glx/morph3d.c @@ -58,7 +58,6 @@ static const char sccsid[] = "@(#)morph3d.c 5.01 2001/03/01 xlockmore"; "*count: 0 \n" \ "*suppressRotationAnimation: True\n" \ -# define free_morph3d 0 # define release_morph3d 0 # define morph3d_handle_event xlockmore_no_events # include "xlockmore.h" /* from the xscreensaver distribution */ @@ -760,7 +759,7 @@ draw_morph3d(ModeInfo * mi) return; mi->polygon_count = 0; - glXMakeCurrent(display, window, *(mp->glx_context)); + glXMakeCurrent(display, window, *mp->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -832,6 +831,12 @@ change_morph3d(ModeInfo * mi) } #endif /* !STANDALONE */ +ENTRYPOINT void +free_morph3d(ModeInfo * mi) +{ + /* nothing to do */ +} + #endif XSCREENSAVER_MODULE ("Morph3D", morph3d) |