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/sballs.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/sballs.c')
| -rw-r--r-- | hacks/glx/sballs.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/hacks/glx/sballs.c b/hacks/glx/sballs.c index 6cd95f5..e0fccd3 100644 --- a/hacks/glx/sballs.c +++ b/hacks/glx/sballs.c @@ -724,7 +724,7 @@ ENTRYPOINT void draw_sballs(ModeInfo * mi) if (!sb->glx_context) return; - glXMakeCurrent(display, window, *(sb->glx_context)); + glXMakeCurrent(display, window, *sb->glx_context); Draw(mi); #ifndef STANDALONE Reshape(mi); /* xlock mode */ @@ -747,21 +747,23 @@ ENTRYPOINT void draw_sballs(ModeInfo * mi) ENTRYPOINT void free_sballs(ModeInfo * mi) { sballsstruct *sb = &sballs[MI_SCREEN(mi)]; - if (sb->glx_context) + + if (!sb->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *sb->glx_context); + + gltrackball_free (sb->trackball); + + if (sb->btexture) { - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sb->glx_context)); - if (sb->btexture) - { - glDeleteTextures(1,&sb->backid); - XDestroyImage(sb->btexture); - sb->btexture = 0; - } - if (sb->ftexture) - { - glDeleteTextures(1,&sb->faceid); - XDestroyImage(sb->ftexture); - sb->ftexture = 0; - } + glDeleteTextures(1,&sb->backid); + XDestroyImage(sb->btexture); + sb->btexture = 0; + } + if (sb->ftexture) + { + glDeleteTextures(1,&sb->faceid); + XDestroyImage(sb->ftexture); + sb->ftexture = 0; } } @@ -813,7 +815,7 @@ ENTRYPOINT void change_sballs(ModeInfo * mi) do_texture ? "on" : "off" ); } - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sb->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sb->glx_context); } #endif /* !STANDALONE */ |