Improve logging, implement for Android

demo/demo-common.h

@@ -71,6 +71,22 @@
 #endif
 
 
+
+
+/* Logging. */
+#ifdef __ANDROID__
+#  include <android/log.h>
+#  define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "glyphy-demo", __VA_ARGS__))
+#  define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "glyphy-demo", __VA_ARGS__))
+#  define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, "glyphy-demo", __VA_ARGS__))
+#else /* !__ANDROID__ */
+#  define LOGI(...) ((void) fprintf (stdout, __VA_ARGS__))
+#  define LOGW(...) ((void) fprintf (stderr, __VA_ARGS__))
+#  define LOGE(...) ((void) fprintf (stderr, __VA_ARGS__), abort ())
+#endif
+
+
+
 #define STRINGIZE1(Src) #Src
 #define STRINGIZE(Src) STRINGIZE1(Src)
 

demo/demo-font.cc

@@ -192,7 +192,7 @@ encode_ft_glyph (demo_font_t      *font,
   *advance = face->glyph->metrics.horiAdvance / (double) upem;
 
   if (0)
-  printf ("gid%3u: endpoints%3d; err%3g%%; tex fetch%4.1f; mem%4.1fkb\n",
+    LOGI ("gid%3u: endpoints%3d; err%3g%%; tex fetch%4.1f; mem%4.1fkb\n",
 	  glyph_index,
 	  (unsigned int) glyphy_arc_accumulator_get_num_endpoints (font->acc),
 	  round (100 * glyphy_arc_accumulator_get_error (font->acc) / tolerance),
@@ -245,10 +245,10 @@ demo_font_lookup_glyph (demo_font_t  *font,
 void
 demo_font_print_stats (demo_font_t *font)
 {
-  printf ("%3d glyphs; avg num endpoints%6.2f; avg error%5.1f%%; avg tex fetch%5.2f; avg %5.2fkb per glyph\n",
-	  font->num_glyphs,
-	  (double) font->sum_endpoints / font->num_glyphs,
-	  100. * font->sum_error / font->num_glyphs,
-	  font->sum_fetch / font->num_glyphs,
-	  font->sum_bytes / 1024. / font->num_glyphs);
+  LOGI ("%3d glyphs; avg num endpoints%6.2f; avg error%5.1f%%; avg tex fetch%5.2f; avg %5.2fkb per glyph\n",
+	font->num_glyphs,
+	(double) font->sum_endpoints / font->num_glyphs,
+	100. * font->sum_error / font->num_glyphs,
+	font->sum_fetch / font->num_glyphs,
+	font->sum_bytes / 1024. / font->num_glyphs);
 }

demo/demo-glstate.cc

@@ -83,7 +83,7 @@ set_uniform (GLuint program, const char *name, double *p, double value)
 {
   *p = value;
   glUniform1f (glGetUniformLocation (program, name), value);
-  printf ("Setting %s to %g\n", name + 2, value);
+  LOGI ("Setting %s to %g\n", name + 2, value);
 }
 
 #define SET_UNIFORM(name, value) set_uniform (st->program, #name, &st->name, value)

demo/demo-shader.cc

@@ -126,15 +126,15 @@ compile_shader (GLenum         type,
   glGetShaderiv (shader, GL_COMPILE_STATUS, &compiled);
   if (!compiled) {
     GLint info_len = 0;
-    fprintf (stderr, "%s shader failed to compile\n",
+    LOGW ("%s shader failed to compile\n",
 	     type == GL_VERTEX_SHADER ? "Vertex" : "Fragment");
     glGetShaderiv (shader, GL_INFO_LOG_LENGTH, &info_len);
 
     if (info_len > 0) {
       char *info_log = (char*) malloc (info_len);
       glGetShaderInfoLog (shader, info_len, NULL, info_log);
 
-      fprintf (stderr, "%s\n", info_log);
+      LOGW ("%s\n", info_log);
       free (info_log);
     }
 
@@ -163,14 +163,14 @@ link_program (GLuint vshader,
   glGetProgramiv (program, GL_LINK_STATUS, &linked);
   if (!linked) {
     GLint info_len = 0;
-    fprintf (stderr, "Program failed to link\n");
+    LOGW ("Program failed to link\n");
     glGetProgramiv (program, GL_INFO_LOG_LENGTH, &info_len);
 
     if (info_len > 0) {
       char *info_log = (char*) malloc (info_len);
       glGetProgramInfoLog (program, info_len, NULL, info_log);
 
-      fprintf (stderr, "%s\n", info_log);
+      LOGW ("%s\n", info_log);
       free (info_log);
     }
 

demo/demo-view.cc

@@ -247,7 +247,7 @@ print_fps (int ms)
   if (vu->animate) {
     glutTimerFunc (ms, print_fps, ms);
     long t = current_time ();
-    printf ("%gfps\n", vu->num_frames * 1000. / (t - vu->fps_start_time));
+    LOGI ("%gfps\n", vu->num_frames * 1000. / (t - vu->fps_start_time));
     vu->num_frames = 0;
     vu->fps_start_time = t;
   } else
@@ -280,29 +280,29 @@ static void
 demo_view_toggle_vsync (demo_view_t *vu)
 {
   vu->vsync = !vu->vsync;
-  printf ("Setting vsync %s.\n", vu->vsync ? "on" : "off");
+  LOGI ("Setting vsync %s.\n", vu->vsync ? "on" : "off");
 #if defined(__APPLE__)
   CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &vu->vsync);
 #elif defined(__WGLEW__)
   if (wglewIsSupported ("WGL_EXT_swap_control"))
     wglSwapIntervalEXT (vu->vsync);
   else
-    printf ("WGL_EXT_swal_control not supported; failed to set vsync\n");
+    LOGW ("WGL_EXT_swal_control not supported; failed to set vsync\n");
 #elif defined(__GLXEW_H__)
   if (glxewIsSupported ("GLX_SGI_swap_control"))
     glXSwapIntervalSGI (vu->vsync);
   else
-    printf ("GLX_SGI_swap_control not supported; failed to set vsync\n");
+    LOGW ("GLX_SGI_swap_control not supported; failed to set vsync\n");
 #else
-    printf ("No vsync extension found; failed to set vsync\n");
+    LOGW ("No vsync extension found; failed to set vsync\n");
 #endif
 }
 
 static void
 demo_view_toggle_srgb (demo_view_t *vu)
 {
   vu->srgb = !vu->srgb;
-  printf ("Setting sRGB framebuffer %s.\n", vu->srgb ? "on" : "off");
+  LOGI ("Setting sRGB framebuffer %s.\n", vu->srgb ? "on" : "off");
 #if defined(GL_FRAMEBUFFER_SRGB) && defined(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT)
   GLboolean available = false;
   if ((glewIsSupported ("GL_ARB_framebuffer_sRGB") || glewIsSupported ("GL_EXT_framebuffer_sRGB")) &&
@@ -313,8 +313,7 @@ demo_view_toggle_srgb (demo_view_t *vu)
       glDisable (GL_FRAMEBUFFER_SRGB);
   } else
 #endif
-    printf ("No sRGB framebuffer extension found; failed to set sRGB framebuffer\n");
-
+    LOGW ("No sRGB framebuffer extension found; failed to set sRGB framebuffer\n");
 }
 
 static void
@@ -590,7 +589,7 @@ demo_view_motion_func (demo_view_t *vu, int x, int y)
 void
 demo_view_print_help (demo_view_t *vu)
 {
-  printf ("Welcome to GLyphy demo\n");
+  LOGI ("Welcome to GLyphy demo\n");
 }