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/cube21.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/cube21.c')
| -rw-r--r-- | hacks/glx/cube21.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/hacks/glx/cube21.c b/hacks/glx/cube21.c index 451a523..de72206 100644 --- a/hacks/glx/cube21.c +++ b/hacks/glx/cube21.c @@ -45,7 +45,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" -# define free_cube21 0 # define release_cube21 0 #include "xlockmore.h" @@ -915,7 +914,7 @@ ENTRYPOINT void draw_cube21(ModeInfo * mi) MI_IS_DRAWN(mi) = True; if (!cp->glx_context) return; mi->polygon_count = 0; - glXMakeCurrent(display, window, *(cp->glx_context)); + glXMakeCurrent(display, window, *cp->glx_context); if (!draw_main(mi, cp)) { MI_ABORT(mi); return; @@ -930,11 +929,18 @@ ENTRYPOINT void change_cube21(ModeInfo * mi) { cube21_conf *cp = &cube21[MI_SCREEN(mi)]; if (!cp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context); init_gl(mi); } #endif /* !STANDALONE */ +ENTRYPOINT void free_cube21(ModeInfo * mi) +{ + cube21_conf *cp = &cube21[MI_SCREEN(mi)]; + if (!cp->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context); + gltrackball_free (cp->trackball); +} XSCREENSAVER_MODULE ("Cube21", cube21) |