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

[xscreensaver] / hacks / glx / blocktube.c

diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index f62f3413c8b1c7e17d0cb14f05cf57e5986eed03..69605e7e3c48fc3c843103340e155f38a02d2c20 100644 (file)
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -133,8 +133,10 @@ static Bool LoadGLTextures(ModeInfo *mi)
             GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, lp->texti->data);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+# ifndef HAVE_JWZGLES /* #### Sphere maps unimplemented */
         glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
         glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+# endif
     }
     return status;
 }
@@ -216,7 +218,6 @@ ENTRYPOINT void init_blocktube (ModeInfo *mi)
         fprintf(stderr, "%s: out of memory\n", progname);
         exit(1);
       }
-      lp = &lps[MI_SCREEN(mi)];
     }
 
     lp = &lps[MI_SCREEN(mi)];
@@ -261,7 +262,6 @@ ENTRYPOINT void init_blocktube (ModeInfo *mi)
     glShadeModel(GL_SMOOTH);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
     glClearDepth(1.0f);
 
     if (!do_texture && !wire) {