Index: PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
diff --git a/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html b/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
index 2eb43ba997b9bfd6ef281794be963eef2eabcb5b..6797472dee4e1c5b2851c8693f45b7a682176198 100644 |
--- a/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
+++ b/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
@@ -9,9 +9,9 @@ var canvas3D = document.createElement('canvas'); |
var gl = canvas3D.getContext('experimental-webgl'); |
if (!gl) |
PerfTestRunner.log("\nWebGL is not supported or enabled on this platform!\n"); |
-var MEASURE_DRAW_TIMES = 100; |
-var MAX_COUNT = 60000; |
-var count = 0; |
+var MEASURE_DRAW_TIMES = 50; |
+var MAX_MEASURE_DRAW_TIMES = 1000; |
+var MAX_MEASURE_TIME_PER_FRAME = 1000; // 1 sec |
function setSize(canvas2DWidth, canvas2DHeight, webglWidth, webglHeight) { |
canvas2D.width = canvas2DWidth; |
@@ -36,26 +36,28 @@ function renderWebGL(gl) { |
function drawWebGLToCanvas2D() { |
if (gl) { |
var start = PerfTestRunner.now(); |
- for (var i = 0; i < MEASURE_DRAW_TIMES; i++) { |
- renderWebGL(gl); |
- // draw dynamic WebGL |
- ctx2D.drawImage(canvas3D, 0, 0); |
+ var count = 0; |
+ while ((PerfTestRunner.now() - start <= MAX_MEASURE_TIME_PER_FRAME) && (count * MEASURE_DRAW_TIMES < MAX_MEASURE_DRAW_TIMES)) { |
+ for (var i = 0; i < MEASURE_DRAW_TIMES; i++) { |
+ renderWebGL(gl); |
+ // draw dynamic WebGL |
+ ctx2D.drawImage(canvas3D, 0, 0); |
+ } |
+ count++; |
} |
// Calling getImageData() is just to flush out the content when |
// accelerated 2D canvas is in use. The cost of reading 1x1 pixels is low. |
ctx2D.getImageData(0, 0, 1, 1); |
- count++; |
var elapsedTime = PerfTestRunner.now() - start; |
- PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * 1000 / elapsedTime); |
+ PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * count * 1000 / elapsedTime); |
} else |
PerfTestRunner.measureValueAsync(0); |
- if (count < MAX_COUNT) |
- requestAnimationFrame(drawWebGLToCanvas2D); |
+ |
+ requestAnimationFrame(drawWebGLToCanvas2D); |
} |
function onCompletedRun() { |
- count = MAX_COUNT; |
} |
window.onload = function () { |