Title: [195228] releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE
Revision
195228
Author
[email protected]
Date
2016-01-18 05:54:13 -0800 (Mon, 18 Jan 2016)

Log Message

Merge r194780 - [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.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/ChangeLog (195227 => 195228)


--- releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/ChangeLog	2016-01-18 13:40:01 UTC (rev 195227)
+++ releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/ChangeLog	2016-01-18 13:54:13 UTC (rev 195228)
@@ -1,3 +1,25 @@
+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-08-11  Brent Fulgham  <[email protected]>
 
         [Win] Switch Windows build to Visual Studio 2015

Modified: releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp (195227 => 195228)


--- releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp	2016-01-18 13:40:01 UTC (rev 195227)
+++ releases/WebKitGTK/webkit-2.10/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp	2016-01-18 13:54:13 UTC (rev 195228)
@@ -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

Reply via email to