<!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>[210163] releases/WebKitGTK/webkit-2.14/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/210163">210163</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-27 03:52:11 -0800 (Tue, 27 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208136">r208136</a> - -Wpragmas warning spam from angleutils.h
https://bugs.webkit.org/show_bug.cgi?id=164207
Reviewed by Darin Adler.
Use #pragma clang instead of #pragma GCC since all of the warnings we need to suppress are
Clang-specific warnings. GCC ignores unknown pragmas and does not warn, but it does warn if
any GCC pragma is invalid.
Note that this might still be broken for MSVCC, as MSVCC warns when it sees unknown pragmas.
* changes.diff:
* src/common/angleutils.cpp:
(FormatString):
* src/common/angleutils.h:
(MakeStaticString):
* src/common/debug.cpp:
* src/common/mathutil.cpp:
* src/libANGLE/Caps.cpp:
(gl::TextureCapsMap::get):
(gl::GetExtensionInfoMap):
* src/libANGLE/Device.cpp:
(egl::GetDeviceSet):
* src/libANGLE/Display.cpp:
(egl::Display::getClientExtensionString):
* src/libANGLE/formatutils.cpp:
(gl::GetInternalFormatMap):
(gl::GetAllSizedInternalFormats):
* src/libANGLE/validationES3.cpp:
(gl::IsValidES3CopyTexImageCombination):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEChangeLog">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEchangesdiff">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/changes.diff</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonangleutilscpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonangleutilsh">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommondebugcpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/debug.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonmathutilcpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/mathutil.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLECapscpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEDevicecpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEDisplaycpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEformatutilscpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEvalidationES3cpp">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-10-30 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ -Wpragmas warning spam from angleutils.h
+ https://bugs.webkit.org/show_bug.cgi?id=164207
+
+ Reviewed by Darin Adler.
+
+ Use #pragma clang instead of #pragma GCC since all of the warnings we need to suppress are
+ Clang-specific warnings. GCC ignores unknown pragmas and does not warn, but it does warn if
+ any GCC pragma is invalid.
+
+ Note that this might still be broken for MSVCC, as MSVCC warns when it sees unknown pragmas.
+
+ * changes.diff:
+ * src/common/angleutils.cpp:
+ (FormatString):
+ * src/common/angleutils.h:
+ (MakeStaticString):
+ * src/common/debug.cpp:
+ * src/common/mathutil.cpp:
+ * src/libANGLE/Caps.cpp:
+ (gl::TextureCapsMap::get):
+ (gl::GetExtensionInfoMap):
+ * src/libANGLE/Device.cpp:
+ (egl::GetDeviceSet):
+ * src/libANGLE/Display.cpp:
+ (egl::Display::getClientExtensionString):
+ * src/libANGLE/formatutils.cpp:
+ (gl::GetInternalFormatMap):
+ (gl::GetAllSizedInternalFormats):
+ * src/libANGLE/validationES3.cpp:
+ (gl::IsValidES3CopyTexImageCombination):
+
</ins><span class="cx"> 2016-10-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Another build fix.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEchangesdiff"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/changes.diff (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/changes.diff 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/changes.diff 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx">
</span><span class="cx"> std::string FormatString(const char *fmt, va_list vararg)
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::vector<char> buffer(512);
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> size_t len = FormatStringIntoVector(fmt, vararg, buffer);
</span><span class="cx"> return std::string(&buffer[0], len);
</span><span class="lines">@@ -150,10 +150,10 @@
</span><span class="cx">
</span><span class="cx"> inline const char* MakeStaticString(const std::string &str)
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::set<std::string> strings;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> std::set<std::string>::iterator it = strings.find(str);
</span><span class="cx"> if (it != strings.end())
</span><span class="cx"> {
</span><span class="lines">@@ -165,10 +165,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (DebugAnnotationsActive())
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::vector<char> buffer(512);
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> size_t len = FormatStringIntoVector(format, vararg, buffer);
</span><span class="cx"> std::wstring formattedWideMessage(buffer.begin(), buffer.begin() + len);
</span><span class="cx">
</span><span class="lines">@@ -180,12 +180,12 @@
</span><span class="cx"> // Emax is the maximum allowed biased exponent value (31)
</span><span class="cx"> static const int g_sharedexp_maxexponent = 31;
</span><span class="cx">
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wglobal-constructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wglobal-constructors"
</ins><span class="cx"> static const float g_sharedexp_max = ((pow(2.0f, g_sharedexp_mantissabits) - 1) /
</span><span class="cx"> pow(2.0f, g_sharedexp_mantissabits)) *
</span><span class="cx"> pow(2.0f, g_sharedexp_maxexponent - g_sharedexp_bias);
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
</span><span class="cx"> {
</span><span class="lines">@@ -394,10 +394,10 @@
</span><span class="cx">
</span><span class="cx"> const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static TextureCaps defaultUnsupportedTexture;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> InternalFormatToCapsMap::const_iterator iter = mCapsMap.find(internalFormat);
</span><span class="cx"> return (iter != mCapsMap.end()) ? iter->second : defaultUnsupportedTexture;
</span><span class="cx"> }
</span><span class="lines">@@ -405,10 +405,10 @@
</span><span class="cx"> return map;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const ExtensionInfoMap extensionInfo = buildExtensionInfoMap();
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return extensionInfo;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -420,10 +420,10 @@
</span><span class="cx"> typedef std::set<egl::Device *> DeviceSet;
</span><span class="cx"> static DeviceSet *GetDeviceSet()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static DeviceSet devices;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return &devices;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -435,10 +435,10 @@
</span><span class="cx"> // associated with it.
</span><span class="cx"> static WindowSurfaceMap *GetWindowSurfaces()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static WindowSurfaceMap windowSurfaces;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return &windowSurfaces;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,10 +445,10 @@
</span><span class="cx"> typedef std::map<EGLNativeDisplayType, Display *> ANGLEPlatformDisplayMap;
</span><span class="cx"> static ANGLEPlatformDisplayMap *GetANGLEPlatformDisplayMap()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static ANGLEPlatformDisplayMap displays;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return &displays;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -455,10 +455,10 @@
</span><span class="cx"> typedef std::map<Device *, Display *> DevicePlatformDisplayMap;
</span><span class="cx"> static DevicePlatformDisplayMap *GetDevicePlatformDisplayMap()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static DevicePlatformDisplayMap displays;
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return &displays;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -466,10 +466,10 @@
</span><span class="cx">
</span><span class="cx"> const std::string &Display::getClientExtensionString()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const std::string clientExtensionsString = GenerateExtensionsString(getClientExtensions());
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return clientExtensionsString;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -514,10 +514,10 @@
</span><span class="cx">
</span><span class="cx"> static const InternalFormatInfoMap &GetInternalFormatMap()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const InternalFormatInfoMap formatMap = BuildInternalFormatInfoMap();
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return formatMap;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -525,10 +525,10 @@
</span><span class="cx">
</span><span class="cx"> const FormatSet &GetAllSizedInternalFormats()
</span><span class="cx"> {
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static FormatSet formatSet = BuildAllSizedInternalFormatSet();
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> return formatSet;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -551,10 +551,10 @@
</span><span class="cx"> const auto &textureFormatInfo = *textureFormat.info;
</span><span class="cx"> const auto &framebufferFormatInfo = *framebufferFormat.info;
</span><span class="cx">
</span><del>-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const CopyConversionSet conversionSet = BuildValidES3CopyTexImageCombinations();
</span><del>-+#pragma GCC diagnostic pop
</del><ins>++#pragma clang diagnostic pop
</ins><span class="cx"> if (conversionSet.find(CopyConversion(textureFormatInfo.format,
</span><span class="cx"> framebufferFormatInfo.format)) != conversionSet.end())
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonangleutilscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -36,10 +36,10 @@
</span><span class="cx">
</span><span class="cx"> std::string FormatString(const char *fmt, va_list vararg)
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::vector<char> buffer(512);
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> size_t len = FormatStringIntoVector(fmt, vararg, buffer);
</span><span class="cx"> return std::string(&buffer[0], len);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonangleutilsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.h (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.h 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.h 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -116,10 +116,10 @@
</span><span class="cx">
</span><span class="cx"> inline const char* MakeStaticString(const std::string &str)
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::set<std::string> strings;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> std::set<std::string>::iterator it = strings.find(str);
</span><span class="cx"> if (it != strings.end())
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommondebugcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/debug.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/debug.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/debug.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (DebugAnnotationsActive())
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static std::vector<char> buffer(512);
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> size_t len = FormatStringIntoVector(format, vararg, buffer);
</span><span class="cx"> std::wstring formattedWideMessage(buffer.begin(), buffer.begin() + len);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrccommonmathutilcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/mathutil.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/mathutil.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/mathutil.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> // Emax is the maximum allowed biased exponent value (31)
</span><span class="cx"> static const int g_sharedexp_maxexponent = 31;
</span><span class="cx">
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wglobal-constructors"
</ins><span class="cx"> static const float g_sharedexp_max = ((pow(2.0f, g_sharedexp_mantissabits) - 1) /
</span><span class="cx"> pow(2.0f, g_sharedexp_mantissabits)) *
</span><span class="cx"> pow(2.0f, g_sharedexp_maxexponent - g_sharedexp_bias);
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLECapscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -77,10 +77,10 @@
</span><span class="cx">
</span><span class="cx"> const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static TextureCaps defaultUnsupportedTexture;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> InternalFormatToCapsMap::const_iterator iter = mCapsMap.find(internalFormat);
</span><span class="cx"> return (iter != mCapsMap.end()) ? iter->second : defaultUnsupportedTexture;
</span><span class="cx"> }
</span><span class="lines">@@ -597,10 +597,10 @@
</span><span class="cx"> return map;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const ExtensionInfoMap extensionInfo = buildExtensionInfoMap();
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return extensionInfo;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEDevicecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> typedef std::set<egl::Device *> DeviceSet;
</span><span class="cx"> static DeviceSet *GetDeviceSet()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static DeviceSet devices;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return &devices;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEDisplaycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -90,10 +90,10 @@
</span><span class="cx"> // associated with it.
</span><span class="cx"> static WindowSurfaceMap *GetWindowSurfaces()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static WindowSurfaceMap windowSurfaces;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return &windowSurfaces;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -100,10 +100,10 @@
</span><span class="cx"> typedef std::map<EGLNativeDisplayType, Display *> ANGLEPlatformDisplayMap;
</span><span class="cx"> static ANGLEPlatformDisplayMap *GetANGLEPlatformDisplayMap()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static ANGLEPlatformDisplayMap displays;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return &displays;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,10 +110,10 @@
</span><span class="cx"> typedef std::map<Device *, Display *> DevicePlatformDisplayMap;
</span><span class="cx"> static DevicePlatformDisplayMap *GetDevicePlatformDisplayMap()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static DevicePlatformDisplayMap displays;
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return &displays;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -930,10 +930,10 @@
</span><span class="cx">
</span><span class="cx"> const std::string &Display::getClientExtensionString()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const std::string clientExtensionsString = GenerateExtensionsString(getClientExtensions());
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return clientExtensionsString;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEformatutilscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -615,10 +615,10 @@
</span><span class="cx">
</span><span class="cx"> static const InternalFormatInfoMap &GetInternalFormatMap()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const InternalFormatInfoMap formatMap = BuildInternalFormatInfoMap();
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return formatMap;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -862,10 +862,10 @@
</span><span class="cx">
</span><span class="cx"> const FormatSet &GetAllSizedInternalFormats()
</span><span class="cx"> {
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static FormatSet formatSet = BuildAllSizedInternalFormatSet();
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return formatSet;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEsrclibANGLEvalidationES3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp (210162 => 210163)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp 2016-12-27 11:52:02 UTC (rev 210162)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp 2016-12-27 11:52:11 UTC (rev 210163)
</span><span class="lines">@@ -524,10 +524,10 @@
</span><span class="cx"> const auto &textureFormatInfo = *textureFormat.info;
</span><span class="cx"> const auto &framebufferFormatInfo = *framebufferFormat.info;
</span><span class="cx">
</span><del>-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
</ins><span class="cx"> static const CopyConversionSet conversionSet = BuildValidES3CopyTexImageCombinations();
</span><del>-#pragma GCC diagnostic pop
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> if (conversionSet.find(CopyConversion(textureFormatInfo.format,
</span><span class="cx"> framebufferFormatInfo.format)) != conversionSet.end())
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>