Changeset 189533 in webkit


Ignore:
Timestamp:
Sep 8, 2015, 9:59:47 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r189407 and r189424.
​https://bugs.webkit.org/show_bug.cgi?id=148993

Broke some tests, and made others flakily time out (Requested
by ap on #webkit).

Reverted changesets:

"[WebGL] Update WebGL 1.0.3 conformance tests"
​https://bugs.webkit.org/show_bug.cgi?id=148858
​http://trac.webkit.org/changeset/189407

"REGRESSION (r189407): webgl/1.0.3/conformance/extensions
/webgl-draw-buffers.html"
​http://trac.webkit.org/changeset/189424

Location:
trunk/LayoutTests
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r189521 r189533  
     12015-09-08  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r189407 and r189424.
     4        https://bugs.webkit.org/show_bug.cgi?id=148993
     5
     6        Broke some tests, and made others flakily time out (Requested
     7        by ap on #webkit).
     8
     9        Reverted changesets:
     10
     11        "[WebGL] Update WebGL 1.0.3 conformance tests"
     12        https://bugs.webkit.org/show_bug.cgi?id=148858
     13        http://trac.webkit.org/changeset/189407
     14
     15        "REGRESSION (r189407): webgl/1.0.3/conformance/extensions
     16        /webgl-draw-buffers.html"
     17        http://trac.webkit.org/changeset/189424
     18
    1192015-09-08  Said Abou-Hallawa  <sabouhallawa@apple.com>
    220

  • trunk/LayoutTests/platform/mac/TestExpectations

    r189483 r189533  
    440440webkit.org/b/124935 [ Debug ] webgl/1.0.2/conformance/glsl/misc/shader-with-non-reserved-words.html [ Slow ]
    441441
     442# Skip 1.0.3 tests for now, to be unskipped when we get closer to conformance
     443webgl/1.0.3/conformance/attribs [ Skip ]
     444webgl/1.0.3/conformance/buffers [ Skip ]
     445webgl/1.0.3/conformance/canvas [ Skip ]
     446webgl/1.0.3/conformance/context [ Skip ]
     447webgl/1.0.3/conformance/glsl [ Skip ]
     448webgl/1.0.3/conformance/renderbuffers [ Skip ]
     449webgl/1.0.3/conformance/rendering [ Skip ]
     450webgl/1.0.3/conformance/state [ Skip ]
     451webgl/1.0.3/conformance/textures [ Skip ]
     452webgl/1.0.3/conformance/typedarrays [ Skip ]
     453webgl/1.0.3/conformance/uniforms [ Skip ]
     454webgl/1.0.3/conformance/extensions/angle-instanced-arrays.html [ Skip ]
     455webgl/1.0.3/conformance/extensions/oes-texture-half-float.html [ Skip ]
     456webgl/1.0.3/conformance/extensions/webgl-compressed-texture-size-limit.html [ Skip ]
     457webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Skip ]
     458
    442459# Sending the mouse down event to the scrollbar starts a nested run loop which causes a hang.
    443460fast/events/mousedown-in-subframe-scrollbar.html [ Skip ]
    … …  
    445462webkit.org/b/96828 fast/canvas/webgl/oes-vertex-array-object.html [ Skip ]
    446463webkit.org/b/96828 webgl/1.0.2/conformance/extensions/oes-vertex-array-object.html [ Skip ]
    447 
    448 [ Mavericks ] webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Failure ]
    449 webgl/1.0.3/conformance/rendering/point-no-attributes.html [ Skip ]
    450464
    451465http/tests/misc/willCacheResponse-delegate-callback.html [ Failure ]

  • trunk/LayoutTests/webgl/1.0.3/conformance/extensions/oes-texture-half-float-expected.txt

    r189407 r189533  
    22
    33Test: ../../resources/webgl_test_files/conformance/extensions/oes-texture-half-float.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/extensions/webgl-compressed-texture-size-limit-expected.txt

    r189407 r189533  
    22
    33Test: ../../resources/webgl_test_files/conformance/extensions/webgl-compressed-texture-size-limit.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/extensions/webgl-draw-buffers-expected.txt

    r189407 r189533  
    22
    33Test: ../../resources/webgl_test_files/conformance/extensions/webgl-draw-buffers.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/glsl/misc/shader-struct-scope-expected.txt

    r189407 r189533  
    22
    33Test: ../../../resources/webgl_test_files/conformance/glsl/misc/shader-struct-scope.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/glsl/misc/shaders-with-invariance-expected.txt

    r189407 r189533  
    22
    33Test: ../../../resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/glsl/misc/shaders-with-name-conflicts-expected.txt

    r189407 r189533  
    22
    33Test: ../../../resources/webgl_test_files/conformance/glsl/misc/shaders-with-name-conflicts.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/glsl/misc/struct-nesting-of-variable-names-expected.txt

    r189407 r189533  
    22
    33Test: ../../../resources/webgl_test_files/conformance/glsl/misc/struct-nesting-of-variable-names.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/renderbuffers/feedback-loop-expected.txt

    r189407 r189533  
    22
    33Test: ../../resources/webgl_test_files/conformance/renderbuffers/feedback-loop.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/conformance/textures/texture-copying-feedback-loops-expected.txt

    r189407 r189533  
    22
    33Test: ../../resources/webgl_test_files/conformance/textures/texture-copying-feedback-loops.html
    4 FAIL
     4PASS
    55

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/extensions/angle-instanced-arrays.html

    r189407 r189533  
    7878if (!gl) {
    7979    testFailed("WebGL context does not exist");
    80     finishTest();
    8180} else {
    8281    testPassed("WebGL context exists");
    … …  
    9089
    9190        runSupportedTest(false);
    92         finishTest();
    9391    } else {
    9492        testPassed("Successfully enabled ANGLE_instanced_arrays extension");
    … …  
    416414    cycleAndTest();
    417415}
     416
     417var successfullyParsed = true;
    418418</script>
     419<script src="../../resources/js-test-post.js"></script>
     420
    419421</body>
    420422</html>

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/glsl/misc/shader-with-for-loop.html

    r189407 r189533  
    4949
    5050// Saw-tooth function that is synced with the demo music (128bpm)
    51 float gBeat;
     51float gBeat=fract(time*3.2/3.);
    5252
    5353// Calculate the surface color
    … …  
    7575void main()
    7676{
    77     gBeat=fract(time*3.2/3.);
    7877    // Screen setup
    7978    vec2 p=(2.*gl_FragCoord.xy-resolution)/resolution.y,

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/glsl/misc/ternary-operators-in-global-initializers.html

    r189407 r189533  
    3939<script id="fragmentShader" type="text/something-not-javascript">
    4040precision mediump float;
    41 const $(type) green = $(green);
    42 const $(type) black = $(black);
     41$(type) green = $(green);
     42$(type) black = $(black);
    4343$(type) var = (true) ? green : black;
    4444void main() {

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/misc/bad-arguments-test.html

    r189407 r189533  
    7272
    7373for (var i = 0; i < testArguments.length; ++i) {
    74   var func, func2;
     74  var func, func2, func3;
    7575  if (testArguments[i].throws) {
    7676    func = shouldThrow;
    7777    func2 = shouldThrow;
     78    func3 = shouldThrow;
    7879  } else {
    7980    func = shouldBeUndefined;
    8081    func2 = shouldBeNull;
     82    func3 = shouldBeEmptyString;
    8183  }
    8284  argument = testArguments[i].value;
    … …  
    100102  func("context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0]))");
    101103
    102   func2("context.getProgramInfoLog(argument)");
    103104  func2("context.getProgramParameter(argument, 0)");
    104   func2("context.getShaderInfoLog(argument)");
    105105  func2("context.getShaderParameter(argument, 0)");
    106   func2("context.getShaderSource(argument)");
    107106  func2("context.getUniform(argument, loc)");
    108107  func2("context.getUniform(program, argument)");
    109108  func2("context.getUniformLocation(argument, 'u_modelViewProjMatrix')");
    110109
     110  func3("context.getProgramInfoLog(argument)");
     111  func3("context.getShaderInfoLog(argument)");
     112  func3("context.getShaderSource(argument)");
    111113}
    112114

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/functions/uniformMatrixBadArgs.html

    r189407 r189533  
    121121  var d = new Uint8Array(4);
    122122  gl.readPixels(0,0,1,1,gl.RGBA, gl.UNSIGNED_BYTE, d);
    123   assertArrayEqualsWithEpsilon([1,2,3,8], d, [1,1,1,1]);
     123  assertArrayEquals([1,2,3,8], d);
    124124  sh.destroy();
    125125}

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js

    r189407 r189533  
    389389  }
    390390  testPassed("assertArrayEquals", name, v, p);
    391   return true;
    392 }
    393 
    394 function assertArrayEqualsWithEpsilon(name, v, p, l) {
    395   if (l == null) { l = p; p = v; v = name; name = null; }
    396   if (!v) {
    397     testFailed("assertArrayEqualsWithEpsilon: first array undefined", name, v, p);
    398     return false;
    399   }
    400   if (!p) {
    401     testFailed("assertArrayEqualsWithEpsilon: second array undefined", name, v, p);
    402     return false;
    403   }
    404   if (!l) {
    405     testFailed("assertArrayEqualsWithEpsilon: limit array undefined", name, v, p);
    406     return false;
    407   }
    408   if (v.length != p.length) {
    409     testFailed("assertArrayEqualsWithEpsilon", name, v, p, l);
    410     return false;
    411   }
    412   if (v.length != l.length) {
    413     testFailed("assertArrayEqualsWithEpsilon", name, v, p, l);
    414     return false;
    415   }
    416   for (var ii = 0; ii < v.length; ++ii) {
    417     if (Math.abs(v[ii]- p[ii])>l[ii]) {
    418       testFailed("assertArrayEqualsWithEpsilon", name, v, p, l);
    419       return false;
    420     }
    421   }
    422   testPassed("assertArrayEqualsWithEpsilon", name, v, p, l);
    423391  return true;
    424392}

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/ogles/ogles-utils.js

    r189407 r189533  
    501501  for (var name in uniforms) {
    502502    var uniform = uniforms[name];
    503     if (name.indexOf("gl_") == 0) {
    504       continue;
    505     }
    506503    if (!uniform.used) {
    507504      testFailed("uniform " + name + " never set");

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html

    r189407 r189533  
    5353function setup() {
    5454    tex = gl.createTexture();
    55     gl.bindTexture(gl.TEXTURE_2D, tex);
     55    gl.bindTexture(gl.TEXTURE_2D, bug32619_tests.tex);
    5656    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
    5757}
    … …  
    8181    }
    8282}
    83 
    84 test("Calling texImage2D with no WebGLTexture bound generates INVALID_OPERATION",
    85      function () {
    86         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
    87      },
    88      gl.INVALID_OPERATION);
    89 
    90 test("Calling texSubImage2D with no WebGLTexture bound generates INVALID_OPERATION",
    91      function () {
    92         var buffer = new Uint8Array(4);
    93         gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, buffer);
    94      },
    95      gl.INVALID_OPERATION);
    96 
    97 setup();
    9883
    9984test("Passing a buffer not large enough to texImage2D should generate an INVALID_OPERATION",
    … …  
    134119     "exception");
    135120
    136 teardown();
    137 
    138121debug("");
    139122var successfullyParsed = true;

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/typedarrays/array-unit-tests.html

    r189407 r189533  
    196196  shouldBe('new Uint8ClampedArray(1) instanceof Uint8Array', 'false');
    197197
    198   if (Object.getPrototypeOf(Int8Array.prototype) == Object.prototype) {
    199     // ES5 behavior.
    200     shouldBe('Object.getPrototypeOf(Int8Array.prototype)', 'Object.prototype');
    201     shouldBe('Object.getPrototypeOf(Uint8Array.prototype)', 'Object.prototype');
    202     shouldBe('Object.getPrototypeOf(Uint8ClampedArray.prototype)', 'Object.prototype');
    203     shouldBe('Object.getPrototypeOf(Int16Array.prototype)', 'Object.prototype');
    204     shouldBe('Object.getPrototypeOf(Uint16Array.prototype)', 'Object.prototype');
    205     shouldBe('Object.getPrototypeOf(Int32Array.prototype)', 'Object.prototype');
    206     shouldBe('Object.getPrototypeOf(Uint32Array.prototype)', 'Object.prototype');
    207     shouldBe('Object.getPrototypeOf(Float32Array.prototype)', 'Object.prototype');
    208     shouldBe('Object.getPrototypeOf(Float64Array.prototype)', 'Object.prototype');
    209   } else {
    210     // As of ES6, the prototypes for typed array constructors point to an intrinsic object whose internal
    211     // prototype is Object.prototype. Relevant spec section is 22.2.5.2: TypedArray.prototype.
    212     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Int8Array.prototype))', 'Object.prototype');
    213     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Uint8Array.prototype))', 'Object.prototype');
    214     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Uint8ClampedArray.prototype))', 'Object.prototype');
    215     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Int16Array.prototype))', 'Object.prototype');
    216     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Uint16Array.prototype))', 'Object.prototype');
    217     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Int32Array.prototype))', 'Object.prototype');
    218     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Uint32Array.prototype))', 'Object.prototype');
    219     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Float32Array.prototype))', 'Object.prototype');
    220     shouldBe('Object.getPrototypeOf(Object.getPrototypeOf(Float64Array.prototype))', 'Object.prototype');
    221   }
     198  shouldBe('Object.getPrototypeOf(Int8Array.prototype)', 'Object.prototype');
     199  shouldBe('Object.getPrototypeOf(Uint8Array.prototype)', 'Object.prototype');
     200  shouldBe('Object.getPrototypeOf(Uint8ClampedArray.prototype)', 'Object.prototype');
     201  shouldBe('Object.getPrototypeOf(Int16Array.prototype)', 'Object.prototype');
     202  shouldBe('Object.getPrototypeOf(Uint16Array.prototype)', 'Object.prototype');
     203  shouldBe('Object.getPrototypeOf(Int32Array.prototype)', 'Object.prototype');
     204  shouldBe('Object.getPrototypeOf(Uint32Array.prototype)', 'Object.prototype');
     205  shouldBe('Object.getPrototypeOf(Float32Array.prototype)', 'Object.prototype');
     206  shouldBe('Object.getPrototypeOf(Float64Array.prototype)', 'Object.prototype');
     207  shouldBe('Object.getPrototypeOf(DataView.prototype)', 'Object.prototype');
    222208}
    223209

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/typedarrays/resources/typed-array-worker.js

    r189407 r189533  
    7575      valueToSend = view.buffer;
    7676    }
    77     var transferablesToSend = undefined;
     77    var transferablesToSend = null;
    7878    if (message.command == 'transfer' ||
    7979        message.command == 'transferBuffer') {

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/webgl-conformance-tests.html

    r189407 r189533  
    179179      window.console.log(msg);
    180180    }
    181   }
    182 
    183   function createStylesheet() {
    184     var style = document.createElement("style");
    185     style.appendChild(document.createTextNode(""));
    186     document.head.appendChild(style);
    187     return style.sheet;
    188181  }
    189182
    … …  
    934927    autoScroll = autoScrollEnabled;
    935928  };
    936 
    937   var hidePassedSheet = createStylesheet();
    938   var hidePassedCheckbox = document.getElementById("hidePassedCheckbox");
    939   hidePassedCheckbox.checked = false;
    940   hidePassedCheckbox.onclick = function() {
    941     var hidePassedTests = hidePassedCheckbox.checked;
    942     if (hidePassedTests) {
    943         hidePassedSheet.insertRule(".testpagesuccess { display: none; }", 0);
    944     } else {
    945         hidePassedSheet.deleteRule(0);
    946     }
    947   };
    948 
    949929  var textbutton = document.getElementById("showTextSummary");
    950930  textbutton.onclick = function() {
    … …  
    1012992              <input type="checkbox" id="autoScrollCheckbox"/>
    1013993              <label for="autoScrollCheckbox">auto scroll</label>
    1014               <br/>
    1015               <input type="checkbox" id="hidePassedCheckbox"/>
    1016               <label for="hidePassedCheckbox">hide passed tests</label>
    1017994              <br/>
    1018995              <input type="button" style="visibility: hidden;" value="display text summary" id="showTextSummary"/>
Note: See TracChangeset for help on using the changeset viewer.