X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fflipscreen3d.c;h=9bd6995650328eeddb4049edd6812787f740d0e7;hp=8ae26becc842eb7c688f646c84aa3e4bca0f7c73;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c diff --git a/hacks/glx/flipscreen3d.c b/hacks/glx/flipscreen3d.c index 8ae26bec..9bd69956 100644 --- a/hacks/glx/flipscreen3d.c +++ b/hacks/glx/flipscreen3d.c @@ -22,6 +22,7 @@ "*suppressRotationAnimation: True\n" \ # define refresh_screenflip 0 +# define release_screenflip 0 # include "xlockmore.h" /* from the xscreensaver distribution */ # include "gltrackball.h" #else /* !STANDALONE */ @@ -70,7 +71,7 @@ ENTRYPOINT ModeSpecOpt screenflip_opts = {countof(opts), opts, countof(vars), va #ifdef USE_MODULES ModStruct screenflip_description = -{"screenflip", "init_screenflip", "draw_screenflip", "release_screenflip", +{"screenflip", "init_screenflip", "draw_screenflip", NULL, "draw_screenflip", "init_screenflip", NULL, &screenflip_opts, 1000, 1, 2, 1, 4, 1.0, "", "Screenflips", 0, NULL}; @@ -438,11 +439,7 @@ ENTRYPOINT void init_screenflip(ModeInfo *mi) int screen = MI_SCREEN(mi); Screenflip *c; - if (screenflip == NULL) { - if ((screenflip = (Screenflip *) calloc(MI_NUM_SCREENS(mi), - sizeof(Screenflip))) == NULL) - return; - } + MI_INIT(mi, screenflip, NULL); c = &screenflip[screen]; c->window = MI_WINDOW(mi); @@ -516,15 +513,6 @@ ENTRYPOINT void draw_screenflip(ModeInfo *mi) glXSwapBuffers(disp, w); } -ENTRYPOINT void release_screenflip(ModeInfo *mi) -{ - if (screenflip != NULL) { - (void) free((void *) screenflip); - screenflip = NULL; - } - FreeAllGL(mi); -} - XSCREENSAVER_MODULE_2 ("FlipScreen3D", flipscreen3d, screenflip) #endif