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/tronbit.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/tronbit.c')
-rw-r--r-- | hacks/glx/tronbit.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/hacks/glx/tronbit.c b/hacks/glx/tronbit.c index b79309c..7354355 100644 --- a/hacks/glx/tronbit.c +++ b/hacks/glx/tronbit.c @@ -14,7 +14,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" -# define free_bit 0 # define release_bit 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -456,7 +455,7 @@ draw_bit (ModeInfo *mi) 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); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -531,6 +530,23 @@ draw_bit (ModeInfo *mi) glXSwapBuffers(dpy, window); } + +ENTRYPOINT void +free_bit (ModeInfo *mi) +{ + bit_configuration *bp = &bps[MI_SCREEN(mi)]; + int i; + + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + + if (bp->trackball) gltrackball_free (bp->trackball); + if (bp->rot) free_rotator (bp->rot); + for (i = 0; i < countof(bp->dlists); i++) + if (glIsList(bp->dlists[i])) glDeleteLists(bp->dlists[i], 1); + +} + XSCREENSAVER_MODULE_2 ("TronBit", tronbit, bit) #endif /* USE_GL */ |