Layout Test webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance.html is failing since ANGLE roll
https://bugs.webkit.org/show_bug.cgi?id=201784
<rdar://problem/55358159>
Reviewed by Antoine Quint.
This test needed updating.
* platform/ios/TestExpectations:
* webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 72a4c69..5e9793e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-09 Dean Jackson <dino@apple.com>
+
+ Layout Test webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance.html is failing since ANGLE roll
+ https://bugs.webkit.org/show_bug.cgi?id=201784
+ <rdar://problem/55358159>
+
+ Reviewed by Antoine Quint.
+
+ This test needed updating.
+
+ * platform/ios/TestExpectations:
+ * webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html:
+
2019-10-09 Alicia Boya García <aboya@igalia.com>
[GTK] Unreviewed test gardening
diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
index 2c50815..6ea0bc2 100644
--- a/LayoutTests/platform/ios/TestExpectations
+++ b/LayoutTests/platform/ios/TestExpectations
@@ -3351,8 +3351,6 @@
webkit.org/b/201190 imported/w3c/web-platform-tests/service-workers/service-worker/registration-mime-types.https.html [ Pass Failure ]
-webkit.org/b/201784 webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
-
# <rdar://problem/54325542> quicklook/numbers-09.html is failing
quicklook/numbers-09.html [ Failure ]
diff --git a/LayoutTests/webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance-expected.txt b/LayoutTests/webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance-expected.txt
index e31c18e..4c71463 100644
--- a/LayoutTests/webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance-expected.txt
+++ b/LayoutTests/webgl/2.0.0/conformance/glsl/misc/shaders-with-invariance-expected.txt
@@ -17,8 +17,8 @@
[ 14: PASS ] vertex shader with invariant gl_PointSize and fragment shader with variant gl_PointCoord must succeed
[ 15: PASS ] fragment shader with variant gl_FrontFacing must succeed compilation
[ 16: PASS ] fragment shader with invariant gl_FrontFacing must fail compilation
-[ 17: FAIL ] [unexpected fragment shader compile status] (expected: true) vertex shader with variant varying and fragment shader with invariant (global setting) varying must fail
-[ 18: FAIL ] [unexpected fragment shader compile status] (expected: true) vertex shader with invariant varying and fragment shader with invariant (global setting) varying must succeed
+[ 17: FAIL ] [unexpected fragment shader compile status] (expected: true) vertex shader with variant varying and fragment shader with invariant (global setting) varying must succeed
+[ 18: FAIL ] [unexpected fragment shader compile status] (expected: true) vertex shader with invariant varying and fragment shader with invariant (global setting) varying must fail
[ 19: PASS ] successfullyParsed is true
[ FAIL ] 7 failures reported
diff --git a/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html b/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html
index b7e5edf..205d78c 100644
--- a/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html
+++ b/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/glsl/misc/shaders-with-invariance.html
@@ -1,28 +1,7 @@
<!--
-
-/*
-** Copyright (c) 2014 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
+Copyright (c) 2019 The Khronos Group Inc.
+Use of this source code is governed by an MIT-style license that can be
+found in the LICENSE.txt file.
-->
<!DOCTYPE html>
@@ -333,16 +312,16 @@
vShaderSuccess: true,
fShaderId: "fragmentShaderGlobalInvariant",
fShaderSuccess: true,
- linkSuccess: false,
- passMsg: "vertex shader with variant varying and fragment shader with invariant (global setting) varying must fail",
+ linkSuccess: true,
+ passMsg: "vertex shader with variant varying and fragment shader with invariant (global setting) varying must succeed",
},
{
vShaderId: "vertexShaderInvariant",
vShaderSuccess: true,
fShaderId: "fragmentShaderGlobalInvariant",
fShaderSuccess: true,
- linkSuccess: true,
- passMsg: "vertex shader with invariant varying and fragment shader with invariant (global setting) varying must succeed",
+ linkSuccess: false,
+ passMsg: "vertex shader with invariant varying and fragment shader with invariant (global setting) varying must fail",
}
];
