Bug 883364 - Remove nogl tests from WebGL reftests. - r=dzbarsky
☠☠ backed out by 8efe78c834e6 ☠ ☠
authorJeff Gilbert <jgilbert@mozilla.com>
Thu, 18 Jul 2013 15:48:05 -0700
changeset 139200 8cc680bb6ba2f3e7c69dcb096f15ee2232a092b0
parent 139199 1b779d67a02276aa877b595d7a9050180c665f16
child 139201 0ad31c2bda31cc84c8209963868490153a9002eb
push id1890
push userryanvm@gmail.com
push dateFri, 19 Jul 2013 17:44:21 +0000
treeherderfx-team@20848adc9980 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdzbarsky
bugs883364
milestone25.0a1
Bug 883364 - Remove nogl tests from WebGL reftests. - r=dzbarsky
content/canvas/test/reftest/reftest.list
content/canvas/test/reftest/webgl-clear-test.html
content/canvas/test/reftest/webgl-color-alpha-test.html
content/canvas/test/reftest/webgl-color-test.html
content/canvas/test/reftest/webgl-hanging-fb-test.html
content/canvas/test/reftest/webgl-hanging-scissor-test.html
content/canvas/test/reftest/webgl-orientation-test.html
--- a/content/canvas/test/reftest/reftest.list
+++ b/content/canvas/test/reftest/reftest.list
@@ -1,21 +1,19 @@
 # WebGL Reftests!
-# If you add new tests, don't forget to add sanity (&nogl) tests! (if needed)
+default-preferences pref(webgl.force-enabled,true)
 
 # Check that disabling works:
                            == webgl-disable-test.html?nogl  wrapper.html?green.png
 pref(webgl.disabled,true)  == webgl-disable-test.html       wrapper.html?green.png
 
 # Basic WebGL tests:
 # Do we get pixels to the screen at all?
 # Try to just hit the different rendering paths here.
 # Test: {aa, alpha, preserve, readback} = 16
-== webgl-clear-test.html?nogl  wrapper.html?green.png
-
                       == webgl-clear-test.html?__&_____&________  wrapper.html?green.png
                       == webgl-clear-test.html?aa&_____&________  wrapper.html?green.png
 fuzzy-if(B2G,256,83)  == webgl-clear-test.html?__&alpha&________  wrapper.html?green.png
 fuzzy-if(B2G,256,83)  == webgl-clear-test.html?aa&alpha&________  wrapper.html?green.png
                       == webgl-clear-test.html?__&_____&preserve  wrapper.html?green.png
                       == webgl-clear-test.html?aa&_____&preserve  wrapper.html?green.png
 fuzzy-if(B2G,256,83)  == webgl-clear-test.html?__&alpha&preserve  wrapper.html?green.png
 fuzzy-if(B2G,256,83)  == webgl-clear-test.html?aa&alpha&preserve  wrapper.html?green.png
@@ -25,18 +23,16 @@ pref(webgl.force-layers-readback,true)  
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-clear-test.html?readback&__&alpha&________  wrapper.html?green.png
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-clear-test.html?readback&aa&alpha&________  wrapper.html?green.png
 pref(webgl.force-layers-readback,true)                       == webgl-clear-test.html?readback&__&_____&preserve  wrapper.html?green.png
 pref(webgl.force-layers-readback,true)                       == webgl-clear-test.html?readback&aa&_____&preserve  wrapper.html?green.png
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-clear-test.html?readback&__&alpha&preserve  wrapper.html?green.png
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-clear-test.html?readback&aa&alpha&preserve  wrapper.html?green.png
 
 # Check orientation:
-== webgl-orientation-test.html?nogl  wrapper.html?white-top-left.png
-
                       == webgl-orientation-test.html?__&_____&________  wrapper.html?white-top-left.png
                       == webgl-orientation-test.html?aa&_____&________  wrapper.html?white-top-left.png
 fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?__&alpha&________  wrapper.html?white-top-left.png
 fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?aa&alpha&________  wrapper.html?white-top-left.png
                       == webgl-orientation-test.html?__&_____&preserve  wrapper.html?white-top-left.png
                       == webgl-orientation-test.html?aa&_____&preserve  wrapper.html?white-top-left.png
 fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?__&alpha&preserve  wrapper.html?white-top-left.png
 fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?aa&alpha&preserve  wrapper.html?white-top-left.png
@@ -47,18 +43,16 @@ pref(webgl.force-layers-readback,true) f
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?readback&aa&alpha&________  wrapper.html?white-top-left.png
 pref(webgl.force-layers-readback,true)                       == webgl-orientation-test.html?readback&__&_____&preserve  wrapper.html?white-top-left.png
 pref(webgl.force-layers-readback,true)                       == webgl-orientation-test.html?readback&aa&_____&preserve  wrapper.html?white-top-left.png
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?readback&__&alpha&preserve  wrapper.html?white-top-left.png
 pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83)  == webgl-orientation-test.html?readback&aa&alpha&preserve  wrapper.html?white-top-left.png
 
 # Does we draw the correct color in the correct places with all context creation options?
 # (Note that our context creation option matrix is 2^6 = 64)
-random-if(B2G) == webgl-color-test.html?nogl  wrapper.html?colors.png # Bug 844439
-
 random-if(B2G) == webgl-color-test.html?__&_____&_____&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?aa&_____&_____&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?__&alpha&_____&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?aa&alpha&_____&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?__&_____&depth&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?aa&_____&depth&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?__&alpha&depth&_______&________&_______  wrapper.html?colors.png # Bug 844439
 random-if(B2G) == webgl-color-test.html?aa&alpha&depth&_______&________&_______  wrapper.html?colors.png # Bug 844439
@@ -130,46 +124,35 @@ pref(webgl.force-layers-readback,true) r
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&aa&alpha&________  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&__&_____&preserve  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&aa&_____&preserve  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&__&alpha&preserve  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&aa&alpha&preserve  wrapper.html?colors.png # Bug 844439
 
 
 # Check alpha behavior:
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=1.0&nogl        wrapper.html?colors.png
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=1.0             wrapper.html?colors.png
+fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=1.0  wrapper.html?colors.png
 # These tests don't use wrapper.html, as there appear to be invalidation issues with black.png and async image decoding - Bug 803299
-== webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0&nogl        black.html
-== webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0             black.html
+== webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0  black.html
 
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&nogl        wrapper.html?colors.png
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0             wrapper.html?colors.png
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&alpha&nogl  wrapper.html?white.png
-fails-if(B2G)         == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&alpha       wrapper.html?white.png
+fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0        wrapper.html?colors.png
+fails-if(B2G)         == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&alpha  wrapper.html?white.png
 
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=1.0&nogl  wrapper.html?half-colors.png
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=1.0       wrapper.html?half-colors.png
+fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=1.0  wrapper.html?half-colors.png
 
 # Test premult:
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)                                 == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha&nogl          wrapper.html?colors-half-alpha.png
-fuzzy(1,65536) fails-if(B2G)        fuzzy-if(Android,9,65536)                                      == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha               wrapper.html?colors-half-alpha.png
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)                                 == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha&nogl          wrapper.html?half-colors-half-alpha.png
-fuzzy(1,65536) fails-if(B2G)        fuzzy-if(Android,9,65536) fails-if(cocoaWidget||Android)       == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha               wrapper.html?half-colors-half-alpha.png
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)                                 == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha&premult&nogl  wrapper.html?colors-half-alpha.png
-fuzzy(1,65536) fails-if(B2G)        fuzzy-if(Android,9,65536)                                      == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha&premult       wrapper.html?colors-half-alpha.png
+fuzzy(1,65536) fails-if(B2G) fuzzy-if(Android,9,65536)                                 == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha          wrapper.html?colors-half-alpha.png
+fuzzy(1,65536) fails-if(B2G) fuzzy-if(Android,9,65536) fails-if(cocoaWidget||Android)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha          wrapper.html?half-colors-half-alpha.png
+fuzzy(1,65536) fails-if(B2G) fuzzy-if(Android,9,65536)                                 == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=0.5&alpha&premult  wrapper.html?colors-half-alpha.png
 
 # Test over-bright premult:
-fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha&premult&nogl  wrapper.html?colors-half-alpha.png
-fuzzy(1,65536) fails-if(B2G)        fuzzy-if(Android,9,65536)       == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha&premult       wrapper.html?colors-half-alpha.png
+fuzzy(1,65536) fails-if(B2G) fuzzy-if(Android,9,65536)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.5&alpha&premult  wrapper.html?colors-half-alpha.png
 
 
 # Check for hanging framebuffer bindings:
-== webgl-hanging-fb-test.html?nogl  wrapper.html?green.png
-
                                         == webgl-hanging-fb-test.html?__&________  wrapper.html?green.png
                                         == webgl-hanging-fb-test.html?aa&________  wrapper.html?green.png
 pref(webgl.force-layers-readback,true)  == webgl-hanging-fb-test.html?__&readback  wrapper.html?green.png
 pref(webgl.force-layers-readback,true)  == webgl-hanging-fb-test.html?aa&readback  wrapper.html?green.png
 
                                         == webgl-hanging-scissor-test.html?__&________  wrapper.html?green.png
                                         == webgl-hanging-scissor-test.html?aa&________  wrapper.html?green.png
 pref(webgl.force-layers-readback,true)  == webgl-hanging-scissor-test.html?__&readback  wrapper.html?green.png
--- a/content/canvas/test/reftest/webgl-clear-test.html
+++ b/content/canvas/test/reftest/webgl-clear-test.html
@@ -13,30 +13,24 @@
 "use strict";
 
 function renderGL(gl) {
   gl.clearColor(0.0, 1.0, 0.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
   gl.finish();
 }
 
-function renderBackup(canvas) {
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(0, 255, 0, 1.0)";
-  context.fillRect(0, 0, 256, 256);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderBackup(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-color-alpha-test.html
+++ b/content/canvas/test/reftest/webgl-color-alpha-test.html
@@ -42,53 +42,27 @@ function renderGL(gl, value, alpha) {
 
   gl.scissor(128, 0, 128, 128);
   gl.clearColor(value, value, value, alpha);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderBackup(canvas, value, alpha) {
-  if (!arg("alpha"))
-    alpha = 1.0;
-
-  if (arg("alpha") && arg("premult")) {
-    if (alpha == 0.0)
-      value = 1.0;
-    else
-      value /= alpha;
-  }
-
-  var intValue = (value * 255) | 0;
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(" + intValue + ", 0, 0, " + alpha + ")";
-  context.fillRect(0, 0, 128, 128);
-
-  context.fillStyle = "rgba(0, " + intValue + ", 0, " + alpha + ")";
-  context.fillRect(128, 0, 128, 128);
-
-  context.fillStyle = "rgba(0, 0, " + intValue + ", " + alpha + ")";
-  context.fillRect(0, 128, 128, 128);
-
-  context.fillStyle = "rgba(" + intValue + ", " + intValue + ", " + intValue + ", " + alpha + ")";
-  context.fillRect(128, 128, 128, 128);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   var value = arg("colorVal");
   var alpha = arg("alphaVal");
 
   if (gl)
     renderGL(gl, value, alpha);
   else
-    renderBackup(canvas, value, alpha);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-color-test.html
+++ b/content/canvas/test/reftest/webgl-color-test.html
@@ -40,39 +40,24 @@ function renderGL(gl) {
 
   gl.scissor(128, 0, 128, 128);
   gl.clearColor(1.0, 1.0, 1.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderBackup(canvas) {
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(255, 0, 0, 1.0)";
-  context.fillRect(0, 0, 128, 128);
-
-  context.fillStyle = "rgba(0, 255, 0, 1.0)";
-  context.fillRect(128, 0, 128, 128);
-
-  context.fillStyle = "rgba(0, 0, 255, 1.0)";
-  context.fillRect(0, 128, 128, 128);
-
-  context.fillStyle = "rgba(255, 255, 255, 1.0)";
-  context.fillRect(128, 128, 128, 128);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderBackup(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-hanging-fb-test.html
+++ b/content/canvas/test/reftest/webgl-hanging-fb-test.html
@@ -22,30 +22,24 @@ function renderGL(gl) {
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   var fb = gl.createFramebuffer();
   gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
 
   gl.finish();
 }
 
-function renderBackup(canvas) {
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(0, 255, 0, 1.0)";
-  context.fillRect(0, 0, 256, 256);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderBackup(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-hanging-scissor-test.html
+++ b/content/canvas/test/reftest/webgl-hanging-scissor-test.html
@@ -21,30 +21,24 @@ function renderGL(gl) {
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.enable(gl.SCISSOR_TEST);
   gl.scissor(0, 128, 128, 128);
 
   gl.finish();
 }
 
-function renderBackup(canvas) {
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(0, 255, 0, 1.0)";
-  context.fillRect(0, 0, 256, 256);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderBackup(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-orientation-test.html
+++ b/content/canvas/test/reftest/webgl-orientation-test.html
@@ -21,33 +21,24 @@ function renderGL(gl) {
   gl.enable(gl.SCISSOR_TEST);
   gl.scissor(0, 128, 128, 128);
   gl.clearColor(1.0, 1.0, 1.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderBackup(canvas) {
-  var context = canvas.getContext("2d");
-  context.fillStyle = "rgba(0, 0, 0, 1.0)";
-  context.fillRect(0, 0, 256, 256);
-
-  context.fillStyle = "rgba(255, 255, 255, 1.0)";
-  context.fillRect(0, 0, 128, 128);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderBackup(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>