Title: [225404] trunk/Source/ThirdParty/ANGLE
- Revision
- 225404
- Author
- [email protected]
- Date
- 2017-12-01 12:25:02 -0800 (Fri, 01 Dec 2017)
Log Message
Unreviewed, fix -Wunknown-pragmas warnings.
https://bugs.webkit.org/show_bug.cgi?id=180177
It seems GCC has started to warn about unrecognized Clang pragmas. Oh well.
This is not sent upstream, because the Clang pragmas appear to be downstream WebKit
additions. changes.diff is not updated, because it was not updated in yesterday's ANGLE
update.
* include/GLSLANG/ShaderVars.h:
* src/libANGLE/Platform.cpp:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (225403 => 225404)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-12-01 19:45:41 UTC (rev 225403)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-12-01 20:25:02 UTC (rev 225404)
@@ -1,3 +1,17 @@
+2017-12-01 Michael Catanzaro <[email protected]>
+
+ Unreviewed, fix -Wunknown-pragmas warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=180177
+
+ It seems GCC has started to warn about unrecognized Clang pragmas. Oh well.
+
+ This is not sent upstream, because the Clang pragmas appear to be downstream WebKit
+ additions. changes.diff is not updated, because it was not updated in yesterday's ANGLE
+ update.
+
+ * include/GLSLANG/ShaderVars.h:
+ * src/libANGLE/Platform.cpp:
+
2017-11-30 Alex Christensen <[email protected]>
Speculative WinCairo fix.
Modified: trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h (225403 => 225404)
--- trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h 2017-12-01 19:45:41 UTC (rev 225403)
+++ trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h 2017-12-01 20:25:02 UTC (rev 225404)
@@ -281,13 +281,17 @@
{
// Must have a trivial default constructor since it is used in YYSTYPE.
WorkGroupSize() = default;
+#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-braces"
+#endif
explicit constexpr WorkGroupSize(int initialSize)
: localSizeQualifiers{initialSize, initialSize, initialSize}
{
}
+#if defined(__clang__)
#pragma clang diagnostic pop
+#endif
void fill(int fillValue);
void setLocalSize(int localSizeX, int localSizeY, int localSizeZ);
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp (225403 => 225404)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp 2017-12-01 19:45:41 UTC (rev 225403)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp 2017-12-01 20:25:02 UTC (rev 225404)
@@ -15,10 +15,14 @@
namespace
{
// TODO(jmadill): Make methods owned by egl::Display.
+#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
angle::PlatformMethods g_platformMethods;
+#if defined(__clang__)
#pragma clang diagnostic pop
+#endif
} // anonymous namespace
angle::PlatformMethods::PlatformMethods()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
