Changeset 284849 in webkit

Timestamp:

Oct 25, 2021, 4:41:45 PM (5 years ago)

Author:

Kyle Piddington

Message:

REGRESSION (iOS 15), safari604.1: Could not link the shader program
​https://bugs.webkit.org/show_bug.cgi?id=231475

Renaming regex incorrectly substituted an attribute.
Update to require exact attribute match

Source/ThirdParty/ANGLE:

Reviewed by Dean Jackson

• src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm:

(rx::mtl::updateShaderAttributes):

LayoutTests:

Add test to expose bug, verify test passes

Reviewed by Dean Jackson.

• fast/canvas/webgl/attrib-name-aliasing-bug-expected.txt: Added.
• fast/canvas/webgl/attrib-name-aliasing-bug.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/attrib-name-aliasing-bug-expected.txt (added)
• LayoutTests/fast/canvas/webgl/attrib-name-aliasing-bug.html (added)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-25  Kyle Piddington  <kpiddington@apple.com>
+
+        REGRESSION (iOS 15), safari604.1: Could not link the shader program
+        https://bugs.webkit.org/show_bug.cgi?id=231475
+
+        Renaming regex incorrectly substituted an attribute. 
+        Update to require exact attribute match
+
+        Add test to expose bug, verify test passes
+
+        Reviewed by Dean Jackson.
+
+        * fast/canvas/webgl/attrib-name-aliasing-bug-expected.txt: Added.
+        * fast/canvas/webgl/attrib-name-aliasing-bug.html: Added.
+
 2021-10-25  John Wilander  <wilander@apple.com>
 

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-10-25  Kyle Piddington  <kpiddington@apple.com>
+
+        REGRESSION (iOS 15), safari604.1: Could not link the shader program
+        https://bugs.webkit.org/show_bug.cgi?id=231475
+
+        Renaming regex incorrectly substituted an attribute. 
+        Update to require exact attribute match
+
+        Reviewed by Dean Jackson
+
+        * src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm:
+        (rx::mtl::updateShaderAttributes):
+
 2021-10-15  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm

@@ -172 +172 @@
             {
                 stream.str("");
-                stream << attribute.name << "_" << std::to_string(i) << sh::kUnassignedAttributeString;
-                attributeBindings.insert({std::string(stream.str()), i+attribute.location});
+                stream << " " << kUserDefinedNamePrefix << attribute.name << "_" << std::to_string(i)
+                                       << sh::kUnassignedAttributeString;
+                attributeBindings.insert({std::string(stream.str()), i + attribute.location});
             }
         }
@@ -179 +180 @@
         {
             stream.str("");
-            stream << attribute.name << sh::kUnassignedAttributeString;
-            attributeBindings.insert({std::string(stream.str()),attribute.location});
+            stream << " " << kUserDefinedNamePrefix << attribute.name << sh::kUnassignedAttributeString;
+            attributeBindings.insert({std::string(stream.str()), attribute.location});
         }
     }