http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz

[xscreensaver] / hacks / glx / fps.c

diff --git a/hacks/glx/fps.c b/hacks/glx/fps.c
index 33d4250a26df3bba98ab59e6bbf1677ece45888e..9d50cad5213e8d25785e2abab5886db5ffa6064c 100644 (file)
--- a/hacks/glx/fps.c
+++ b/hacks/glx/fps.c
@@ -91,22 +91,23 @@ fps_print_string (ModeInfo *mi, GLfloat x, GLfloat y, const char *string)
      here, which would kind of defeat the purpose of centralizing this
      code in one file.
    */
-  glPushAttrib(GL_TRANSFORM_BIT |  /* for matrix contents */
-               GL_ENABLE_BIT |     /* for various glDisable calls */
-               GL_CURRENT_BIT |    /* for glColor3f() */
-               GL_LIST_BIT);       /* for glListBase() */
+  glPushAttrib (GL_TRANSFORM_BIT |  /* for matrix contents */
+                GL_ENABLE_BIT |     /* for various glDisable calls */
+                GL_CURRENT_BIT |    /* for glColor3f() */
+                GL_LIST_BIT);       /* for glListBase() */
   {
 # ifdef DEBUG
     check_gl_error ("glPushAttrib");
 # endif
 
     /* disable lighting and texturing when drawing bitmaps!
-       (glPopAttrib() restores these, I believe.)
+       (glPopAttrib() restores these.)
      */
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_LIGHTING);
-    glDisable(GL_BLEND);
-    glDisable(GL_DEPTH_TEST);
+    glDisable (GL_TEXTURE_2D);
+    glDisable (GL_LIGHTING);
+    glDisable (GL_BLEND);
+    glDisable (GL_DEPTH_TEST);
+    glDisable (GL_CULL_FACE);
 
     /* glPopAttrib() does not restore matrix changes, so we must
        push/pop the matrix stacks to be non-intrusive there.
@@ -186,8 +187,8 @@ fps_1 (ModeInfo *mi)
   static int last_ifps = -1;
   static GLfloat last_fps = -1;
   static int frame_count = 0;
-  static struct timeval prev = { 0, };
-  static struct timeval now  = { 0, };
+  static struct timeval prev = { 0, 0 };
+  static struct timeval now  = { 0, 0 };
 
   if (!initted_p)
     {