turn on extended Clang warnings on Windows too
Plus some small rearrangements of the various warning lists.
Change-Id: Ied58f940341d69ddab971a529fd01b1e96b65641
Reviewed-on: https://skia-review.googlesource.com/67720
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h
index 90b0de9..5ede1ae 100644
--- a/src/gpu/GrXferProcessor.h
+++ b/src/gpu/GrXferProcessor.h
@@ -244,10 +244,14 @@
// since these objects have no need for destructors. However, GCC and clang throw a warning when a
// class has virtual functions and a non-virtual destructor. We suppress that warning here and
// for the subclasses.
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class GrXPFactory {
public:
typedef GrXferProcessor::DstProxy DstProxy;
@@ -316,9 +320,12 @@
const GrCaps&,
GrPixelConfigIsClamped) const = 0;
};
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
GR_MAKE_BITFIELD_CLASS_OPS(GrXPFactory::AnalysisProperties);
diff --git a/src/gpu/effects/GrCoverageSetOpXP.h b/src/gpu/effects/GrCoverageSetOpXP.h
index 72d1b01..cf91848 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.h
+++ b/src/gpu/effects/GrCoverageSetOpXP.h
@@ -13,10 +13,14 @@
#include "SkRegion.h"
// See the comment above GrXPFactory's definition about this warning suppression.
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
/**
* This xfer processor directly blends the the src coverage with the dst using a set operator. It is
@@ -51,8 +55,11 @@
typedef GrXPFactory INHERITED;
};
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
+#if defined(__clang__)
+#pragma clang diagnostic pop
#endif
+#endif
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 98bda3e..bdeda94 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -200,10 +200,14 @@
///////////////////////////////////////////////////////////////////////////////
// See the comment above GrXPFactory's definition about this warning suppression.
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class CustomXPFactory : public GrXPFactory {
public:
constexpr CustomXPFactory(SkBlendMode mode)
@@ -228,9 +232,12 @@
typedef GrXPFactory INHERITED;
};
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
sk_sp<const GrXferProcessor> CustomXPFactory::makeXferProcessor(
const GrProcessorAnalysisColor&,
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h
index f1ac32b..0c4f5cf 100644
--- a/src/gpu/effects/GrDisableColorXP.h
+++ b/src/gpu/effects/GrDisableColorXP.h
@@ -13,10 +13,14 @@
#include "SkRefCnt.h"
// See the comment above GrXPFactory's definition about this warning suppression.
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class GrDisableColorXPFactory : public GrXPFactory {
public:
static const GrXPFactory* Get();
@@ -42,9 +46,12 @@
typedef GrXPFactory INHERITED;
};
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
inline const GrXPFactory* GrDisableColorXPFactory::Get() {
// If this is constructed as static constexpr by cl.exe (2015 SP2) the vtable is null.
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.h b/src/gpu/effects/GrPorterDuffXferProcessor.h
index 37cd689..74ae153 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.h
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.h
@@ -13,10 +13,14 @@
#include "SkBlendMode.h"
// See the comment above GrXPFactory's definition about this warning suppression.
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class GrPorterDuffXPFactory : public GrXPFactory {
public:
static const GrXPFactory* Get(SkBlendMode blendMode);
@@ -62,8 +66,11 @@
friend class GrPorterDuffTest; // for TestGetXPOutputTypes()
typedef GrXPFactory INHERITED;
};
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
#endif