Bug 1030206 - Update old webgl conformance test. Not supporting float…

… rendering targets is now legal. r=kamidphish
dothq · Jul 16, 2014 · 8ae0715 · 8ae0715
1 parent 0a8257f
commit 8ae0715
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html b/content/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
@@ -156,14 +156,10 @@
     gl.bindFramebuffer(gl.FRAMEBUFFER, fbo);
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, texture, 0);
     gl.bindTexture(gl.TEXTURE_2D, null);
-    shouldBe("gl.checkFramebufferStatus(gl.FRAMEBUFFER)", "gl.FRAMEBUFFER_COMPLETE");
-    // While strictly speaking it is probably legal for a WebGL implementation to support
-    // floating-point textures but not as attachments to framebuffer objects, any such
-    // implementation is so poor that it arguably should not advertise support for the
-    // OES_texture_float extension. For this reason the conformance test requires that the
-    // framebuffer is complete here.
-    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE)
+    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {
+        debug("floating-point " + formatString + " render target not supported -- this is legal");
         return;
+    }
 
     var renderProgram =
         wtu.setupProgram(gl,

diff --git a/content/canvas/test/webgl-conformance/failing_tests_android.txt b/content/canvas/test/webgl-conformance/failing_tests_android.txt
@@ -1,4 +1,3 @@
-conformance/extensions/oes-texture-float.html
 conformance/extensions/oes-vertex-array-object.html
 conformance/glsl/functions/glsl-function-abs.html
 conformance/glsl/functions/glsl-function-faceforward.html

diff --git a/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt b/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt
@@ -1,5 +1,4 @@
 # Failures for our android x86 and arm emulator test environments.
 
-conformance/extensions/oes-texture-float.html
 conformance/programs/get-active-test.html
 conformance/textures/texture-npot.html
diff --git a/content/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt b/content/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
@@ -1,3 +1,2 @@
 conformance/textures/texture-size-cube-maps.html
-conformance/extensions/oes-texture-float.html
 conformance/glsl/functions/glsl-function-sin.html
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt b/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
@@ -1,3 +1,10 @@
+# OES-texture-float is failing on Android 2.3, but not Android 4.0 when
+# there is a way to differentiate these two slaves this should be removed
+# and updated as appropriately. The Android 2.3 slave is returning red
+# when it should be green. This is believed to be a driver bug and not
+# FF bug at the moment.
+conformance/extensions/oes-texture-float.html
+
 conformance/extensions/oes-vertex-array-object.html
 conformance/glsl/functions/glsl-function-abs.html
 conformance/glsl/functions/glsl-function-faceforward.html