Backout revision e46ca0ac35f5 (Bug 1229944) for bad m-gl on CLOSED TREE.
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 16 Dec 2015 16:10:01 -0800
changeset 276650 09fcb5bd716705a5f600d9fb29b06b1aa491efbd
parent 276649 23599e1b42e185d0b15a4bf8f3bb18947abffc54
child 276651 d148b0aa6544da2172d95429eee9155ee148d344
push id69250
push userjgilbert@mozilla.com
push dateThu, 17 Dec 2015 00:15:10 +0000
treeherdermozilla-inbound@09fcb5bd7167 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1229944
milestone46.0a1
backs oute46ca0ac35f5cac18b4e61cefd91e14ed203b5e8
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout revision e46ca0ac35f5 (Bug 1229944) for bad m-gl on CLOSED TREE.
dom/canvas/test/webgl-mochitest.ini
dom/canvas/test/webgl-mochitest/test_depth_tex_lazy_clear.html
--- a/dom/canvas/test/webgl-mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest.ini
@@ -7,17 +7,16 @@ support-files =
   webgl-mochitest/webgl-util.js
 
 [webgl-mochitest/test_backbuffer_channels.html]
 fail-if = (os == 'b2g')
 [webgl-mochitest/test_depth_readpixels.html]
 [webgl-mochitest/test_capture.html]
 support-files = captureStream_common.js
 [webgl-mochitest/test_cubemap_must_be_square.html]
-[webgl-mochitest/test_depth_tex_lazy_clear.html]
 [webgl-mochitest/test_draw.html]
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
 [webgl-mochitest/test_hidden_alpha.html]
 skip-if = (os == 'b2g') || buildapp == 'mulet' # Mulet - bug 1093639 (crashes in libLLVM-3.0.so)
 [webgl-mochitest/test_implicit_color_buffer_float.html]
 [webgl-mochitest/test_highp_fs.html]
 [webgl-mochitest/test_no_arr_points.html]
deleted file mode 100644
--- a/dom/canvas/test/webgl-mochitest/test_depth_tex_lazy_clear.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset='utf-8'/>
-  <script src='/tests/SimpleTest/SimpleTest.js'></script>
-  <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
-  <script src='webgl-util.js'></script>
-</head>
-<body>
-<script id='vs' type='x-shader/x-vertex'>
-
-attribute vec2 aVertCoord;
-
-void main(void) {
-  gl_Position = vec4(aVertCoord, 0.0, 1.0);
-}
-
-</script>
-<script id='fs' type='x-shader/x-fragment'>
-
-precision mediump float;
-uniform sampler2D uTexUnit;
-
-void main(void) {
-  vec4 tex = texture2D(uTexUnit, vec2(0));
-  gl_FragColor = vec4(tex.r, 1.0, 0.0, 1.0);
-}
-
-</script>
-<script>
-'use strict';
-
-var gl = null;
-
-do {
-  var c = document.createElement('canvas');
-  gl = c.getContext('webgl');
-  if (!gl) {
-    todo(gl, 'Get GL working here first.');
-    break;
-  }
-
-  var ext = gl.getExtension('WEBGL_depth_texture');
-  if (!ext) {
-    todo(gl, 'WEBGL_depth_texture not supported, which is fine.');
-    break;
-  }
-
-  var prog = WebGLUtil.createProgramByIds(gl, 'vs', 'fs');
-  if (!prog) {
-    ok(false, 'Program linking should succeed.');
-    break;
-  }
-
-  var tex = gl.createTexture();
-  gl.bindTexture(gl.TEXTURE_2D, tex);
-  gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT,
-                gl.UNSIGNED_INT, null);
-
-  var uTexUnit = gl.getUniformLocation(prog, 'uTexUnit');
-  gl.useProgram(prog);
-  gl.uniform1i(uTexUnit, 0);
-
-  gl.drawArrays(gl.POINTS, 0, 1);
-
-  ok(!gl.getError(), 'Should have no errors.');
-} while (false);
-
-ok(true, 'Test complete.');
-
-</script>
-</body>
-</html>