Title: [194949] branches/safari-601-branch/Source/ThirdParty/ANGLE
- Revision
- 194949
- Author
- [email protected]
- Date
- 2016-01-12 17:41:48 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r194780. rdar://problem/24043054
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/ThirdParty/ANGLE/ChangeLog (194948 => 194949)
--- branches/safari-601-branch/Source/ThirdParty/ANGLE/ChangeLog 2016-01-13 01:41:46 UTC (rev 194948)
+++ branches/safari-601-branch/Source/ThirdParty/ANGLE/ChangeLog 2016-01-13 01:41:48 UTC (rev 194949)
@@ -1,3 +1,29 @@
+2016-01-12 Matthew Hanson <[email protected]>
+
+ Merge r194780. rdar://problem/24043054
+
+ 2016-01-08 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]> Fri Jul 10 18:54:00 2015
+ committer Jamie Madill <[email protected]> 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.
+
2015-07-03 Dan Bernstein <[email protected]>
[Xcode] Update some build settings as recommended by Xcode 7
Modified: branches/safari-601-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp (194948 => 194949)
--- branches/safari-601-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp 2016-01-13 01:41:46 UTC (rev 194948)
+++ branches/safari-601-branch/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp 2016-01-13 01:41:48 UTC (rev 194949)
@@ -142,7 +142,8 @@
mangledName += interfaceBlock->mangledName();
break;
default:
- UNREACHABLE();
+ // EbtVoid, EbtAddress and non types
+ break;
}
if (isMatrix())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
