Changeset 225584 in webkit

Timestamp:

Dec 6, 2017 11:43:31 AM (6 years ago)

Author:

dino@apple.com

Message:

Some iOS tests failing after ANGLE update
​https://bugs.webkit.org/show_bug.cgi?id=180487
<rdar://problem/35885969>

Reviewed by Antoine Quint.

Source/ThirdParty/ANGLE:

The iOS OpenGL compiler doesn't like function declarations with
nameless array parameters. See:
<rdar://problem/35885989> Nameless array parameters in function declaration cause compiler error

While that is being fixed, tell ANGLE's translator to not cull
the names from parameters. This is not a bug in ANGLE, so we won't
fix it upstream at the moment.

• src/compiler/translator/ParseContext.cpp:

(sh::TParseContext::addFunctionPrototypeDeclaration):

LayoutTests:

Unskip some WebGL tests.

• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios/TestExpectations (modified) (3 diffs)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-12-06  Dean Jackson  <dino@apple.com>
+
+        Some iOS tests failing after ANGLE update
+        https://bugs.webkit.org/show_bug.cgi?id=180487
+        <rdar://problem/35885969>
+
+        Reviewed by Antoine Quint.
+
+        Unskip some WebGL tests.
+
+        * platform/ios/TestExpectations:
+
 2017-12-06  John Wilander  <wilander@apple.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -2958 +2958 @@
 webgl/1.0.3/conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
 webgl/1.0.3/conformance/glsl/misc/shaders-with-name-conflicts.html [ Failure ]
-webgl/1.0.3/conformance/glsl/misc/struct-nesting-of-variable-names.html [ Failure ]
 webgl/1.0.3/conformance/renderbuffers/feedback-loop.html [ Failure ]
 webgl/1.0.3/conformance/rendering/point-no-attributes.html [ Failure ]
@@ -3081 +3080 @@
 
 # <rdar://problem/33135669>
-webgl/1.0.2/conformance/textures/gl-teximage.html [ Failure ]
 fast/canvas/webgl/gl-teximage.html [ Failure ]
 
@@ -3301 +3299 @@
 media/modern-media-controls/time-labels-support/elapsed-time.html [ Skip ]
 
-# Skip WebGL while the ANGLE update has caused many failures
-webgl [ Skip ]
-
 # Requries AVFoundation support <rdar://problem/34502208>
 http/tests/images/image-supports-video.html

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2017-12-06  Dean Jackson  <dino@apple.com>
+
+        Some iOS tests failing after ANGLE update
+        https://bugs.webkit.org/show_bug.cgi?id=180487
+        <rdar://problem/35885969>
+
+        Reviewed by Antoine Quint.
+
+        The iOS OpenGL compiler doesn't like function declarations with
+        nameless array parameters. See:
+        <rdar://problem/35885989> Nameless array parameters in function declaration cause compiler error
+
+        While that is being fixed, tell ANGLE's translator to not cull
+        the names from parameters. This is not a bug in ANGLE, so we won't
+        fix it upstream at the moment.
+
+        * src/compiler/translator/ParseContext.cpp:
+        (sh::TParseContext::addFunctionPrototypeDeclaration):
+
 2017-12-01  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp

@@ -3241 +3241 @@
     function->setHasPrototypeDeclaration();
 
+    // WebKit note: We currently pass true instead of false for the last parameter
+    // here because some compilers have an issue with nameless parameters in function
+    // declarations.
     TIntermFunctionPrototype *prototype =
-        createPrototypeNodeFromFunction(*function, location, false);
+        createPrototypeNodeFromFunction(*function, location, true);
 
     symbolTable.pop();