Merge lp:~linaro-graphics-wg/glmark2/frame-time into lp:glmark2/2011.11

[Alexandros Frantzis]

Display average frame time in addition to FPS for each scene.

[Jesse Barker (jesse-barker)]

Seems fine.

review: Approve

=== modified file 'src/android.cpp'
--- src/android.cpp	2012-05-15 12:28:51 +0000
+++ src/android.cpp	2012-06-15 13:54:30 +0000
@@ -48,8 +48,10 @@
 
     virtual void log_scene_result()
     {
-        Log::info("%s FPS: %u", scene_->info_string().c_str(),
-                                scene_->average_fps());
+        Log::info("%s FPS: %u FrameTime: %.3f ms\n",
+                  scene_->info_string().c_str(),
+                  scene_->average_fps(),
+                  1000.0 / scene_->average_fps());
     }
 };
 
 
=== modified file 'src/main-loop.cpp'
--- src/main-loop.cpp	2012-02-15 17:09:14 +0000
+++ src/main-loop.cpp	2012-06-15 13:54:30 +0000
@@ -134,8 +134,11 @@
 void
 MainLoop::log_scene_result()
 {
-    static const std::string format(Log::continuation_prefix + " FPS: %u\n");
-    Log::info(format.c_str(), scene_->average_fps());
+    static const std::string format_fps(Log::continuation_prefix + " FPS: %u");
+    static const std::string format_ms(Log::continuation_prefix + " FrameTime: %.3f ms\n");
+
+    Log::info(format_fps.c_str(), scene_->average_fps());
+    Log::info(format_ms.c_str(), 1000.0 / scene_->average_fps());
 }
 
 void