<!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>[194914] branches/safari-601.1.46-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/194914">194914</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 11:31:40 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194780">r194780</a>. rdar://problem/24042915</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceThirdPartyANGLEChangeLog">branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceThirdPartyANGLEsrccompilertranslatorTypescpp">branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/ChangeLog (194913 => 194914)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/ChangeLog 2016-01-12 19:31:38 UTC (rev 194913)
+++ branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/ChangeLog 2016-01-12 19:31:40 UTC (rev 194914)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r194780. rdar://problem/24042915
+
+ 2016-01-08 Brent Fulgham <bfulgham@apple.com>
+
+ [ANGLE] Correct UNREACHABLE runtime assertion for void constructors
+ https://bugs.webkit.org/show_bug.cgi?id=152900
+ <rdar://problem/24107501>
+
+ Reviewed by Alex Christensen.
+
+ Tested by Khronos WebGL 1.0.4 suite.
+
+ Merge a small part of ANGLE upstream commit r284735:
+
+ commit 01971113492d9aca386f2bca021b1f4b134fc277
+ author Dmitry Skiba <dskiba@google.com> Fri Jul 10 18:54:00 2015
+ committer Jamie Madill <jmadill@chromium.org> Fri Jul 10 19:03:34 2015
+ tree 47e42eac00f7d64cddb14b3cc21a4e605c189d20
+
+ This issue was found by <https://www.khronos.org/registry/webgl/sdk/tests/conformance/glsl/bugs/angle-constructor-invalid-parameters.html?webglVersion=1&quiet=0>
+
+ * src/compiler/translator/Types.cpp:
+ (TType::buildMangledName): Don't assert with UNREACHABLE here.
+
</ins><span class="cx"> 2015-07-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Xcode] Update some build settings as recommended by Xcode 7
</span></span></pre></div>
<a id="branchessafari601146branchSourceThirdPartyANGLEsrccompilertranslatorTypescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp (194913 => 194914)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp 2016-01-12 19:31:38 UTC (rev 194913)
+++ branches/safari-601.1.46-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp 2016-01-12 19:31:40 UTC (rev 194914)
</span><span class="lines">@@ -142,7 +142,8 @@
</span><span class="cx"> mangledName += interfaceBlock->mangledName();
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- UNREACHABLE();
</del><ins>+ // EbtVoid, EbtAddress and non types
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isMatrix())
</span></span></pre>
</div>
</div>
</body>
</html>