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/glsnake.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/glsnake.c')
| -rw-r--r-- | hacks/glx/glsnake.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/hacks/glx/glsnake.c b/hacks/glx/glsnake.c index 5f20421..8efc681 100644 --- a/hacks/glx/glsnake.c +++ b/hacks/glx/glsnake.c @@ -144,7 +144,6 @@ static GLfloat angvel; #define glsnake_init init_glsnake #define glsnake_display draw_glsnake #define glsnake_reshape reshape_glsnake -#define free_glsnake 0 #define release_glsnake 0 #define glsnake_handle_event xlockmore_no_events @@ -2176,7 +2175,7 @@ ENTRYPOINT void glsnake_display( 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); #endif gl_init(mi); @@ -2334,6 +2333,20 @@ ENTRYPOINT void glsnake_display( #endif } + +#ifndef HAVE_GLUT +ENTRYPOINT void free_glsnake(ModeInfo * mi) +{ + struct glsnake_cfg * bp = &glc[MI_SCREEN(mi)]; + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + if (bp->font_data) free_texture_font (bp->font_data); + if (glIsList(bp->node_solid)) glDeleteLists(bp->node_solid, 1); + if (glIsList(bp->node_wire)) glDeleteLists(bp->node_wire, 1); +} +#endif + + #ifdef HAVE_GLUT /* anything that needs to be cleaned up goes here */ static void unmain() |