fixes for lots-o-images

Author: greggman

js/perf-harness.js

@@ -7,12 +7,13 @@ var PerfHarness = (function(undefined) {
     targetTime: 1,
     velocity: 1,
     direction: 1,
-    frames: []
+    frames: [],
   };
 
   var countHistory = [];
   var totalCount = 0;
   var countIndex = 0;
+  var skipFrames = 0;
   var framesToAverage;
   var then;
   var callback;
@@ -45,12 +46,19 @@ var PerfHarness = (function(undefined) {
     if (g.direction != desiredDirection) {
       g.direction = desiredDirection;
       g.velocity = Math.max(Math.abs(Math.floor(g.velocity / 4)), 1) * g.direction;
+      if (g.direction < 0) {
+        skipFrames = 3;
+      }
+    } else if (skipFrames) {
+      --skipFrames;
     } else {
       g.velocity *= 2;
     }
+
     if (g.frames.length < 1000) {
       g.frames.push(g.elapsedTime);
     }
+
     g.count += g.velocity;
     g.count = Math.max(1, g.count);
 
@@ -61,7 +69,7 @@ var PerfHarness = (function(undefined) {
 
     callback(g.count, Math.floor(totalCount / framesToAverage), g.elapsedTime);
 
-    window.requestAnimFrame(test, canvas);
+    requestAnimationFrame(test, canvas);
   };
 
   var getTargetFPS = function() {

lots-o-images/lots-o-images-buffer-data-opaque.html

@@ -340,7 +340,8 @@
     app.update(elapsedTime);
     app.render();
   }
-  PerfHarness.start(canvas, render, 1);
+  var framesToAverage = 60;
+  PerfHarness.start(canvas, render, 60);
   return true;
 }
 </script>

lots-o-images/lots-o-images-buffer-data.html

@@ -340,7 +340,8 @@
     app.update(elapsedTime);
     app.render();
   }
-  PerfHarness.start(canvas, render, 1);
+  var framesToAverage = 60;
+  PerfHarness.start(canvas, render, 60);
   return true;
 }
 </script>

lots-o-images/lots-o-images-draw-elements-with-tex-upload.html

@@ -34,6 +34,7 @@
 <meta charset="utf-8">
 <title>Lots-O-Images - DrawElements</title>
 <link rel="stylesheet" type="text/css" href="../google-io/2011/style.css" />
+<script type="text/javascript" src="../js/perf-harness.js"></script>
 <script type="text/javascript" src="../tdl/base.js"></script>
 <script type="text/javascript">
 tdl.require('tdl.buffers');
@@ -57,7 +58,7 @@
 var g_maxImages = 250000;
 var g_numImages = 100;
 var g_imageSize = 32;
-var g_targetFrameRate = 20 - 2;  // add some fudge so browser that runs at 58-59 can still run the test
+var g_targetFrameRate = 60 - 5;  // add some fudge so browser that runs at 58-59 can still run the test
 
 function CreateApp() {
   var updatePositions = true;
@@ -242,33 +243,22 @@
   var then = (new Date()).getTime() * 0.001;
   var changeAmount = 1;
 
-  function render() {
-    tdl.webgl.requestAnimationFrame(render, canvas);
-
-    // Compute the elapsed time since the last rendered frame
-    // in seconds.
-    var now = (new Date()).getTime() * 0.001;
-    var elapsedTime = Math.min(now - then, 0.1);
-    then = now;
+  PerfHarness.setTargetFPS(g_targetFrameRate);
 
+  function render(count, averageCount, elapsedTime) {
     // Update the FPS timer.
     fpsTimer.update(elapsedTime);
     fpsElem.innerHTML = fpsTimer.averageFPS;
 
-    var goFaster = fpsTimer.averageFPS >= g_targetFrameRate;
-    if (goFaster) {
-      changeAmount = 11;
-    } else {
-      changeAmount = -9;
-    }
-    g_numImages = Math.max(Math.min(g_numImages + changeAmount, g_maxImages), 1);
+    g_numImages = count;
 
     cntElem.innerHTML = g_numImages;
 
     app.update(elapsedTime);
     app.render();
   }
-  render();
+  var framesToAverage = 60;
+  PerfHarness.start(canvas, render, 60);
   return true;
 }
 </script>

lots-o-images/lots-o-images-draw-elements.html

@@ -277,7 +277,8 @@
     app.update(elapsedTime);
     app.render();
   }
-  PerfHarness.start(canvas, render, 1);
+  var framesToAverage = 60;
+  PerfHarness.start(canvas, render, 60);
 }
 </script>
   </head>

lots-o-images/lots-o-images-texture-data.html

@@ -57,7 +57,7 @@
 var g_maxImages = 4096;
 var g_numImages = 3;
 var g_imageSize = 32;
-var g_targetFrameRate = 60;
+var g_targetFrameRate = 20;
 
 function CreateApp() {
   var updatePositions = true;