[webkit-changes] [210163] releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE

Tue, 27 Dec 2016 03:52:32 -0800

Title: [210163] releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE
Revision
210163
Author
[email protected]
Date
2016-12-27 03:52:11 -0800 (Tue, 27 Dec 2016)

Log Message

Merge r208136 - -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):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog (210162 => 210163)


--- 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)
@@ -1,3 +1,36 @@
+2016-10-30  Michael Catanzaro  <[email protected]>
+
+        -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):
+
 2016-10-28  Alex Christensen  <[email protected]>
 
         Another build fix.

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/changes.diff (210162 => 210163)


--- 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)
@@ -135,10 +135,10 @@
  
  std::string FormatString(const char *fmt, va_list vararg)
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static std::vector<char> buffer(512);
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
  
      size_t len = FormatStringIntoVector(fmt, vararg, buffer);
      return std::string(&buffer[0], len);
@@ -150,10 +150,10 @@
  
  inline const char* MakeStaticString(const std::string &str)
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static std::set<std::string> strings;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      std::set<std::string>::iterator it = strings.find(str);
      if (it != strings.end())
      {
@@ -165,10 +165,10 @@
  {
      if (DebugAnnotationsActive())
      {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
          static std::vector<char> buffer(512);
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
          size_t len = FormatStringIntoVector(format, vararg, buffer);
          std::wstring formattedWideMessage(buffer.begin(), buffer.begin() + len);
  
@@ -180,12 +180,12 @@
  // Emax is the maximum allowed biased exponent value (31)
  static const int g_sharedexp_maxexponent = 31;
  
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wglobal-constructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wglobal-constructors"
  static const float g_sharedexp_max = ((pow(2.0f, g_sharedexp_mantissabits) - 1) /
                                         pow(2.0f, g_sharedexp_mantissabits)) *
                                       pow(2.0f, g_sharedexp_maxexponent - g_sharedexp_bias);
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
  
  unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
  {
@@ -394,10 +394,10 @@
  
  const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static TextureCaps defaultUnsupportedTexture;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      InternalFormatToCapsMap::const_iterator iter = mCapsMap.find(internalFormat);
      return (iter != mCapsMap.end()) ? iter->second : defaultUnsupportedTexture;
  }
@@ -405,10 +405,10 @@
          return map;
      };
  
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static const ExtensionInfoMap extensionInfo = buildExtensionInfoMap();
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return extensionInfo;
  }
  
@@ -420,10 +420,10 @@
  typedef std::set<egl::Device *> DeviceSet;
  static DeviceSet *GetDeviceSet()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static DeviceSet devices;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return &devices;
  }
  
@@ -435,10 +435,10 @@
  // associated with it.
  static WindowSurfaceMap *GetWindowSurfaces()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static WindowSurfaceMap windowSurfaces;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return &windowSurfaces;
  }
  
@@ -445,10 +445,10 @@
  typedef std::map<EGLNativeDisplayType, Display *> ANGLEPlatformDisplayMap;
  static ANGLEPlatformDisplayMap *GetANGLEPlatformDisplayMap()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static ANGLEPlatformDisplayMap displays;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return &displays;
  }
  
@@ -455,10 +455,10 @@
  typedef std::map<Device *, Display *> DevicePlatformDisplayMap;
  static DevicePlatformDisplayMap *GetDevicePlatformDisplayMap()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static DevicePlatformDisplayMap displays;
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return &displays;
  }
  
@@ -466,10 +466,10 @@
  
  const std::string &Display::getClientExtensionString()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static const std::string clientExtensionsString = GenerateExtensionsString(getClientExtensions());
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return clientExtensionsString;
  }
  
@@ -514,10 +514,10 @@
  
  static const InternalFormatInfoMap &GetInternalFormatMap()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static const InternalFormatInfoMap formatMap = BuildInternalFormatInfoMap();
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return formatMap;
  }
  
@@ -525,10 +525,10 @@
  
  const FormatSet &GetAllSizedInternalFormats()
  {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static FormatSet formatSet = BuildAllSizedInternalFormatSet();
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      return formatSet;
  }
  
@@ -551,10 +551,10 @@
      const auto &textureFormatInfo     = *textureFormat.info;
      const auto &framebufferFormatInfo = *framebufferFormat.info;
  
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wexit-time-destructors"
      static const CopyConversionSet conversionSet = BuildValidES3CopyTexImageCombinations();
-+#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
      if (conversionSet.find(CopyConversion(textureFormatInfo.format,
                                            framebufferFormatInfo.format)) != conversionSet.end())
      {

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.cpp (210162 => 210163)


--- 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)
@@ -36,10 +36,10 @@
 
 std::string FormatString(const char *fmt, va_list vararg)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static std::vector<char> buffer(512);
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
     size_t len = FormatStringIntoVector(fmt, vararg, buffer);
     return std::string(&buffer[0], len);

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/angleutils.h (210162 => 210163)


--- 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)
@@ -116,10 +116,10 @@
 
 inline const char* MakeStaticString(const std::string &str)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static std::set<std::string> strings;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     std::set<std::string>::iterator it = strings.find(str);
     if (it != strings.end())
     {

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/debug.cpp (210162 => 210163)


--- 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)
@@ -69,10 +69,10 @@
 {
     if (DebugAnnotationsActive())
     {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
         static std::vector<char> buffer(512);
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
         size_t len = FormatStringIntoVector(format, vararg, buffer);
         std::wstring formattedWideMessage(buffer.begin(), buffer.begin() + len);

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/common/mathutil.cpp (210162 => 210163)


--- 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)
@@ -31,12 +31,12 @@
 // Emax is the maximum allowed biased exponent value (31)
 static const int g_sharedexp_maxexponent = 31;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wglobal-constructors"
 static const float g_sharedexp_max = ((pow(2.0f, g_sharedexp_mantissabits) - 1) /
                                        pow(2.0f, g_sharedexp_mantissabits)) *
                                      pow(2.0f, g_sharedexp_maxexponent - g_sharedexp_bias);
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
 {

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp (210162 => 210163)


--- 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)
@@ -77,10 +77,10 @@
 
 const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static TextureCaps defaultUnsupportedTexture;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     InternalFormatToCapsMap::const_iterator iter = mCapsMap.find(internalFormat);
     return (iter != mCapsMap.end()) ? iter->second : defaultUnsupportedTexture;
 }
@@ -597,10 +597,10 @@
         return map;
     };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static const ExtensionInfoMap extensionInfo = buildExtensionInfoMap();
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return extensionInfo;
 }

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp (210162 => 210163)


--- 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)
@@ -38,10 +38,10 @@
 typedef std::set<egl::Device *> DeviceSet;
 static DeviceSet *GetDeviceSet()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static DeviceSet devices;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return &devices;
 }

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp (210162 => 210163)


--- 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)
@@ -90,10 +90,10 @@
 // associated with it.
 static WindowSurfaceMap *GetWindowSurfaces()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static WindowSurfaceMap windowSurfaces;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return &windowSurfaces;
 }
 
@@ -100,10 +100,10 @@
 typedef std::map<EGLNativeDisplayType, Display *> ANGLEPlatformDisplayMap;
 static ANGLEPlatformDisplayMap *GetANGLEPlatformDisplayMap()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static ANGLEPlatformDisplayMap displays;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return &displays;
 }
 
@@ -110,10 +110,10 @@
 typedef std::map<Device *, Display *> DevicePlatformDisplayMap;
 static DevicePlatformDisplayMap *GetDevicePlatformDisplayMap()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static DevicePlatformDisplayMap displays;
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return &displays;
 }
 
@@ -930,10 +930,10 @@
 
 const std::string &Display::getClientExtensionString()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static const std::string clientExtensionsString = GenerateExtensionsString(getClientExtensions());
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return clientExtensionsString;
 }

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp (210162 => 210163)


--- 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)
@@ -615,10 +615,10 @@
 
 static const InternalFormatInfoMap &GetInternalFormatMap()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static const InternalFormatInfoMap formatMap = BuildInternalFormatInfoMap();
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return formatMap;
 }
 
@@ -862,10 +862,10 @@
 
 const FormatSet &GetAllSizedInternalFormats()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static FormatSet formatSet = BuildAllSizedInternalFormatSet();
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     return formatSet;
 }

Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp (210162 => 210163)


--- 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)
@@ -524,10 +524,10 @@
     const auto &textureFormatInfo     = *textureFormat.info;
     const auto &framebufferFormatInfo = *framebufferFormat.info;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
     static const CopyConversionSet conversionSet = BuildValidES3CopyTexImageCombinations();
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
     if (conversionSet.find(CopyConversion(textureFormatInfo.format,
                                           framebufferFormatInfo.format)) != conversionSet.end())
     {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to