Address review feedback

Author: iainireland

JetStreamDriver.js

@@ -1915,7 +1915,7 @@ let BENCHMARKS = [
             "./threejs/benchmark.js",
         ],
         deterministicRandom: true,
-        tags: ["ThreeJs"],
+        tags: ["Default", "ThreeJs"],
     }),
     // Wasm
     new WasmEMCCBenchmark({

threejs/benchmark.js

@@ -33,87 +33,88 @@ const innerHeight = 1080;
 const innerWidth = 1920;
 camera.position.z = 500;
 
-const canvas = {}
-canvas.addEventListener = function() { }
-canvas.style = {}
-canvas.getContext = function(kind) {
-  return {
-    getExtension(extension) {
-      if (extension == 'EXT_blend_minmax') {
-        return {MIN_EXT: 32775, MAX_EXT: 32776}
-      }
-      if (extension == 'OES_vertex_array_object') {
-        return {
-          createVertexArrayOES() { return 1 },
-          bindVertexArrayOES() { },
-          deleteVertexArrayOES() { },
-        }
-      }
-    },
-    createTexture() { },
-    bindTexture() { },
-    texImage2D() { },
-    texParameteri() { },
-    uniform1i() { },
-    uniform1f() { },
-    uniform2f() { },
-    uniform3f() { },
-    uniform4f() { },
-    clearColor() { },
-    clear() { },
-    clearDepth() { },
-    clearStencil() { },
-    enable() { },
-    disable() { },
-    depthFunc() { },
-    depthMask() { },
-    frontFace() { },
-    cullFace() { },
-    getContextAttributes() { },
-    createBuffer() { },
-    bindBuffer() { },
-    bufferData() { },
-    createProgram() { },
-    attachShader() { },
-    linkProgram() { },
-    useProgram() { },
-    getAttribLocation() { },
-    getUniformLocation() { },
-    createShader() { },
-    shaderSource() { },
-    compileShader() { },
-    getShaderParameter() { },
-    getProgramInfoLog() { return "" },
-    getShaderInfoLog() { return "" },
-    getProgramParameter() { },
-    deleteShader() { },
-    colorMask() { },
-    drawElements() { },
-    lineWidth() { },
-    drawArrays() { },
-    viewport() { },
-    getParameter(param) {
-      if (param == 34930) { return 16 }
-      if (param == 35660) { return 16 }
-      if (param == 3379) { return 8192 }
-      if (param == 36347) { return 1024 }
-      if (param == 36348) { return 32 }
-      if (param == 36349) { return 1024 }
-      if (param == 35661) { return 80 }
-      if (param == 7938) { return "WebGL 2.0" }
-      if (param == 3088) { return [0,0,1024,480] }
-      if (param == 2978) { return [0,0,1024,480] }
-    },
-    MAX_TEXTURE_IMAGE_UNITS: 34930,
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: 35660,
-    MAX_TEXTURE_SIZE: 3379,
-    MAX_VERTEX_UNIFORM_VECTORS: 36347,
-    MAX_VARYING_VECTORS: 36348,
-    MAX_FRAGMENT_UNIFORM_VECTORS: 36349,
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: 35661,
-    VERSION: 7938,
-    SCISSOR_BOX: 3088,
-    VIEWPORT: 2978
+const canvas = {
+  addEventListener() {},
+  style: {},
+  getContext(kind) {
+    return {
+      getExtension(extension) {
+	if (extension == 'EXT_blend_minmax') {
+          return {MIN_EXT: 32775, MAX_EXT: 32776}
+	}
+	if (extension == 'OES_vertex_array_object') {
+          return {
+            createVertexArrayOES() { return 1 },
+            bindVertexArrayOES() {},
+            deleteVertexArrayOES() {},
+          }
+	}
+      },
+      createTexture() {},
+      bindTexture() {},
+      texImage2D() {},
+      texParameteri() {},
+      uniform1i() {},
+      uniform1f() {},
+      uniform2f() {},
+      uniform3f() {},
+      uniform4f() {},
+      clearColor() {},
+      clear() {},
+      clearDepth() {},
+      clearStencil() {},
+      enable() {},
+      disable() {},
+      depthFunc() {},
+      depthMask() {},
+      frontFace() {},
+      cullFace() {},
+      getContextAttributes() {},
+      createBuffer() {},
+      bindBuffer() {},
+      bufferData() {},
+      createProgram() {},
+      attachShader() {},
+      linkProgram() {},
+      useProgram() {},
+      getAttribLocation() {},
+      getUniformLocation() {},
+      createShader() {},
+      shaderSource() {},
+      compileShader() {},
+      getShaderParameter() {},
+      getProgramInfoLog() { return "" },
+      getShaderInfoLog() { return "" },
+      getProgramParameter() {},
+      deleteShader() {},
+      colorMask() {},
+      drawElements() {},
+      lineWidth() {},
+      drawArrays() {},
+      viewport() {},
+      getParameter(param) {
+	if (param == 34930) { return 16 }
+	if (param == 35660) { return 16 }
+	if (param == 3379) { return 8192 }
+	if (param == 36347) { return 1024 }
+	if (param == 36348) { return 32 }
+	if (param == 36349) { return 1024 }
+	if (param == 35661) { return 80 }
+	if (param == 7938) { return "WebGL 2.0" }
+	if (param == 3088) { return [0,0,1024,480] }
+	if (param == 2978) { return [0,0,1024,480] }
+      },
+      MAX_TEXTURE_IMAGE_UNITS: 34930,
+      MAX_VERTEX_TEXTURE_IMAGE_UNITS: 35660,
+      MAX_TEXTURE_SIZE: 3379,
+      MAX_VERTEX_UNIFORM_VECTORS: 36347,
+      MAX_VARYING_VECTORS: 36348,
+      MAX_FRAGMENT_UNIFORM_VECTORS: 36349,
+      MAX_COMBINED_TEXTURE_IMAGE_UNITS: 35661,
+      VERSION: 7938,
+      SCISSOR_BOX: 3088,
+      VIEWPORT: 2978
+    }
   }
 }
 
@@ -161,28 +162,32 @@ const createGeometryParticle = (size) => {
 };
 
 // Initialize particles
+var initialized = false;
 const particles = [];
-for(let i = 0; i < NUM_PARTICLES; i++) {
-  const size = 10 + Math.random() * 80;
-  const particle =
-        createGeometryParticle(size);
-
-  // Random initial position
-  const visibleWidth = 2 * Math.tan(75 * Math.PI/360) * 500 * camera.aspect;
-  particle.position.set(
-    THREE.MathUtils.randFloatSpread(visibleWidth),
-    THREE.MathUtils.randFloatSpread(visibleWidth/camera.aspect),
-    0
-  );
 
-  // Velocity storage
-  particle.velocity = new THREE.Vector2(
-    (Math.random() - 0.5) * 8,
-    (Math.random() - 0.5) * 8
-  );
+function initialize() {
+  for(let i = 0; i < NUM_PARTICLES; i++) {
+    const size = 10 + Math.random() * 80;
+    const particle = createGeometryParticle(size);
+
+    // Random initial position
+    const visibleWidth = 2 * Math.tan(75 * Math.PI/360) * 500 * camera.aspect;
+    particle.position.set(
+      THREE.MathUtils.randFloatSpread(visibleWidth),
+      THREE.MathUtils.randFloatSpread(visibleWidth/camera.aspect),
+      0
+    );
 
-  scene.add(particle);
-  particles.push(particle);
+    // Velocity storage
+    particle.velocity = new THREE.Vector2(
+      (Math.random() - 0.5) * 8,
+      (Math.random() - 0.5) * 8
+    );
+
+    scene.add(particle);
+    particles.push(particle);
+  }
+  initialized = true;
 }
 
 // Metrics and animation
@@ -206,6 +211,9 @@ function animate() {
 
 class Benchmark {
   runIteration() {
+    if (!initialized) {
+      initialize();
+    }
     animate();
   }
 }