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

[xscreensaver] / hacks / glx / pulsar.c

diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c
index 12b16a80de83aed4fe916cf957324dda9e1dbe35..06301d171cd18aef142823a527815f1b0f7d1ce2 100644 (file)
--- a/hacks/glx/pulsar.c
+++ b/hacks/glx/pulsar.c
@@ -230,11 +230,16 @@ static void Create_Texture(ModeInfo *mi, const char *filename)
   int format;
 
   if ( !strncmp(filename, "BUILTIN", 7))
-    image = Generate_Image(&width, &height, &format);
+    {
+    BUILTIN:
+      image = Generate_Image(&width, &height, &format);
+    }
   else
     {
       XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
                                            MI_COLORMAP (mi), filename);
+      if (! ximage)
+        goto BUILTIN;
       image  = (GLubyte *) ximage->data;
       width  = ximage->width;
       height = ximage->height;
@@ -363,6 +368,10 @@ static void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height)
        glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
   }
 
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+  do_wire = 0;
+# endif
+
   if (do_wire)
        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
   else