Attachment 347717 Details for Bug 188825 – Patch

[patch] Patch

bug-188825-20180821155545.patch (text/plain), 72.40 KB, created by Justin Fan on 2018-08-21 15:55:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2018-08-21 15:55:46 PDT

Size: 72.40 KB

patch

obsolete

>Subversion Revision: 235141
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b54f89ec9ec11605cccaaa5fe035bd400cba76f7..2082bad307e3451c1aa469a9746a4f17fdb3c686 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,59 @@
>+2018-08-21  Justin Fan  <justin_fan@apple.com>
>+
>+        Update webkit-webgl-test-harness.js for more details on WebGL 2 conformance tests
>+        https://bugs.webkit.org/show_bug.cgi?id=188825
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Another update to the test-harness specific to the new WebGL 2 tests in our suite. All sub-test messages are 
>+        now reported by the harness and presented in an ordered list for easier referencing. Sub-test failures are 
>+        marked accordingly and with their test number for diffing purposes.
>+
>+        * webgl/2.0.0/conformance2/glsl3/array-as-return-value-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-assign-constructor-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-assign-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-complex-indexing-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-element-increment-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-equality-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/array-in-complex-expression-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/compare-structs-containing-arrays-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/const-array-init-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/frag-depth-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/loops-with-side-effects-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-define-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-identifier.frag-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/short-circuiting-in-loop-condition-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug-expected.txt:
>+        * webgl/2.0.0/conformance2/vertex_arrays/vertex-array-object-expected.txt:
>+        * webgl/2.0.0/resources/webkit-webgl-test-harness.js:
>+        (list):
>+        (window.webglTestHarness.reportResults):
>+        (window.webglTestHarness.notifyFinished):
>+
> 2018-08-21  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         Support "name" option for dedicated workers
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-as-return-value-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-as-return-value-expected.txt
>index 221b91a0bfd7af2dc3137cc2bdadc0a15012dc9f..a905d9b649c7404fecd668f390e02c383dfc8be1 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-as-return-value-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-as-return-value-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-as-return-value.html
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-constructor-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-constructor-expected.txt
>index 0611499c85f985fd8dc15810051a7974b85e8519..5ccf3cc0f8a36e7a68457a71dda0cf8872b705a0 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-constructor-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-constructor-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-assign-constructor.html
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-expected.txt
>index 1ea955c8df98a0e8a5954fd9de9e4669be449cfa..8cf157b8b985db2a046b1524aef83e1efa28f60f 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-assign-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-assign.html
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-complex-indexing-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-complex-indexing-expected.txt
>index bd1431f235713683b71d9c49f8c633b0fa48d64c..f1ab92d9733377a0075c9f89b5aa05c6cabe1f48 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-complex-indexing-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-complex-indexing-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-complex-indexing.html
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-element-increment-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-element-increment-expected.txt
>index 956f3963780d246fcdc72ecf72e8a7a65c0336ed..3222eb561120917ed34c60b61ed78b03c0bbc4ed 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-element-increment-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-element-increment-expected.txt
>@@ -1,5 +1,12 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-element-increment.html
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-equality-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-equality-expected.txt
>index 1c3cc9203bc4e6bf81d0d4391e0358e1167744dc..7dbaaafcee0010a7498cbfcfb7df5e3d3065df29 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-equality-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-equality-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-equality.html
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-in-complex-expression-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-in-complex-expression-expected.txt
>index 50395b1fa048b301e08a82537ec519c832837509..8a117a548ee518e02d19fbd64dc860bb2c1321b6 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-in-complex-expression-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/array-in-complex-expression-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/array-in-complex-expression.html
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>index def837fdace305dcb0927b7b0cdfcf147a2ace2b..e276dec13d33e8209d9a1a66e7291bb12da6f73f 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>@@ -1,10 +1,15 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/attrib-location-length-limits.html
>-getError expected: NO_ERROR. Was INVALID_VALUE :
>-attrib location was -1, should not be
>-getError expected: NO_ERROR. Was INVALID_VALUE :
>-3 failures reported
>-7 passes reported
>+gl.getProgramParameter(program, gl.LINK_STATUS) is true
>+[ FAIL: 2 ] getError expected: NO_ERROR. Was INVALID_VALUE :
>+[ FAIL: 3 ] attrib location was -1, should not be
>+[ FAIL: 4 ] getError expected: NO_ERROR. Was INVALID_VALUE :
>+wtu.loadProgramFromScriptExpectError(gl, "badVertexShader", "fragmentShader") is null
>+getError was expected value: NO_ERROR :
>+getError was expected value: INVALID_VALUE :
>+gl.getAttribLocation(program, attrib1025Name) is -1
>+getError was expected value: INVALID_VALUE :
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec-expected.txt
>index dd842ae9940df9983d8a0aca65035c09e96f4d10..4eed5f4c2d466fc54533ac69bfe2563791d99f74 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec-expected.txt
>@@ -1,5 +1,48 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec.html
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+should be 0,255,0,255
>+should be 255,0,0,255
>+getError was expected value: NO_ERROR : Should be no errors from testing
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compare-structs-containing-arrays-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compare-structs-containing-arrays-expected.txt
>index 23472cd7427ffb3cfbb8d35a616cccea9cd54953..38274a02ea593e199614f43708bef8afead6ff25 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compare-structs-containing-arrays-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compare-structs-containing-arrays-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/compare-structs-containing-arrays.html
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>index ffcb2828ef27124c5275348be2ddcf6c560b600b..611b76ebcf5a04d80ce8e919ab9c80f09e47f020 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>@@ -1,5 +1,488 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/compound-assignment-type-combination.html
>+float += vec2 in a vertex shader should fail.
>+float += vec2 in a fragment shader should fail.
>+vec2 += float in a vertex shader should succeed.
>+vec2 += float in a fragment shader should succeed.
>+vec2 += vec2 in a vertex shader should succeed.
>+vec2 += vec2 in a fragment shader should succeed.
>+float += vec3 in a vertex shader should fail.
>+float += vec3 in a fragment shader should fail.
>+vec3 += vec2 in a vertex shader should fail.
>+vec3 += vec2 in a fragment shader should fail.
>+vec3 += float in a vertex shader should succeed.
>+vec3 += float in a fragment shader should succeed.
>+vec3 += vec3 in a vertex shader should succeed.
>+vec3 += vec3 in a fragment shader should succeed.
>+float += vec4 in a vertex shader should fail.
>+float += vec4 in a fragment shader should fail.
>+vec4 += vec3 in a vertex shader should fail.
>+vec4 += vec3 in a fragment shader should fail.
>+vec4 += float in a vertex shader should succeed.
>+vec4 += float in a fragment shader should succeed.
>+vec4 += vec4 in a vertex shader should succeed.
>+vec4 += vec4 in a fragment shader should succeed.
>+float += mat2x2 in a vertex shader should fail.
>+float += mat2x2 in a fragment shader should fail.
>+mat2x2 += vec4 in a vertex shader should fail.
>+mat2x2 += vec4 in a fragment shader should fail.
>+mat2x2 += float in a vertex shader should succeed.
>+mat2x2 += float in a fragment shader should succeed.
>+mat2x2 += mat2x2 in a vertex shader should succeed.
>+mat2x2 += mat2x2 in a fragment shader should succeed.
>+float += mat3x3 in a vertex shader should fail.
>+float += mat3x3 in a fragment shader should fail.
>+mat3x3 += mat2x2 in a vertex shader should fail.
>+mat3x3 += mat2x2 in a fragment shader should fail.
>+mat3x3 += float in a vertex shader should succeed.
>+mat3x3 += float in a fragment shader should succeed.
>+mat3x3 += mat3x3 in a vertex shader should succeed.
>+mat3x3 += mat3x3 in a fragment shader should succeed.
>+float += mat4x4 in a vertex shader should fail.
>+float += mat4x4 in a fragment shader should fail.
>+mat4x4 += mat3x3 in a vertex shader should fail.
>+mat4x4 += mat3x3 in a fragment shader should fail.
>+mat4x4 += float in a vertex shader should succeed.
>+mat4x4 += float in a fragment shader should succeed.
>+mat4x4 += mat4x4 in a vertex shader should succeed.
>+mat4x4 += mat4x4 in a fragment shader should succeed.
>+float += mat2x3 in a vertex shader should fail.
>+float += mat2x3 in a fragment shader should fail.
>+mat2x3 += mat4x4 in a vertex shader should fail.
>+mat2x3 += mat4x4 in a fragment shader should fail.
>+mat2x3 += float in a vertex shader should succeed.
>+mat2x3 += float in a fragment shader should succeed.
>+mat2x3 += mat2x3 in a vertex shader should succeed.
>+mat2x3 += mat2x3 in a fragment shader should succeed.
>+float += mat2x4 in a vertex shader should fail.
>+float += mat2x4 in a fragment shader should fail.
>+mat2x4 += mat2x3 in a vertex shader should fail.
>+mat2x4 += mat2x3 in a fragment shader should fail.
>+mat2x4 += float in a vertex shader should succeed.
>+mat2x4 += float in a fragment shader should succeed.
>+mat2x4 += mat2x4 in a vertex shader should succeed.
>+mat2x4 += mat2x4 in a fragment shader should succeed.
>+float += mat3x2 in a vertex shader should fail.
>+float += mat3x2 in a fragment shader should fail.
>+mat3x2 += mat2x4 in a vertex shader should fail.
>+mat3x2 += mat2x4 in a fragment shader should fail.
>+mat3x2 += float in a vertex shader should succeed.
>+mat3x2 += float in a fragment shader should succeed.
>+mat3x2 += mat3x2 in a vertex shader should succeed.
>+mat3x2 += mat3x2 in a fragment shader should succeed.
>+float += mat3x4 in a vertex shader should fail.
>+float += mat3x4 in a fragment shader should fail.
>+mat3x4 += mat3x2 in a vertex shader should fail.
>+mat3x4 += mat3x2 in a fragment shader should fail.
>+mat3x4 += float in a vertex shader should succeed.
>+mat3x4 += float in a fragment shader should succeed.
>+mat3x4 += mat3x4 in a vertex shader should succeed.
>+mat3x4 += mat3x4 in a fragment shader should succeed.
>+float += mat4x2 in a vertex shader should fail.
>+float += mat4x2 in a fragment shader should fail.
>+mat4x2 += mat3x4 in a vertex shader should fail.
>+mat4x2 += mat3x4 in a fragment shader should fail.
>+mat4x2 += float in a vertex shader should succeed.
>+mat4x2 += float in a fragment shader should succeed.
>+mat4x2 += mat4x2 in a vertex shader should succeed.
>+mat4x2 += mat4x2 in a fragment shader should succeed.
>+float += mat4x3 in a vertex shader should fail.
>+float += mat4x3 in a fragment shader should fail.
>+mat4x3 += mat4x2 in a vertex shader should fail.
>+mat4x3 += mat4x2 in a fragment shader should fail.
>+mat4x3 += float in a vertex shader should succeed.
>+mat4x3 += float in a fragment shader should succeed.
>+mat4x3 += mat4x3 in a vertex shader should succeed.
>+mat4x3 += mat4x3 in a fragment shader should succeed.
>+int += ivec2 in a vertex shader should fail.
>+int += ivec2 in a fragment shader should fail.
>+ivec2 += int in a vertex shader should succeed.
>+ivec2 += int in a fragment shader should succeed.
>+ivec2 += ivec2 in a vertex shader should succeed.
>+ivec2 += ivec2 in a fragment shader should succeed.
>+int += ivec3 in a vertex shader should fail.
>+int += ivec3 in a fragment shader should fail.
>+ivec3 += ivec2 in a vertex shader should fail.
>+ivec3 += ivec2 in a fragment shader should fail.
>+ivec3 += int in a vertex shader should succeed.
>+ivec3 += int in a fragment shader should succeed.
>+ivec3 += ivec3 in a vertex shader should succeed.
>+ivec3 += ivec3 in a fragment shader should succeed.
>+int += ivec4 in a vertex shader should fail.
>+int += ivec4 in a fragment shader should fail.
>+ivec4 += ivec3 in a vertex shader should fail.
>+ivec4 += ivec3 in a fragment shader should fail.
>+ivec4 += int in a vertex shader should succeed.
>+ivec4 += int in a fragment shader should succeed.
>+ivec4 += ivec4 in a vertex shader should succeed.
>+ivec4 += ivec4 in a fragment shader should succeed.
>+float -= vec2 in a vertex shader should fail.
>+float -= vec2 in a fragment shader should fail.
>+vec2 -= float in a vertex shader should succeed.
>+vec2 -= float in a fragment shader should succeed.
>+vec2 -= vec2 in a vertex shader should succeed.
>+vec2 -= vec2 in a fragment shader should succeed.
>+float -= vec3 in a vertex shader should fail.
>+float -= vec3 in a fragment shader should fail.
>+vec3 -= vec2 in a vertex shader should fail.
>+vec3 -= vec2 in a fragment shader should fail.
>+vec3 -= float in a vertex shader should succeed.
>+vec3 -= float in a fragment shader should succeed.
>+vec3 -= vec3 in a vertex shader should succeed.
>+vec3 -= vec3 in a fragment shader should succeed.
>+float -= vec4 in a vertex shader should fail.
>+float -= vec4 in a fragment shader should fail.
>+vec4 -= vec3 in a vertex shader should fail.
>+vec4 -= vec3 in a fragment shader should fail.
>+vec4 -= float in a vertex shader should succeed.
>+vec4 -= float in a fragment shader should succeed.
>+vec4 -= vec4 in a vertex shader should succeed.
>+vec4 -= vec4 in a fragment shader should succeed.
>+float -= mat2x2 in a vertex shader should fail.
>+float -= mat2x2 in a fragment shader should fail.
>+mat2x2 -= vec4 in a vertex shader should fail.
>+mat2x2 -= vec4 in a fragment shader should fail.
>+mat2x2 -= float in a vertex shader should succeed.
>+mat2x2 -= float in a fragment shader should succeed.
>+mat2x2 -= mat2x2 in a vertex shader should succeed.
>+mat2x2 -= mat2x2 in a fragment shader should succeed.
>+float -= mat3x3 in a vertex shader should fail.
>+float -= mat3x3 in a fragment shader should fail.
>+mat3x3 -= mat2x2 in a vertex shader should fail.
>+mat3x3 -= mat2x2 in a fragment shader should fail.
>+mat3x3 -= float in a vertex shader should succeed.
>+mat3x3 -= float in a fragment shader should succeed.
>+mat3x3 -= mat3x3 in a vertex shader should succeed.
>+mat3x3 -= mat3x3 in a fragment shader should succeed.
>+float -= mat4x4 in a vertex shader should fail.
>+float -= mat4x4 in a fragment shader should fail.
>+mat4x4 -= mat3x3 in a vertex shader should fail.
>+mat4x4 -= mat3x3 in a fragment shader should fail.
>+mat4x4 -= float in a vertex shader should succeed.
>+mat4x4 -= float in a fragment shader should succeed.
>+mat4x4 -= mat4x4 in a vertex shader should succeed.
>+mat4x4 -= mat4x4 in a fragment shader should succeed.
>+float -= mat2x3 in a vertex shader should fail.
>+float -= mat2x3 in a fragment shader should fail.
>+mat2x3 -= mat4x4 in a vertex shader should fail.
>+mat2x3 -= mat4x4 in a fragment shader should fail.
>+mat2x3 -= float in a vertex shader should succeed.
>+mat2x3 -= float in a fragment shader should succeed.
>+mat2x3 -= mat2x3 in a vertex shader should succeed.
>+mat2x3 -= mat2x3 in a fragment shader should succeed.
>+float -= mat2x4 in a vertex shader should fail.
>+float -= mat2x4 in a fragment shader should fail.
>+mat2x4 -= mat2x3 in a vertex shader should fail.
>+mat2x4 -= mat2x3 in a fragment shader should fail.
>+mat2x4 -= float in a vertex shader should succeed.
>+mat2x4 -= float in a fragment shader should succeed.
>+mat2x4 -= mat2x4 in a vertex shader should succeed.
>+mat2x4 -= mat2x4 in a fragment shader should succeed.
>+float -= mat3x2 in a vertex shader should fail.
>+float -= mat3x2 in a fragment shader should fail.
>+mat3x2 -= mat2x4 in a vertex shader should fail.
>+mat3x2 -= mat2x4 in a fragment shader should fail.
>+mat3x2 -= float in a vertex shader should succeed.
>+mat3x2 -= float in a fragment shader should succeed.
>+mat3x2 -= mat3x2 in a vertex shader should succeed.
>+mat3x2 -= mat3x2 in a fragment shader should succeed.
>+float -= mat3x4 in a vertex shader should fail.
>+float -= mat3x4 in a fragment shader should fail.
>+mat3x4 -= mat3x2 in a vertex shader should fail.
>+mat3x4 -= mat3x2 in a fragment shader should fail.
>+mat3x4 -= float in a vertex shader should succeed.
>+mat3x4 -= float in a fragment shader should succeed.
>+mat3x4 -= mat3x4 in a vertex shader should succeed.
>+mat3x4 -= mat3x4 in a fragment shader should succeed.
>+float -= mat4x2 in a vertex shader should fail.
>+float -= mat4x2 in a fragment shader should fail.
>+mat4x2 -= mat3x4 in a vertex shader should fail.
>+mat4x2 -= mat3x4 in a fragment shader should fail.
>+mat4x2 -= float in a vertex shader should succeed.
>+mat4x2 -= float in a fragment shader should succeed.
>+mat4x2 -= mat4x2 in a vertex shader should succeed.
>+mat4x2 -= mat4x2 in a fragment shader should succeed.
>+float -= mat4x3 in a vertex shader should fail.
>+float -= mat4x3 in a fragment shader should fail.
>+mat4x3 -= mat4x2 in a vertex shader should fail.
>+mat4x3 -= mat4x2 in a fragment shader should fail.
>+mat4x3 -= float in a vertex shader should succeed.
>+mat4x3 -= float in a fragment shader should succeed.
>+mat4x3 -= mat4x3 in a vertex shader should succeed.
>+mat4x3 -= mat4x3 in a fragment shader should succeed.
>+int -= ivec2 in a vertex shader should fail.
>+int -= ivec2 in a fragment shader should fail.
>+ivec2 -= int in a vertex shader should succeed.
>+ivec2 -= int in a fragment shader should succeed.
>+ivec2 -= ivec2 in a vertex shader should succeed.
>+ivec2 -= ivec2 in a fragment shader should succeed.
>+int -= ivec3 in a vertex shader should fail.
>+int -= ivec3 in a fragment shader should fail.
>+ivec3 -= ivec2 in a vertex shader should fail.
>+ivec3 -= ivec2 in a fragment shader should fail.
>+ivec3 -= int in a vertex shader should succeed.
>+ivec3 -= int in a fragment shader should succeed.
>+ivec3 -= ivec3 in a vertex shader should succeed.
>+ivec3 -= ivec3 in a fragment shader should succeed.
>+int -= ivec4 in a vertex shader should fail.
>+int -= ivec4 in a fragment shader should fail.
>+ivec4 -= ivec3 in a vertex shader should fail.
>+ivec4 -= ivec3 in a fragment shader should fail.
>+ivec4 -= int in a vertex shader should succeed.
>+ivec4 -= int in a fragment shader should succeed.
>+ivec4 -= ivec4 in a vertex shader should succeed.
>+ivec4 -= ivec4 in a fragment shader should succeed.
>+float *= vec2 in a vertex shader should fail.
>+float *= vec2 in a fragment shader should fail.
>+vec2 *= float in a vertex shader should succeed.
>+vec2 *= float in a fragment shader should succeed.
>+vec2 *= mat2 in a vertex shader should succeed.
>+vec2 *= mat2 in a fragment shader should succeed.
>+vec2 *= vec2 in a vertex shader should succeed.
>+vec2 *= vec2 in a fragment shader should succeed.
>+float *= vec3 in a vertex shader should fail.
>+float *= vec3 in a fragment shader should fail.
>+vec3 *= vec2 in a vertex shader should fail.
>+vec3 *= vec2 in a fragment shader should fail.
>+vec3 *= float in a vertex shader should succeed.
>+vec3 *= float in a fragment shader should succeed.
>+vec3 *= mat3 in a vertex shader should succeed.
>+vec3 *= mat3 in a fragment shader should succeed.
>+vec3 *= vec3 in a vertex shader should succeed.
>+vec3 *= vec3 in a fragment shader should succeed.
>+float *= vec4 in a vertex shader should fail.
>+float *= vec4 in a fragment shader should fail.
>+vec4 *= vec3 in a vertex shader should fail.
>+vec4 *= vec3 in a fragment shader should fail.
>+vec4 *= float in a vertex shader should succeed.
>+vec4 *= float in a fragment shader should succeed.
>+vec4 *= mat4 in a vertex shader should succeed.
>+vec4 *= mat4 in a fragment shader should succeed.
>+vec4 *= vec4 in a vertex shader should succeed.
>+vec4 *= vec4 in a fragment shader should succeed.
>+float *= mat2x2 in a vertex shader should fail.
>+float *= mat2x2 in a fragment shader should fail.
>+mat2x2 *= vec4 in a vertex shader should fail.
>+mat2x2 *= vec4 in a fragment shader should fail.
>+mat2x2 *= float in a vertex shader should succeed.
>+mat2x2 *= float in a fragment shader should succeed.
>+mat2x2 *= mat2x2 in a vertex shader should succeed.
>+mat2x2 *= mat2x2 in a fragment shader should succeed.
>+float *= mat3x3 in a vertex shader should fail.
>+float *= mat3x3 in a fragment shader should fail.
>+mat3x3 *= mat2x2 in a vertex shader should fail.
>+mat3x3 *= mat2x2 in a fragment shader should fail.
>+mat3x3 *= float in a vertex shader should succeed.
>+mat3x3 *= float in a fragment shader should succeed.
>+mat3x3 *= mat3x3 in a vertex shader should succeed.
>+mat3x3 *= mat3x3 in a fragment shader should succeed.
>+float *= mat4x4 in a vertex shader should fail.
>+float *= mat4x4 in a fragment shader should fail.
>+mat4x4 *= mat3x3 in a vertex shader should fail.
>+mat4x4 *= mat3x3 in a fragment shader should fail.
>+mat4x4 *= float in a vertex shader should succeed.
>+mat4x4 *= float in a fragment shader should succeed.
>+mat4x4 *= mat4x4 in a vertex shader should succeed.
>+mat4x4 *= mat4x4 in a fragment shader should succeed.
>+float *= mat2x3 in a vertex shader should fail.
>+float *= mat2x3 in a fragment shader should fail.
>+mat2x3 *= mat4x4 in a vertex shader should fail.
>+mat2x3 *= mat4x4 in a fragment shader should fail.
>+mat2x3 *= float in a vertex shader should succeed.
>+mat2x3 *= float in a fragment shader should succeed.
>+mat2x3 *= mat2x3 in a vertex shader should fail.
>+mat2x3 *= mat2x3 in a fragment shader should fail.
>+mat2x3 *= mat2 in a vertex shader should succeed.
>+mat2x3 *= mat2 in a fragment shader should succeed.
>+float *= mat2x4 in a vertex shader should fail.
>+float *= mat2x4 in a fragment shader should fail.
>+mat2x4 *= mat2x3 in a vertex shader should fail.
>+mat2x4 *= mat2x3 in a fragment shader should fail.
>+mat2x4 *= float in a vertex shader should succeed.
>+mat2x4 *= float in a fragment shader should succeed.
>+mat2x4 *= mat2x4 in a vertex shader should fail.
>+mat2x4 *= mat2x4 in a fragment shader should fail.
>+mat2x4 *= mat2 in a vertex shader should succeed.
>+mat2x4 *= mat2 in a fragment shader should succeed.
>+float *= mat3x2 in a vertex shader should fail.
>+float *= mat3x2 in a fragment shader should fail.
>+mat3x2 *= mat2x4 in a vertex shader should fail.
>+mat3x2 *= mat2x4 in a fragment shader should fail.
>+mat3x2 *= float in a vertex shader should succeed.
>+mat3x2 *= float in a fragment shader should succeed.
>+mat3x2 *= mat3x2 in a vertex shader should fail.
>+mat3x2 *= mat3x2 in a fragment shader should fail.
>+mat3x2 *= mat3 in a vertex shader should succeed.
>+mat3x2 *= mat3 in a fragment shader should succeed.
>+float *= mat3x4 in a vertex shader should fail.
>+float *= mat3x4 in a fragment shader should fail.
>+mat3x4 *= mat3x2 in a vertex shader should fail.
>+mat3x4 *= mat3x2 in a fragment shader should fail.
>+mat3x4 *= float in a vertex shader should succeed.
>+mat3x4 *= float in a fragment shader should succeed.
>+mat3x4 *= mat3x4 in a vertex shader should fail.
>+mat3x4 *= mat3x4 in a fragment shader should fail.
>+mat3x4 *= mat3 in a vertex shader should succeed.
>+mat3x4 *= mat3 in a fragment shader should succeed.
>+float *= mat4x2 in a vertex shader should fail.
>+float *= mat4x2 in a fragment shader should fail.
>+mat4x2 *= mat3x4 in a vertex shader should fail.
>+mat4x2 *= mat3x4 in a fragment shader should fail.
>+mat4x2 *= float in a vertex shader should succeed.
>+mat4x2 *= float in a fragment shader should succeed.
>+mat4x2 *= mat4x2 in a vertex shader should fail.
>+mat4x2 *= mat4x2 in a fragment shader should fail.
>+mat4x2 *= mat4 in a vertex shader should succeed.
>+mat4x2 *= mat4 in a fragment shader should succeed.
>+float *= mat4x3 in a vertex shader should fail.
>+float *= mat4x3 in a fragment shader should fail.
>+mat4x3 *= mat4x2 in a vertex shader should fail.
>+mat4x3 *= mat4x2 in a fragment shader should fail.
>+mat4x3 *= float in a vertex shader should succeed.
>+mat4x3 *= float in a fragment shader should succeed.
>+mat4x3 *= mat4x3 in a vertex shader should fail.
>+mat4x3 *= mat4x3 in a fragment shader should fail.
>+mat4x3 *= mat4 in a vertex shader should succeed.
>+mat4x3 *= mat4 in a fragment shader should succeed.
>+int *= ivec2 in a vertex shader should fail.
>+int *= ivec2 in a fragment shader should fail.
>+ivec2 *= int in a vertex shader should succeed.
>+ivec2 *= int in a fragment shader should succeed.
>+ivec2 *= ivec2 in a vertex shader should succeed.
>+ivec2 *= ivec2 in a fragment shader should succeed.
>+int *= ivec3 in a vertex shader should fail.
>+int *= ivec3 in a fragment shader should fail.
>+ivec3 *= ivec2 in a vertex shader should fail.
>+ivec3 *= ivec2 in a fragment shader should fail.
>+ivec3 *= int in a vertex shader should succeed.
>+ivec3 *= int in a fragment shader should succeed.
>+ivec3 *= ivec3 in a vertex shader should succeed.
>+ivec3 *= ivec3 in a fragment shader should succeed.
>+int *= ivec4 in a vertex shader should fail.
>+int *= ivec4 in a fragment shader should fail.
>+ivec4 *= ivec3 in a vertex shader should fail.
>+ivec4 *= ivec3 in a fragment shader should fail.
>+ivec4 *= int in a vertex shader should succeed.
>+ivec4 *= int in a fragment shader should succeed.
>+ivec4 *= ivec4 in a vertex shader should succeed.
>+ivec4 *= ivec4 in a fragment shader should succeed.
>+float /= vec2 in a vertex shader should fail.
>+float /= vec2 in a fragment shader should fail.
>+vec2 /= float in a vertex shader should succeed.
>+vec2 /= float in a fragment shader should succeed.
>+vec2 /= vec2 in a vertex shader should succeed.
>+vec2 /= vec2 in a fragment shader should succeed.
>+float /= vec3 in a vertex shader should fail.
>+float /= vec3 in a fragment shader should fail.
>+vec3 /= vec2 in a vertex shader should fail.
>+vec3 /= vec2 in a fragment shader should fail.
>+vec3 /= float in a vertex shader should succeed.
>+vec3 /= float in a fragment shader should succeed.
>+vec3 /= vec3 in a vertex shader should succeed.
>+vec3 /= vec3 in a fragment shader should succeed.
>+float /= vec4 in a vertex shader should fail.
>+float /= vec4 in a fragment shader should fail.
>+vec4 /= vec3 in a vertex shader should fail.
>+vec4 /= vec3 in a fragment shader should fail.
>+vec4 /= float in a vertex shader should succeed.
>+vec4 /= float in a fragment shader should succeed.
>+vec4 /= vec4 in a vertex shader should succeed.
>+vec4 /= vec4 in a fragment shader should succeed.
>+float /= mat2x2 in a vertex shader should fail.
>+float /= mat2x2 in a fragment shader should fail.
>+mat2x2 /= vec4 in a vertex shader should fail.
>+mat2x2 /= vec4 in a fragment shader should fail.
>+mat2x2 /= float in a vertex shader should succeed.
>+mat2x2 /= float in a fragment shader should succeed.
>+mat2x2 /= mat2x2 in a vertex shader should succeed.
>+mat2x2 /= mat2x2 in a fragment shader should succeed.
>+float /= mat3x3 in a vertex shader should fail.
>+float /= mat3x3 in a fragment shader should fail.
>+mat3x3 /= mat2x2 in a vertex shader should fail.
>+mat3x3 /= mat2x2 in a fragment shader should fail.
>+mat3x3 /= float in a vertex shader should succeed.
>+mat3x3 /= float in a fragment shader should succeed.
>+mat3x3 /= mat3x3 in a vertex shader should succeed.
>+mat3x3 /= mat3x3 in a fragment shader should succeed.
>+float /= mat4x4 in a vertex shader should fail.
>+float /= mat4x4 in a fragment shader should fail.
>+mat4x4 /= mat3x3 in a vertex shader should fail.
>+mat4x4 /= mat3x3 in a fragment shader should fail.
>+mat4x4 /= float in a vertex shader should succeed.
>+mat4x4 /= float in a fragment shader should succeed.
>+mat4x4 /= mat4x4 in a vertex shader should succeed.
>+mat4x4 /= mat4x4 in a fragment shader should succeed.
>+float /= mat2x3 in a vertex shader should fail.
>+float /= mat2x3 in a fragment shader should fail.
>+mat2x3 /= mat4x4 in a vertex shader should fail.
>+mat2x3 /= mat4x4 in a fragment shader should fail.
>+mat2x3 /= float in a vertex shader should succeed.
>+mat2x3 /= float in a fragment shader should succeed.
>+mat2x3 /= mat2x3 in a vertex shader should succeed.
>+mat2x3 /= mat2x3 in a fragment shader should succeed.
>+float /= mat2x4 in a vertex shader should fail.
>+float /= mat2x4 in a fragment shader should fail.
>+mat2x4 /= mat2x3 in a vertex shader should fail.
>+mat2x4 /= mat2x3 in a fragment shader should fail.
>+mat2x4 /= float in a vertex shader should succeed.
>+mat2x4 /= float in a fragment shader should succeed.
>+mat2x4 /= mat2x4 in a vertex shader should succeed.
>+mat2x4 /= mat2x4 in a fragment shader should succeed.
>+float /= mat3x2 in a vertex shader should fail.
>+float /= mat3x2 in a fragment shader should fail.
>+mat3x2 /= mat2x4 in a vertex shader should fail.
>+mat3x2 /= mat2x4 in a fragment shader should fail.
>+mat3x2 /= float in a vertex shader should succeed.
>+mat3x2 /= float in a fragment shader should succeed.
>+mat3x2 /= mat3x2 in a vertex shader should succeed.
>+mat3x2 /= mat3x2 in a fragment shader should succeed.
>+float /= mat3x4 in a vertex shader should fail.
>+float /= mat3x4 in a fragment shader should fail.
>+mat3x4 /= mat3x2 in a vertex shader should fail.
>+mat3x4 /= mat3x2 in a fragment shader should fail.
>+mat3x4 /= float in a vertex shader should succeed.
>+mat3x4 /= float in a fragment shader should succeed.
>+mat3x4 /= mat3x4 in a vertex shader should succeed.
>+mat3x4 /= mat3x4 in a fragment shader should succeed.
>+float /= mat4x2 in a vertex shader should fail.
>+float /= mat4x2 in a fragment shader should fail.
>+mat4x2 /= mat3x4 in a vertex shader should fail.
>+mat4x2 /= mat3x4 in a fragment shader should fail.
>+mat4x2 /= float in a vertex shader should succeed.
>+mat4x2 /= float in a fragment shader should succeed.
>+mat4x2 /= mat4x2 in a vertex shader should succeed.
>+mat4x2 /= mat4x2 in a fragment shader should succeed.
>+float /= mat4x3 in a vertex shader should fail.
>+float /= mat4x3 in a fragment shader should fail.
>+mat4x3 /= mat4x2 in a vertex shader should fail.
>+mat4x3 /= mat4x2 in a fragment shader should fail.
>+mat4x3 /= float in a vertex shader should succeed.
>+mat4x3 /= float in a fragment shader should succeed.
>+mat4x3 /= mat4x3 in a vertex shader should succeed.
>+mat4x3 /= mat4x3 in a fragment shader should succeed.
>+int /= ivec2 in a vertex shader should fail.
>+int /= ivec2 in a fragment shader should fail.
>+ivec2 /= int in a vertex shader should succeed.
>+ivec2 /= int in a fragment shader should succeed.
>+ivec2 /= ivec2 in a vertex shader should succeed.
>+ivec2 /= ivec2 in a fragment shader should succeed.
>+int /= ivec3 in a vertex shader should fail.
>+int /= ivec3 in a fragment shader should fail.
>+ivec3 /= ivec2 in a vertex shader should fail.
>+ivec3 /= ivec2 in a fragment shader should fail.
>+ivec3 /= int in a vertex shader should succeed.
>+ivec3 /= int in a fragment shader should succeed.
>+ivec3 /= ivec3 in a vertex shader should succeed.
>+ivec3 /= ivec3 in a fragment shader should succeed.
>+int /= ivec4 in a vertex shader should fail.
>+int /= ivec4 in a fragment shader should fail.
>+ivec4 /= ivec3 in a vertex shader should fail.
>+ivec4 /= ivec3 in a fragment shader should fail.
>+ivec4 /= int in a vertex shader should succeed.
>+ivec4 /= int in a fragment shader should succeed.
>+ivec4 /= ivec4 in a vertex shader should succeed.
>+ivec4 /= ivec4 in a fragment shader should succeed.
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/const-array-init-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/const-array-init-expected.txt
>index a0e726e52300e395cfc75bcc2bcfa89684ba9195..6bfba1860f4b59fffa90fa73572eb174b806b18d 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/const-array-init-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/const-array-init-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/const-array-init.html
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>index 8f9539aaebb385c14dbcb32df5968a978cdf6662..6e78d5e8638a811d2d2d45ea2df3f9de491b315b 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>@@ -1,5 +1,12 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/forbidden-operators.html
>+Using ternary operators with arrays is not allowed
>+Using ternary operators with structs containing arrays is not allowed
>+Using ternary operators with void is not allowed
>+Using sequence operators with arrays is not allowed
>+Using sequence operators with structs containing arrays is not allowed
>+Using sequence operators with void is not allowed
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/frag-depth-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/frag-depth-expected.txt
>index 73617105bc6c36dd9bbd409048b44fe671dacc65..433e874a6ae1c2bc6f0dfdca9df04f4e9355134c 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/frag-depth-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/frag-depth-expected.txt
>@@ -1,5 +1,12 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/frag-depth.html
>+WebGL context exists
>+gl_FragDepth disallowed in ESSL1 shader
>+gl_FragDepth allowed in ESSL3 shader
>+gl_FragDepthEXT disallowed in ESSL3 shader
>+should be 255,255,255,255
>+should be 255,0,0,255
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>index ac2f3bae2f855a25a42f02b4142f76498f9c8600..c0f62059c61c6078c902bf72f88e5477b6994d0d 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/invalid-default-precision.html
>+default precision qualifier shouldn't work with vec2
>+default precision qualifier shouldn't work with void
>+default precision qualifier shouldn't work with uint
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>index 83864227e0705f5bcee167ca9d45876e7ba01dff..dc7fdb64dd43b1ba4ccfeb321575b1bebe16a82f 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/invalid-invariant.html
>+fragment shader with global invariant pragma must fail
>+fragment shader with an input variable which is invariant must fail
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/loops-with-side-effects-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/loops-with-side-effects-expected.txt
>index de6a5006b5b101d33b7b9476bd626644447074d1..a97d402f71ca599878e2539354d65b883cdb6a0d 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/loops-with-side-effects-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/loops-with-side-effects-expected.txt
>@@ -1,5 +1,15 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/loops-with-side-effects.html
>+WebGL context exists
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+should be 255,255,0,255
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>index 8a2f466bbf0a1dac0a51dd7c010939a05390df12..d353853632936d140581b157dc7bdada9ef247ba 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/misplaced-version-directive.html
>+Vertex shader with a newline before the version directive should fail.
>+Vertex shader with a comment before the version directive should fail.
>+Fragment shader with a comment before the version directive should fail.
>+Fragment shader with a newline before the version directive should fail.
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader-expected.txt
>index dfb68963b486d7c99bd9c4a2d217c2df30b82833..e745df5abafd7d4b6d25c6174cb493076b0b9476 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader-expected.txt
>@@ -1,5 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/no-attribute-vertex-shader.html
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>index 60a7e899814cd1a5ed1ea0d80c908032f16544bc..df1e3a4d1e3029919d15721b3be953b5ba656061 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>@@ -1,5 +1,32 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/sampler-no-precision.html
>+Vertex shader with a sampler3D uniform with no precision qualifier should not compile
>+Fragment shader with a sampler3D uniform with no precision qualifier should not compile
>+Vertex shader with a samplerCubeShadow uniform with no precision qualifier should not compile
>+Fragment shader with a samplerCubeShadow uniform with no precision qualifier should not compile
>+Vertex shader with a sampler2DShadow uniform with no precision qualifier should not compile
>+Fragment shader with a sampler2DShadow uniform with no precision qualifier should not compile
>+Vertex shader with a sampler2DArray uniform with no precision qualifier should not compile
>+Fragment shader with a sampler2DArray uniform with no precision qualifier should not compile
>+Vertex shader with a sampler2DArrayShadow uniform with no precision qualifier should not compile
>+Fragment shader with a sampler2DArrayShadow uniform with no precision qualifier should not compile
>+Vertex shader with a isampler2D uniform with no precision qualifier should not compile
>+Fragment shader with a isampler2D uniform with no precision qualifier should not compile
>+Vertex shader with a isampler3D uniform with no precision qualifier should not compile
>+Fragment shader with a isampler3D uniform with no precision qualifier should not compile
>+Vertex shader with a isamplerCube uniform with no precision qualifier should not compile
>+Fragment shader with a isamplerCube uniform with no precision qualifier should not compile
>+Vertex shader with a isampler2DArray uniform with no precision qualifier should not compile
>+Fragment shader with a isampler2DArray uniform with no precision qualifier should not compile
>+Vertex shader with a usampler2D uniform with no precision qualifier should not compile
>+Fragment shader with a usampler2D uniform with no precision qualifier should not compile
>+Vertex shader with a usampler3D uniform with no precision qualifier should not compile
>+Fragment shader with a usampler3D uniform with no precision qualifier should not compile
>+Vertex shader with a usamplerCube uniform with no precision qualifier should not compile
>+Fragment shader with a usamplerCube uniform with no precision qualifier should not compile
>+Vertex shader with a usampler2DArray uniform with no precision qualifier should not compile
>+Fragment shader with a usampler2DArray uniform with no precision qualifier should not compile
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>index f43dc64a5c7d000dfd8dce95280af402c8ac0bc4..62e221996adb6fa941eb5f727f897a16a16108ce 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/sequence-operator-returns-non-constant.html
>+Sequence operator cannot return a constant expression
>+Sequence operator return value cannot be used as an array size
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>index a0962d8599ba8e42e0598c4c6a34811d628da602..0cfcca333159ad15b276560934f69b59b0795bf9 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>@@ -1,9 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-linking.html
>-[unexpected link status] OpenGL ES Shading Language 3.00 vertex shader should not link with OpenGL ES Shading Language 1.00 fragment shader.
>-[unexpected link status] OpenGL ES Shading Language 1.00 vertex shader should not link with OpenGL ES Shading Language 3.00 fragment shader.
>-2 failures reported
>-2 passes reported
>+OpenGL ES Shading Language 3.00 vertex shader should link with OpenGL ES Shading Language 3.00 fragment shader.
>+[ FAIL: 2 ] [unexpected link status] OpenGL ES Shading Language 3.00 vertex shader should not link with OpenGL ES Shading Language 1.00 fragment shader.
>+[ FAIL: 3 ] [unexpected link status] OpenGL ES Shading Language 1.00 vertex shader should not link with OpenGL ES Shading Language 3.00 fragment shader.
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>index 2648d2b279e9bc7665837c93fa9ee3012d45e2d6..d3716209e9055fec178bac4c1d1211cf501daeeb 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>@@ -1,9 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1024-character-define.html
>-[unexpected vertex shader compile status] (expected: true) vertex shader that uses 1024 character token in #define should succeed
>-[link failed] vertex shader that uses 1024 character token in #define should succeed
>-2 failures reported
>-1 passes reported
>+[ FAIL: 1 ] [unexpected vertex shader compile status] (expected: true) vertex shader that uses 1024 character token in #define should succeed
>+[ FAIL: 2 ] [link failed] vertex shader that uses 1024 character token in #define should succeed
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>index b4cf54661707ac9a6df7fca562250ccf75baa7aa..2a4d761233176f534102b103b484c661f30cf584 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>@@ -1,12 +1,11 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1024-character-identifier.frag.html
>-[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier should succeed
>-[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that starts with underscore should succeed
>-[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that ends with underscore should succeed
>-[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with odd characters as underscores should succeed
>-[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with even characters as underscores should succeed
>-5 failures reported
>-1 passes reported
>+[ FAIL: 1 ] [unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier should succeed
>+[ FAIL: 2 ] [unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that starts with underscore should succeed
>+[ FAIL: 3 ] [unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that ends with underscore should succeed
>+[ FAIL: 4 ] [unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with odd characters as underscores should succeed
>+[ FAIL: 5 ] [unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with even characters as underscores should succeed
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-define-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-define-expected.txt
>index 26e3c270693c8997d15b50dae172ce661a070e38..35890137d593168043b68e5637aec1379160c2be 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-define-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-define-expected.txt
>@@ -1,5 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1025-character-define.html
>+vertex shader that uses 1025 character token in #define should fail
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-identifier.frag-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-identifier.frag-expected.txt
>index b56daa32c417d3abf5c21eaaa9fd7d7b0d3f0f1c..f74f66fb2777be89690965d7f13877fab33dda0e 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-identifier.frag-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1025-character-identifier.frag-expected.txt
>@@ -1,5 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1025-character-identifier.frag.html
>+shader that uses 1025 character identifier should fail
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>index b291b4b1b12a692a1c487d3e8327880ad4ddb9b9..17d43081cd5b2e81f383d2c617b3642235c480a4 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>@@ -1,9 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-invalid-characters.html
>-[unexpected vertex shader compile status] (expected: true) vertex shader that uses backlash character in comments should succeed
>-[link failed] vertex shader that uses backlash character in comments should succeed
>-2 failures reported
>-1 passes reported
>+[ FAIL: 1 ] [unexpected vertex shader compile status] (expected: true) vertex shader that uses backlash character in comments should succeed
>+[ FAIL: 2 ] [link failed] vertex shader that uses backlash character in comments should succeed
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>index 7b9dc544ed3aa26bb54378f04341fc71bb4153b9..0a626730897f535ab5ad26d256223faa25ab0055 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>@@ -1,8 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-mis-matching-uniform-block.html
>-[unexpected link status] Shaders with precision mis-matching uniform blocks should fail
>-1 failures reported
>-1 passes reported
>+[ FAIL: 1 ] [unexpected link status] Shaders with precision mis-matching uniform blocks should fail
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/short-circuiting-in-loop-condition-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/short-circuiting-in-loop-condition-expected.txt
>index 496d8e857243e2c5c98c01435467bbc6a0ed34f9..22fd54ecb434e872d09216b4cc099d52604fa0a9 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/short-circuiting-in-loop-condition-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/short-circuiting-in-loop-condition-expected.txt
>@@ -1,5 +1,16 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/short-circuiting-in-loop-condition.html
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>index 0620f70be862b635e6f761c2a52fc105e041acf5..9374140d2276a4e158d965f1be1cd470eb5fb2cd 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>@@ -1,5 +1,11 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/texture-offset-out-of-range.html
>+Minimum in-range texture offset should compile
>+Maximum in-range texture offset should compile
>+Texture offset below minimum valid value should not compile
>+Texture offset above maximum valid value should not compile
>+Dynamic texture offset should not compile
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>index ad4dc495700f82cf220e6229816c1b28d93f27ea..f46f58d98c3a3801f5761c0bb12dfa564618fd84 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>@@ -1,5 +1,13 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/texture-offset-uniform-texture-coordinate.html
>+textureOffset with uniform texture coordinates should not crash
>+textureLodOffset with uniform texture coordinates should not crash
>+textureGradOffset with uniform texture coordinates should not crash
>+textureProjOffset with uniform texture coordinates should not crash
>+textureProjLodOffset with uniform texture coordinates should not crash
>+textureProjGradOffset with uniform texture coordinates should not crash
>+texelFetchOffset with uniform texture coordinates should not crash
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions-expected.txt
>index 9a723a6b6edf8315a527b33645ef47c5a8a54a51..8f3ba43ecfb1884d62f374674f6608b4f78d70db 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions-expected.txt
>@@ -1,5 +1,50 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/tricky-loop-conditions.html
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>index f8ca505ec85c31f86c665069f27189163f96665a..f1caf192bbbacbfb5d0fa9844f83852b148f3912 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>@@ -1,10 +1,12 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html
>-square should be green at (138, 0) expected: 0,255,0,255 was 255,0,0,255
>-square should be green at (414, 0) expected: 0,255,0,255 was 255,0,0,255
>-square should be green at (690, 0) expected: 0,255,0,255 was 255,0,0,255
>-3 failures reported
>-4 passes reported
>+square should be green
>+[ FAIL: 2 ] square should be green at (138, 0) expected: 0,255,0,255 was 255,0,0,255
>+square should be green
>+[ FAIL: 4 ] square should be green at (414, 0) expected: 0,255,0,255 was 255,0,0,255
>+square should be green
>+[ FAIL: 6 ] square should be green at (690, 0) expected: 0,255,0,255 was 255,0,0,255
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>index a5fbe844179113cfe94604292e4fcdf1a5eddab2..80c18fb4950095e418861361375da786b8ffab5d 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>@@ -1,5 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-block-layout-match.html
>+A uniform block's layout defaults to std140 if not specified.
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>index a93e2a9af3eec52e8ca85843c0d7b47e15129b7d..6482888497c1f019c8cae7fac3ac7c87e1f28c8c 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-block-layouts.html
>+Packed uniform buffers are disallowed
>+Shared uniform buffers are disallowed
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>index ea06e29d9f1230f552d78664acbbd4cdf546a6e8..3bd14953cfe96d1262eb223ce161d7bfd5076fd6 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>@@ -1,9 +1,13 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-location-length-limits.html
>-uniformLoc should be non-null. Was null
>-getError expected: NO_ERROR. Was INVALID_VALUE :
>-2 failures reported
>-6 passes reported
>+gl.getProgramParameter(program, gl.LINK_STATUS) is true
>+[ FAIL: 2 ] uniformLoc should be non-null. Was null
>+[ FAIL: 3 ] getError expected: NO_ERROR. Was INVALID_VALUE :
>+getError was expected value: NO_ERROR :
>+gl.getProgramParameter(program, gl.LINK_STATUS) is true
>+getError was expected value: INVALID_VALUE :
>+uniformLoc is null
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>index a1cf1e485301335fbd74501614dde8a6fc3fc2b5..46b7bda669b4f8480bd2c7d1f49ee3f4ad9fc4c8 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>@@ -1,10 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/valid-invariant.html
>-[unexpected link status] vertex shader with invariant varying and fragment shader with variant varying must succeed
>-[unexpected link status] vertex shader with invariant (global setting) varying and fragment shader with variant varying must succeed
>-[unexpected link status] vertex shader with invariant (separately set) varying and fragment shader with variant varying must succeed
>-3 failures reported
>-1 passes reported
>+[ FAIL: 1 ] [unexpected link status] vertex shader with invariant varying and fragment shader with variant varying must succeed
>+[ FAIL: 2 ] [unexpected link status] vertex shader with invariant (global setting) varying and fragment shader with variant varying must succeed
>+[ FAIL: 3 ] [unexpected link status] vertex shader with invariant (separately set) varying and fragment shader with variant varying must succeed
>+successfullyParsed is true
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-expected.txt
>index 4372fc34fee4e87e141ae90d10b29040d3900104..2baf82bd59e3191334987d1985512add55974def 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-expected.txt
>@@ -1,5 +1,20 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/vector-dynamic-indexing.html
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug-expected.txt
>index a2a0b5e143d2d69b959adaeda7f2c0c3cc538a8f..77588ee7bbe1504b7f956818c5130b603e1abf58 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug-expected.txt
>@@ -1,5 +1,7 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug.html
>+should be green
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/vertex_arrays/vertex-array-object-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/vertex_arrays/vertex-array-object-expected.txt
>index 0bfb693537f49c8fadddf12e7c79723671404093..161486ac3dea7fdfb1fc24db7f9317780e29a092 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/vertex_arrays/vertex-array-object-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/vertex_arrays/vertex-array-object-expected.txt
>@@ -1,5 +1,40 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/vertex_arrays/vertex-array-object.html
>+WebGL context exists
>+gl.VERTEX_ARRAY_BINDING is 0x85B5
>+getError was expected value: NO_ERROR : VERTEX_ARRAY_BINDING query should succeed
>+Default value of VERTEX_ARRAY_BINDING is null
>+gl.getParameter(gl.VERTEX_ARRAY_BINDING) is null
>+gl.getParameter(gl.VERTEX_ARRAY_BINDING) is expected VAO
>+gl.getParameter(gl.VERTEX_ARRAY_BINDING) is expected VAO
>+gl.getParameter(gl.VERTEX_ARRAY_BINDING) is null
>+getError was expected value: INVALID_OPERATION : binding a deleted vertex array object
>+gl.getParameter(gl.VERTEX_ARRAY_BINDING) is null
>+getError was expected value: NO_ERROR : createVertexArray should not set an error
>+vao is non-null.
>+gl.isVertexArray(vao) is false
>+gl.isVertexArray(vao) is true
>+gl.isVertexArray(vao) is true
>+gl.isVertexArray(null) is false
>+All attributes preserved across bindings
>+Vertex attribute values are not attached to bindings
>+Draw 0 passed pixel test
>+Draw 1 passed pixel test
>+Draw 2 passed pixel test
>+should be green
>+should be green
>+should be 255,0,0,255
>+should be 0,255,0,255
>+should be 0,0,255,255
>+should be 0,255,255,255
>+getError was expected value: INVALID_OPERATION : Draw call should fail.
>+getError was expected value: NO_ERROR : Draw call should not fail.
>+getError was expected value: NO_ERROR : Draw call should not fail.
>+getError was expected value: NO_ERROR : Draw call should not fail.
>+should be red
>+should be green
>+getError was expected value: NO_ERROR : there should be no errors
>+successfullyParsed is true
> PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js b/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>index 714a06acd11994c90dfdc5bc5e6a1fb4cb6f20bb..2d4fa0b80c7bdcf6cfeefdfd76bc8c6012e35d05 100644
>--- a/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>+++ b/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>@@ -1,7 +1,8 @@
> "use strict";
> (function() {
>-  var numSuccesses = 0;
>   var numFailures = 0;
>+  var resultsList = null;
>+  var resultNum = 1;
> 
>   if (window.testRunner && !window.layoutTestController) {
>     window.layoutTestController = window.testRunner;
>@@ -22,6 +23,21 @@
>     window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
>   }
> 
>+  var list = function(msg, color) {
>+    if (!resultsList) {
>+      resultsList = document.createElement("ol");
>+      document.getElementById("result").appendChild(resultsList);
>+    }
>+
>+    var item = document.createElement("li");
>+    item.appendChild(document.createTextNode(msg));
>+    if (color) {
>+      item.style.color = color;
>+    }
>+
>+    resultsList.appendChild(item);
>+  }
>+
>   var log = function(msg, color) {
>     var div = document.createElement("div");
>     div.appendChild(document.createTextNode(msg));
>@@ -34,20 +50,18 @@
>   window.webglTestHarness = {
>     reportResults: function(url, success, msg) {
>       if (success) {
>-        ++numSuccesses;
>+        list(msg, "green");
>       } else {
>-        log(msg, "red");
>+        list("[ FAIL: " + resultNum + " ] " + msg, "red");
>         ++numFailures;
>       }
>+
>+      ++resultNum;
>     },
> 
>     notifyFinished: function(url) {
>       var iframe = document.getElementById("iframe");
>       if (numFailures > 0) {
>-        if (numSuccesses > 0) {
>-          log(numFailures + " failures reported", "red");
>-          log(numSuccesses + " passes reported", "green");
>-        }
>         log("FAIL", "red");
>       } else {
>         log("PASS", "green");

Actions: View | Formatted Diff | Diff

Attachments on bug 188825: 347717