X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Ffps-gl.c;h=070ae6fb64f31b9226d857ae7c3036f9d0fd1b3e;hp=67031a6fe162de45bb3626e81670515d71a0f475;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823

diff --git a/hacks/glx/fps-gl.c b/hacks/glx/fps-gl.c
index 67031a6f..070ae6fb 100644
--- a/hacks/glx/fps-gl.c
+++ b/hacks/glx/fps-gl.c
@@ -1,4 +1,4 @@
-/* fps, Copyright (c) 2001-2011 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2012 Jamie Zawinski <jwz@jwz.org>
  * Draw a frames-per-second display (Xlib and OpenGL).
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -16,14 +16,15 @@
 
 #ifdef HAVE_COCOA
 # include "jwxyz.h"
-# include <OpenGL/gl.h>
-# include <OpenGL/glu.h>
-# include <AGL/agl.h>
 #else /* !HAVE_COCOA -- real Xlib */
 # include <GL/glx.h>
 # include <GL/glu.h>
 #endif /* !HAVE_COCOA */
 
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
 #include "xlockmoreI.h"
 #include "fpsI.h"
 #include "glxfonts.h"
@@ -36,6 +37,8 @@ extern void check_gl_error (const char *type);
 static void
 xlockmore_gl_fps_init (fps_state *st)
 {
+#ifdef HAVE_GLBITMAP
+
   XFontStruct *f = st->font;
   int first = f->min_char_or_byte2;
   int last  = f->max_char_or_byte2;
@@ -47,6 +50,13 @@ xlockmore_gl_fps_init (fps_state *st)
   xscreensaver_glXUseXFont (st->dpy, f->fid,
                             first, last-first+1, st->font_dlist + first);
   check_gl_error ("xscreensaver_glXUseXFont");
+
+#else  /* !HAVE_GLBITMAP */
+
+  clear_gl_error();  /* screw it */
+  st->gl_fps_data = load_texture_font (st->dpy, "fpsFont");
+
+#endif /* !HAVE_GLBITMAP */
 }
 
 
@@ -91,7 +101,12 @@ xlockmore_gl_draw_fps (ModeInfo *mi)
       y += lines*lh + st->font->descent;
 
       glColor3f (1, 1, 1);
-      print_gl_string (st->dpy, st->font, st->font_dlist, 
+      print_gl_string (st->dpy, 
+# ifdef HAVE_GLBITMAP
+                       st->font, st->font_dlist, 
+# else  /* !HAVE_GLBITMAP */
+                       st->gl_fps_data,
+# endif /* !HAVE_GLBITMAP */
                        xgwa.width, xgwa.height,
                        st->x, y, st->string, st->clear_p);
     }