X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fengine.c;h=f26f68d10ae86359885ff8169ed74f3850157cb5;hp=753eff6679dd53b196c53fd15bf31d937288ed46;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c index 753eff66..f26f68d1 100644 --- a/hacks/glx/engine.c +++ b/hacks/glx/engine.c @@ -28,6 +28,7 @@ "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ # define refresh_engine 0 +# define release_engine 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -78,7 +79,7 @@ ENTRYPOINT ModeSpecOpt engine_opts = {countof(opts), opts, countof(vars), vars, #ifdef USE_MODULES ModStruct engine_description = -{"engine", "init_engine", "draw_engine", "release_engine", +{"engine", "init_engine", "draw_engine", NULL, "draw_engine", "init_engine", NULL, &engine_opts, 1000, 1, 2, 1, 4, 1.0, "", "A four stroke engine", 0, NULL}; @@ -862,11 +863,7 @@ ENTRYPOINT void init_engine(ModeInfo *mi) int screen = MI_SCREEN(mi); Engine *e; - if (engine == NULL) { - if ((engine = (Engine *) calloc(MI_NUM_SCREENS(mi), - sizeof(Engine))) == NULL) - return; - } + MI_INIT(mi, engine, NULL); e = &engine[screen]; e->window = MI_WINDOW(mi); @@ -996,16 +993,6 @@ ENTRYPOINT void draw_engine(ModeInfo *mi) glXSwapBuffers(disp, w); } -ENTRYPOINT void -release_engine(ModeInfo *mi) -{ - if (engine != NULL) { - (void) free((void *) engine); - engine = NULL; - } - FreeAllGL(mi); -} - XSCREENSAVER_MODULE ("Engine", engine) #endif