<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277681] branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277681">277681</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-05-18 15:06:38 -0700 (Tue, 18 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/277661">r277661</a>. rdar://problem/78175007

    Stop compiling ANGLE metal files twice
    https://bugs.webkit.org/show_bug.cgi?id=225919
    <rdar://78013511>

    Reviewed by Dean Jackson.

    ANGLE currently generates an unused default.metallib that conflicts with other default.metallibs being built.
    Since it is unused, remove it.
    What we currently do is put all the source bytes into gDefaultMetallibSrc and compile it at runtime.
    This could be optimized to do it at compile time and use newLibraryWithData instead of newLibraryWithSource,
    but that should be done separately.

    * ANGLE.xcodeproj/project.pbxproj:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277661 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121151branchSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj">branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6121151branchSourceThirdPartyANGLEChangeLog">branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121151branchSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (277680 => 277681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj        2021-05-18 21:30:48 UTC (rev 277680)
+++ branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj   2021-05-18 22:06:38 UTC (rev 277681)
</span><span class="lines">@@ -834,12 +834,6 @@
</span><span class="cx">          DF83E39A2639FED4000825EF /* ContextImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB304AC1DE4164800D2C405 /* ContextImpl.cpp */; };
</span><span class="cx">          DF83E39B2639FED4000825EF /* QueryImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD597D2284FB8F0018F2D8 /* QueryImpl.cpp */; };
</span><span class="cx">          DF83E39C2639FED4000825EF /* renderer_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB304CD1DE4164800D2C405 /* renderer_utils.cpp */; };
</span><del>-               DF83E39D2639FEF6000825EF /* visibility.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEAB25818D6800894E24 /* visibility.metal */; };
-               DF83E39E2639FEFD000825EF /* gen_mipmap.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEB225818D6800894E24 /* gen_mipmap.metal */; };
-               DF83E39F2639FF02000825EF /* gen_indices.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEB325818D6800894E24 /* gen_indices.metal */; };
-               DF83E3A02639FF06000825EF /* copy_buffer.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEAF25818D6800894E24 /* copy_buffer.metal */; };
-               DF83E3A12639FF0B000825EF /* clear.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEB125818D6800894E24 /* clear.metal */; };
-               DF83E3A22639FF11000825EF /* blit.metal in Sources */ = {isa = PBXBuildFile; fileRef = FF81FEAA25818D6800894E24 /* blit.metal */; };
</del><span class="cx">           FF2D2F5525C8B14A002FB699 /* FixTypeConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = FF2D2F5225C8B14A002FB699 /* FixTypeConstructors.h */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx"> 
</span><span class="lines">@@ -3652,7 +3646,6 @@
</span><span class="cx">                          DF83E2372639FCD5000825EF /* AstHelpers.cpp in Sources */,
</span><span class="cx">                          DF83E2AF2639FD83000825EF /* ASTMetadataHLSL.cpp in Sources */,
</span><span class="cx">                          DF83E3332639FE18000825EF /* AttributeMap.cpp in Sources */,
</span><del>-                               DF83E3A22639FF11000825EF /* blit.metal in Sources */,
</del><span class="cx">                           DF83E3592639FE92000825EF /* BlitGL.cpp in Sources */,
</span><span class="cx">                          DF83E2EA2639FE17000825EF /* BlobCache.cpp in Sources */,
</span><span class="cx">                          DF83E2BC2639FD83000825EF /* blocklayout.cpp in Sources */,
</span><span class="lines">@@ -3670,7 +3663,6 @@
</span><span class="cx">                          DF83E32C2639FE18000825EF /* Caps.cpp in Sources */,
</span><span class="cx">                          DF83E2892639FD33000825EF /* ClampFragDepth.cpp in Sources */,
</span><span class="cx">                          DF83E2672639FD33000825EF /* ClampPointSize.cpp in Sources */,
</span><del>-                               DF83E3A12639FF0B000825EF /* clear.metal in Sources */,
</del><span class="cx">                           DF83E35C2639FE92000825EF /* ClearMultiviewGL.cpp in Sources */,
</span><span class="cx">                          DF83E2CB2639FD84000825EF /* CodeGen.cpp in Sources */,
</span><span class="cx">                          DF83E2D62639FD84000825EF /* CollectVariables.cpp in Sources */,
</span><span class="lines">@@ -3689,7 +3681,6 @@
</span><span class="cx">                          DF83E3582639FE92000825EF /* ContextGL.cpp in Sources */,
</span><span class="cx">                          DF83E39A2639FED4000825EF /* ContextImpl.cpp in Sources */,
</span><span class="cx">                          DF83E3772639FEB8000825EF /* ContextMtl.mm in Sources */,
</span><del>-                               DF83E3A02639FF06000825EF /* copy_buffer.metal in Sources */,
</del><span class="cx">                           DF83E2DD2639FE17000825EF /* copyimage.cpp in Sources */,
</span><span class="cx">                          DF83E2F12639FE17000825EF /* Debug.cpp in Sources */,
</span><span class="cx">                          DF83E2172639FC74000825EF /* debug.cpp in Sources */,
</span><span class="lines">@@ -3766,8 +3757,6 @@
</span><span class="cx">                          DF83E2252639FC80000825EF /* FunctionsCGL.cpp in Sources */,
</span><span class="cx">                          DF83E34F2639FE92000825EF /* FunctionsEAGL.mm in Sources */,
</span><span class="cx">                          DF83E3572639FE92000825EF /* FunctionsGL.cpp in Sources */,
</span><del>-                               DF83E39F2639FF02000825EF /* gen_indices.metal in Sources */,
-                               DF83E39E2639FEFD000825EF /* gen_mipmap.metal in Sources */,
</del><span class="cx">                           DF83E2E82639FE17000825EF /* GLES1Renderer.cpp in Sources */,
</span><span class="cx">                          DF83E2ED2639FE17000825EF /* GLES1State.cpp in Sources */,
</span><span class="cx">                          DF83E3412639FE2A000825EF /* global_state.cpp in Sources */,
</span><span class="lines">@@ -4037,7 +4026,6 @@
</span><span class="cx">                          DF83E35F2639FE92000825EF /* VertexArrayGL.cpp in Sources */,
</span><span class="cx">                          DF83E3882639FEB8000825EF /* VertexArrayMtl.mm in Sources */,
</span><span class="cx">                          DF83E31C2639FE17000825EF /* VertexAttribute.cpp in Sources */,
</span><del>-                               DF83E39D2639FEF6000825EF /* visibility.metal in Sources */,
</del><span class="cx">                           DF83E3692639FE92000825EF /* WindowSurfaceCGL.mm in Sources */,
</span><span class="cx">                          DF83E3512639FE92000825EF /* WindowSurfaceEAGL.mm in Sources */,
</span><span class="cx">                          DF83E30C2639FE17000825EF /* WorkerThread.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6121151branchSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ChangeLog (277680 => 277681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ChangeLog      2021-05-18 21:30:48 UTC (rev 277680)
+++ branches/safari-612.1.15.1-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-05-18 22:06:38 UTC (rev 277681)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2021-05-18  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r277661. rdar://problem/78175007
+
+    Stop compiling ANGLE metal files twice
+    https://bugs.webkit.org/show_bug.cgi?id=225919
+    <rdar://78013511>
+    
+    Reviewed by Dean Jackson.
+    
+    ANGLE currently generates an unused default.metallib that conflicts with other default.metallibs being built.
+    Since it is unused, remove it.
+    What we currently do is put all the source bytes into gDefaultMetallibSrc and compile it at runtime.
+    This could be optimized to do it at compile time and use newLibraryWithData instead of newLibraryWithSource,
+    but that should be done separately.
+    
+    * ANGLE.xcodeproj/project.pbxproj:
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277661 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-18  Alex Christensen  <achristensen@webkit.org>
+
+            Stop compiling ANGLE metal files twice
+            https://bugs.webkit.org/show_bug.cgi?id=225919
+            <rdar://78013511>
+
+            Reviewed by Dean Jackson.
+
+            ANGLE currently generates an unused default.metallib that conflicts with other default.metallibs being built.
+            Since it is unused, remove it.
+            What we currently do is put all the source bytes into gDefaultMetallibSrc and compile it at runtime.
+            This could be optimized to do it at compile time and use newLibraryWithData instead of newLibraryWithSource,
+            but that should be done separately.
+
+            * ANGLE.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2021-05-12  Kyle Piddington  <kpiddington@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Angle METAL] Remove thread qualifiers and pass-by-reference qualifiers for cast functions
</span></span></pre>
</div>
</div>

</body>
</html>