Attachment 442210 Details for Bug 231475 – Patch

[patch] Patch

bug-231475-20211022160650.patch (text/plain), 2.37 KB, created by Kyle Piddington on 2021-10-22 16:06:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Piddington

Created: 2021-10-22 16:06:51 PDT

Size: 2.37 KB

patch

obsolete

>Subversion Revision: 284693
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index 7af3e2f7e3aeaa3c8fbdb0bb3096f0f9dc5a2f4f..3fc791f8355d27877b6736dc2b01500949695dd0 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,15 @@
>+2021-10-22  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 substituded an attribute. 
>+	Update to require exact attribute match
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm:
>+        (rx::mtl::updateShaderAttributes):
>+
> 2021-10-15  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         Realize Mac CMake build of WebCore and WebKit
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm
>index 3e79b2063b242294c4f74cd4187030cf00c64099..550b1e2e0a485918ee24ef6c5f55297ff9fb9fc3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm
>@@ -171,15 +171,16 @@ std::string updateShaderAttributes(std::string shaderSourceIn, const gl::Program
>             for(int i = 0; i < regs; i++)
>             {
>                 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});
>             }
>         }
>         else
>         {
>             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});
>         }
>     }
>     //Rewrite attributes

Actions: View | Formatted Diff | Diff

Attachments on bug 231475: 442210 | 442218 | 442417 | 442435