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/engine.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/engine.c')
| -rw-r--r-- | hacks/glx/engine.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c index 0f39b8d..ba30d81 100644 --- a/hacks/glx/engine.c +++ b/hacks/glx/engine.c @@ -27,7 +27,6 @@ "*suppressRotationAnimation: True\n" \ "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ -# define free_engine 0 # define release_engine 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ @@ -985,7 +984,7 @@ ENTRYPOINT void draw_engine(ModeInfo *mi) if (!e->glx_context) return; - glXMakeCurrent(disp, w, *(e->glx_context)); + glXMakeCurrent(disp, w, *e->glx_context); mi->polygon_count = display(mi); @@ -1001,6 +1000,20 @@ ENTRYPOINT void draw_engine(ModeInfo *mi) glXSwapBuffers(disp, w); } + +ENTRYPOINT void free_engine(ModeInfo *mi) +{ + Engine *e = &engine[MI_SCREEN(mi)]; + if (!e->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *e->glx_context); + if (e->font_data) free_texture_font (e->font_data); + free (e->engine_name); + gltrackball_free (e->trackball); + free_rotator (e->rot); + if (glIsList(e->piston_list)) glDeleteLists(e->piston_list, 1); + if (glIsList(e->shaft_list)) glDeleteLists(e->shaft_list, 1); +} + XSCREENSAVER_MODULE ("Engine", engine) #endif |