From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / glx / energystream.c

diff --git a/hacks/glx/energystream.c b/hacks/glx/energystream.c
index 642a1a1f21944442276af06bfa6a2769edda7407..7221f0d7e5d48286d414f807d6a78bf248564200 100644 (file)
--- a/hacks/glx/energystream.c
+++ b/hacks/glx/energystream.c
@@ -17,7 +17,7 @@
       "*showFPS:      False       \n" \
       "*wireframe:    False       \n" \
 
-# define refresh_stream 0
+# define release_stream 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -184,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 */
@@ -313,16 +313,7 @@ init_stream (ModeInfo *mi)
   stream_configuration *es;
   streamtime current_time;
 
-  if (!ess)
-  {
-    ess = (stream_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (stream_configuration));
-    if (!ess)
-    {
-      fprintf (stderr, "%s: out of memory\n", progname);
-      exit (1);
-    }
-  }
+  MI_INIT (mi, ess);
 
   es = &ess[MI_SCREEN(mi)];
 
@@ -371,14 +362,13 @@ init_stream (ModeInfo *mi)
 }
 
 ENTRYPOINT void
-release_stream (ModeInfo * mi)
+free_stream (ModeInfo * mi)
 {
-  int screen;
+  stream_configuration *es = &ess[MI_SCREEN(mi)];
+  int i;
 
-  for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-  {
-    stream_configuration *es = &ess[screen];
-    int i;
+  if (es->glx_context) {
+    glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *(es->glx_context));
 
     for (i = 0; i < es->num_streams; i++) {
       free (es->streams[i].flares);
@@ -387,8 +377,6 @@ release_stream (ModeInfo * mi)
 
     free (es->streams);
   }
-
-  FreeAllGL (mi);
 }