Backed out changeset 8cc680bb6ba2 (bug 883364) for Android webgl failures on a CLOSED TREE

This commit is contained in:
Ed Morley 2013-07-19 14:43:34 +01:00
parent be310c2627
commit abf44e2e77
7 changed files with 101 additions and 16 deletions

View File

@ -1,5 +1,5 @@
# WebGL Reftests!
default-preferences pref(webgl.force-enabled,true)
# If you add new tests, don't forget to add sanity (&nogl) tests! (if needed)
# Check that disabling works:
== webgl-disable-test.html?nogl wrapper.html?green.png
@ -9,6 +9,8 @@ pref(webgl.disabled,true) == webgl-disable-test.html wrapper.html?green.p
# 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
@ -28,6 +30,8 @@ pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83) == webgl-clear-test
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
@ -48,6 +52,8 @@ pref(webgl.force-layers-readback,true) fuzzy-if(B2G,256,83) == webgl-orientatio
# 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
@ -129,25 +135,36 @@ pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?r
# Check alpha behavior:
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&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
# 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 black.html
== 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
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-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(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&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
# Test premult:
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
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
# Test over-bright premult:
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) 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
# 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

View File

@ -18,6 +18,12 @@ function renderGL(gl) {
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);
@ -25,7 +31,7 @@ function runTest() {
if (gl)
renderGL(gl);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas);
rAF(testComplete);
}

View File

@ -47,6 +47,32 @@ function renderGL(gl, value, alpha) {
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);
@ -57,7 +83,7 @@ function runTest() {
if (gl)
renderGL(gl, value, alpha);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas, value, alpha);
rAF(testComplete);
}

View File

@ -45,6 +45,21 @@ function renderGL(gl) {
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);
@ -52,7 +67,7 @@ function runTest() {
if (gl)
renderGL(gl);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas);
rAF(testComplete);
}

View File

@ -27,6 +27,12 @@ function renderGL(gl) {
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);
@ -34,7 +40,7 @@ function runTest() {
if (gl)
renderGL(gl);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas);
rAF(testComplete);
}

View File

@ -26,6 +26,12 @@ function renderGL(gl) {
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);
@ -33,7 +39,7 @@ function runTest() {
if (gl)
renderGL(gl);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas);
rAF(testComplete);
}

View File

@ -26,6 +26,15 @@ function renderGL(gl) {
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);
@ -33,7 +42,7 @@ function runTest() {
if (gl)
renderGL(gl);
else
document.write("Failed to get WebGL context.");
renderBackup(canvas);
rAF(testComplete);
}