X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fenergystream.c;h=7221f0d7e5d48286d414f807d6a78bf248564200;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=3136a2435d5c38dd0c9e819e46c362b5acd3aecd;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba;p=xscreensaver diff --git a/hacks/glx/energystream.c b/hacks/glx/energystream.c index 3136a243..7221f0d7 100644 --- a/hacks/glx/energystream.c +++ b/hacks/glx/energystream.c @@ -17,7 +17,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" \ -# define refresh_stream 0 # define release_stream 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -185,7 +184,7 @@ static GLuint gen_texture (void) glPixelStorei (GL_UNPACK_ALIGNMENT, 4); clear_gl_error (); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, TEX_WIDTH, TEX_HEIGHT, - 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, texture); + 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); check_gl_error ("texture"); /* Texture parameters, LINEAR scaling for better texture quality */ @@ -308,15 +307,13 @@ static void render_flare_stream (flare_stream *s, float cur_time, Vector *vx, Ve glEnd (); } -static void free_stream (ModeInfo * mi); - ENTRYPOINT void init_stream (ModeInfo *mi) { stream_configuration *es; streamtime current_time; - MI_INIT (mi, ess, free_stream); + MI_INIT (mi, ess); es = &ess[MI_SCREEN(mi)]; @@ -364,7 +361,7 @@ init_stream (ModeInfo *mi) } } -static void +ENTRYPOINT void free_stream (ModeInfo * mi) { stream_configuration *es = &ess[MI_SCREEN(mi)];