Revert "Revert "Removing ref counting from GrXPFactory.""
This reverts commit 003312a211e65f35e402d6fe80a32e23d4c94ac4.
Change-Id: Ib41065e5c356d1dd99e70fa10611ac6756c2b79d
Reviewed-on: https://skia-review.googlesource.com/6803
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
index 0954505..8d9347b 100644
--- a/src/gpu/GrPaint.cpp
+++ b/src/gpu/GrPaint.cpp
@@ -13,13 +13,14 @@
#include "effects/GrSimpleTextureEffect.h"
GrPaint::GrPaint()
- : fDisableOutputConversionToSRGB(false)
- , fAllowSRGBInputs(false)
- , fUsesDistanceVectorField(false)
- , fColor(GrColor4f::OpaqueWhite()) {}
+ : fXPFactory(nullptr)
+ , fDisableOutputConversionToSRGB(false)
+ , fAllowSRGBInputs(false)
+ , fUsesDistanceVectorField(false)
+ , fColor(GrColor4f::OpaqueWhite()) {}
void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) {
- fXPFactory = GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage);
+ fXPFactory = GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage);
}
void GrPaint::addColorTextureProcessor(GrTexture* texture,
diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
index bd433fc..5741471 100644
--- a/src/gpu/GrPipelineBuilder.cpp
+++ b/src/gpu/GrPipelineBuilder.cpp
@@ -29,7 +29,7 @@
fCoverageFragmentProcessors.emplace_back(SkRef(paint.getCoverageFragmentProcessor(i)));
}
- fXPFactory.reset(SkSafeRef(paint.getXPFactory()));
+ fXPFactory = paint.getXPFactory();
this->setState(GrPipelineBuilder::kHWAntialias_Flag, GrAATypeIsHW(aaType));
this->setState(GrPipelineBuilder::kDisableOutputConversionToSRGB_Flag,
diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h
index 1bc9002..0d039f9 100644
--- a/src/gpu/GrPipelineBuilder.h
+++ b/src/gpu/GrPipelineBuilder.h
@@ -145,21 +145,15 @@
* Installs a GrXPFactory. This object controls how src color, fractional pixel coverage,
* and the dst color are blended.
*/
- void setXPFactory(sk_sp<GrXPFactory> xpFactory) {
- fXPFactory = std::move(xpFactory);
- }
+ void setXPFactory(const GrXPFactory* xpFactory) { fXPFactory = xpFactory; }
/**
* Sets a GrXPFactory that disables color writes to the destination. This is useful when
* rendering to the stencil buffer.
*/
- void setDisableColorXPFactory() {
- fXPFactory = GrDisableColorXPFactory::Make();
- }
+ void setDisableColorXPFactory() { fXPFactory = GrDisableColorXPFactory::Get(); }
- const GrXPFactory* getXPFactory() const {
- return fXPFactory.get();
- }
+ const GrXPFactory* getXPFactory() const { return fXPFactory; }
/**
* Checks whether the xp will need destination in a texture to correctly blend.
@@ -304,7 +298,7 @@
uint32_t fFlags;
const GrUserStencilSettings* fUserStencilSettings;
GrDrawFace fDrawFace;
- mutable sk_sp<GrXPFactory> fXPFactory;
+ const GrXPFactory* fXPFactory;
FragmentProcessorArray fColorFragmentProcessors;
FragmentProcessorArray fCoverageFragmentProcessors;
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 991aa90..0512aa8 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -32,19 +32,17 @@
}
template<>
-SkTArray<GrProcessorTestFactory<GrXPFactory>*, true>*
-GrProcessorTestFactory<GrXPFactory>::GetFactories() {
- static SkTArray<GrProcessorTestFactory<GrXPFactory>*, true> gFactories;
- return &gFactories;
-}
-
-template<>
SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true>*
GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() {
static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactories;
return &gFactories;
}
+SkTArray<GrXPFactoryTestFactory*, true>* GrXPFactoryTestFactory::GetFactories() {
+ static SkTArray<GrXPFactoryTestFactory*, true> gFactories;
+ return &gFactories;
+}
+
/*
* To ensure we always have successful static initialization, before creating from the factories
* we verify the count is as expected. If a new factory is added, then these numbers must be
@@ -72,8 +70,7 @@
}
}
-template<>
-void GrProcessorTestFactory<GrXPFactory>::VerifyFactoryCount() {
+void GrXPFactoryTestFactory::VerifyFactoryCount() {
if (kXPFactoryCount != GetFactories()->count()) {
SkDebugf("\nExpected %d xp factory factories, found %d.\n",
kXPFactoryCount, GetFactories()->count());
@@ -229,8 +226,3 @@
break;
}
}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Initial static variable from GrXPFactory
-int32_t GrXPFactory::gCurrXPFClassID = GrXPFactory::kIllegalXPFClassID;
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 9802f87..9f3b225 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -780,7 +780,7 @@
GrShape shape(clipPath, GrStyle::SimpleFill());
if (canRenderDirectToStencil) {
GrPaint paint;
- paint.setXPFactory(GrDisableColorXPFactory::Make());
+ paint.setXPFactory(GrDisableColorXPFactory::Get());
GrPathRenderer::DrawPathArgs args;
args.fResourceProvider = context->resourceProvider();
@@ -817,7 +817,7 @@
} else {
GrShape shape(clipPath, GrStyle::SimpleFill());
GrPaint paint;
- paint.setXPFactory(GrDisableColorXPFactory::Make());
+ paint.setXPFactory(GrDisableColorXPFactory::Get());
GrPathRenderer::DrawPathArgs args;
args.fResourceProvider = context->resourceProvider();
args.fPaint = &paint;
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index e9325fa..5e14f6b 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -268,7 +268,7 @@
// target before the target is read.
GrPaint paint;
paint.setColor4f(GrColor4f::FromGrColor(color));
- paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
+ paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
// We don't call drawRect() here to avoid the cropping to the, possibly smaller,
// RenderTargetProxy bounds
@@ -329,7 +329,7 @@
GrPaint paint;
paint.setColor4f(GrColor4f::FromGrColor(color));
- paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
+ paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
this->drawRect(clip, paint, GrAA::kNo, SkMatrix::I(), SkRect::Make(clearRect));
} else if (isFull) {
@@ -675,7 +675,7 @@
AutoCheckFlush acf(fRenderTargetContext->fDrawingManager);
GrPaint paint;
- paint.setXPFactory(GrDisableColorXPFactory::Make());
+ paint.setXPFactory(GrDisableColorXPFactory::Get());
fRenderTargetContext->drawNonAAFilledRect(clip, paint, viewMatrix, rect, nullptr, nullptr, ss,
aaType);
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp
index 73adc49..05e9fad 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -236,77 +236,89 @@
///////////////////////////////////////////////////////////////////////////////
//
-GrCoverageSetOpXPFactory::GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage)
- : fRegionOp(regionOp)
- , fInvertCoverage(invertCoverage) {
- this->initClassID<GrCoverageSetOpXPFactory>();
-}
+constexpr GrCoverageSetOpXPFactory::GrCoverageSetOpXPFactory(SkRegion::Op regionOp,
+ bool invertCoverage)
+ : fRegionOp(regionOp), fInvertCoverage(invertCoverage) {}
-sk_sp<GrXPFactory> GrCoverageSetOpXPFactory::Make(SkRegion::Op regionOp, bool invertCoverage) {
+const GrXPFactory* GrCoverageSetOpXPFactory::Get(SkRegion::Op regionOp, bool invertCoverage) {
+ // If these objects are constructed as static constexpr by cl.exe (2015 SP2) the vtables are
+ // null.
+#ifdef SK_BUILD_FOR_WIN
+#define _CONSTEXPR_
+#else
+#define _CONSTEXPR_ constexpr
+#endif
switch (regionOp) {
case SkRegion::kReplace_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gReplaceCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gReplaceCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gReplaceCDXPFI(
+ SkRegion::kReplace_Op, true);
+ return &gReplaceCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gReplaceCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gReplaceCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gReplaceCDXPF(
+ SkRegion::kReplace_Op, false);
+ return &gReplaceCDXPF;
}
- break;
}
case SkRegion::kIntersect_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gIntersectCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gIntersectCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gIntersectCDXPFI(
+ SkRegion::kIntersect_Op, true);
+ return &gIntersectCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gIntersectCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gIntersectCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gIntersectCDXPF(
+ SkRegion::kIntersect_Op, false);
+ return &gIntersectCDXPF;
}
- break;
}
case SkRegion::kUnion_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gUnionCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gUnionCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gUnionCDXPFI(SkRegion::kUnion_Op,
+ true);
+ return &gUnionCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gUnionCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gUnionCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gUnionCDXPF(SkRegion::kUnion_Op,
+ false);
+ return &gUnionCDXPF;
}
- break;
}
case SkRegion::kXOR_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gXORCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gXORCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gXORCDXPFI(SkRegion::kXOR_Op,
+ true);
+ return &gXORCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gXORCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gXORCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gXORCDXPF(SkRegion::kXOR_Op,
+ false);
+ return &gXORCDXPF;
}
- break;
}
case SkRegion::kDifference_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gDifferenceCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gDifferenceCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gDifferenceCDXPFI(
+ SkRegion::kDifference_Op, true);
+ return &gDifferenceCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gDifferenceCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gDifferenceCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gDifferenceCDXPF(
+ SkRegion::kDifference_Op, false);
+ return &gDifferenceCDXPF;
}
- break;
}
case SkRegion::kReverseDifference_Op: {
if (invertCoverage) {
- static GrCoverageSetOpXPFactory gRevDiffCDXPFI(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gRevDiffCDXPFI));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gRevDiffCDXPFI(
+ SkRegion::kReverseDifference_Op, true);
+ return &gRevDiffCDXPFI;
} else {
- static GrCoverageSetOpXPFactory gRevDiffCDXPF(regionOp, invertCoverage);
- return sk_sp<GrXPFactory>(SkRef(&gRevDiffCDXPF));
+ static _CONSTEXPR_ const GrCoverageSetOpXPFactory gRevDiffCDXPF(
+ SkRegion::kReverseDifference_Op, false);
+ return &gRevDiffCDXPF;
}
- break;
}
- default:
- return nullptr;
}
+#undef _CONSTEXPR_
+ SkFAIL("Unknown region op.");
+ return nullptr;
}
GrXferProcessor* GrCoverageSetOpXPFactory::onCreateXferProcessor(const GrCaps& caps,
@@ -335,8 +347,8 @@
GR_DEFINE_XP_FACTORY_TEST(GrCoverageSetOpXPFactory);
-sk_sp<GrXPFactory> GrCoverageSetOpXPFactory::TestCreate(GrProcessorTestData* d) {
+const GrXPFactory* GrCoverageSetOpXPFactory::TestGet(GrProcessorTestData* d) {
SkRegion::Op regionOp = SkRegion::Op(d->fRandom->nextULessThan(SkRegion::kLastOp + 1));
bool invertCoverage = !d->fRenderTargetContext->hasMixedSamples() && d->fRandom->nextBool();
- return GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage);
+ return GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage);
}
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 239c304..d96ab94 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -31,25 +31,26 @@
// Static helpers
///////////////////////////////////////////////////////////////////////////////
-static GrBlendEquation hw_blend_equation(SkBlendMode mode) {
- enum { kOffset = kOverlay_GrBlendEquation - (int)SkBlendMode::kOverlay };
- return static_cast<GrBlendEquation>((int)mode + kOffset);
-
- GR_STATIC_ASSERT(kOverlay_GrBlendEquation == (int)SkBlendMode::kOverlay + kOffset);
- GR_STATIC_ASSERT(kDarken_GrBlendEquation == (int)SkBlendMode::kDarken + kOffset);
- GR_STATIC_ASSERT(kLighten_GrBlendEquation == (int)SkBlendMode::kLighten + kOffset);
- GR_STATIC_ASSERT(kColorDodge_GrBlendEquation == (int)SkBlendMode::kColorDodge + kOffset);
- GR_STATIC_ASSERT(kColorBurn_GrBlendEquation == (int)SkBlendMode::kColorBurn + kOffset);
- GR_STATIC_ASSERT(kHardLight_GrBlendEquation == (int)SkBlendMode::kHardLight + kOffset);
- GR_STATIC_ASSERT(kSoftLight_GrBlendEquation == (int)SkBlendMode::kSoftLight + kOffset);
- GR_STATIC_ASSERT(kDifference_GrBlendEquation == (int)SkBlendMode::kDifference + kOffset);
- GR_STATIC_ASSERT(kExclusion_GrBlendEquation == (int)SkBlendMode::kExclusion + kOffset);
- GR_STATIC_ASSERT(kMultiply_GrBlendEquation == (int)SkBlendMode::kMultiply + kOffset);
- GR_STATIC_ASSERT(kHSLHue_GrBlendEquation == (int)SkBlendMode::kHue + kOffset);
- GR_STATIC_ASSERT(kHSLSaturation_GrBlendEquation == (int)SkBlendMode::kSaturation + kOffset);
- GR_STATIC_ASSERT(kHSLColor_GrBlendEquation == (int)SkBlendMode::kColor + kOffset);
- GR_STATIC_ASSERT(kHSLLuminosity_GrBlendEquation == (int)SkBlendMode::kLuminosity + kOffset);
- GR_STATIC_ASSERT(kGrBlendEquationCnt == (int)SkBlendMode::kLastMode + 1 + kOffset);
+static constexpr GrBlendEquation hw_blend_equation(SkBlendMode mode) {
+// In C++14 this could be a constexpr int variable.
+#define EQ_OFFSET (kOverlay_GrBlendEquation - (int)SkBlendMode::kOverlay)
+ GR_STATIC_ASSERT(kOverlay_GrBlendEquation == (int)SkBlendMode::kOverlay + EQ_OFFSET);
+ GR_STATIC_ASSERT(kDarken_GrBlendEquation == (int)SkBlendMode::kDarken + EQ_OFFSET);
+ GR_STATIC_ASSERT(kLighten_GrBlendEquation == (int)SkBlendMode::kLighten + EQ_OFFSET);
+ GR_STATIC_ASSERT(kColorDodge_GrBlendEquation == (int)SkBlendMode::kColorDodge + EQ_OFFSET);
+ GR_STATIC_ASSERT(kColorBurn_GrBlendEquation == (int)SkBlendMode::kColorBurn + EQ_OFFSET);
+ GR_STATIC_ASSERT(kHardLight_GrBlendEquation == (int)SkBlendMode::kHardLight + EQ_OFFSET);
+ GR_STATIC_ASSERT(kSoftLight_GrBlendEquation == (int)SkBlendMode::kSoftLight + EQ_OFFSET);
+ GR_STATIC_ASSERT(kDifference_GrBlendEquation == (int)SkBlendMode::kDifference + EQ_OFFSET);
+ GR_STATIC_ASSERT(kExclusion_GrBlendEquation == (int)SkBlendMode::kExclusion + EQ_OFFSET);
+ GR_STATIC_ASSERT(kMultiply_GrBlendEquation == (int)SkBlendMode::kMultiply + EQ_OFFSET);
+ GR_STATIC_ASSERT(kHSLHue_GrBlendEquation == (int)SkBlendMode::kHue + EQ_OFFSET);
+ GR_STATIC_ASSERT(kHSLSaturation_GrBlendEquation == (int)SkBlendMode::kSaturation + EQ_OFFSET);
+ GR_STATIC_ASSERT(kHSLColor_GrBlendEquation == (int)SkBlendMode::kColor + EQ_OFFSET);
+ GR_STATIC_ASSERT(kHSLLuminosity_GrBlendEquation == (int)SkBlendMode::kLuminosity + EQ_OFFSET);
+ GR_STATIC_ASSERT(kGrBlendEquationCnt == (int)SkBlendMode::kLastMode + 1 + EQ_OFFSET);
+ return static_cast<GrBlendEquation>((int)mode + EQ_OFFSET);
+#undef EQ_OFFSET
}
static bool can_use_hw_blend_equation(GrBlendEquation equation,
@@ -319,9 +320,16 @@
}
///////////////////////////////////////////////////////////////////////////////
+
+// See the comment above GrXPFactory's definition about this warning suppression.
+#if defined(__GNUC__) || defined(__clang)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class CustomXPFactory : public GrXPFactory {
public:
- CustomXPFactory(SkBlendMode mode);
+ constexpr CustomXPFactory(SkBlendMode mode)
+ : fMode(mode), fHWBlendEquation(hw_blend_equation(mode)) {}
void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
GrXPFactory::InvariantBlendedColor*) const override;
@@ -334,10 +342,6 @@
bool onWillReadDstColor(const GrCaps&, const GrPipelineAnalysis&) const override;
- bool onIsEqual(const GrXPFactory& xpfBase) const override {
- const CustomXPFactory& xpf = xpfBase.cast<CustomXPFactory>();
- return fMode == xpf.fMode;
- }
GR_DECLARE_XP_FACTORY_TEST;
@@ -346,18 +350,15 @@
typedef GrXPFactory INHERITED;
};
-
-CustomXPFactory::CustomXPFactory(SkBlendMode mode)
- : fMode(mode),
- fHWBlendEquation(hw_blend_equation(mode)) {
- SkASSERT(GrCustomXfermode::IsSupportedMode(fMode));
- this->initClassID<CustomXPFactory>();
-}
+#if defined(__GNUC__) || defined(__clang)
+#pragma GCC diagnostic pop
+#endif
GrXferProcessor* CustomXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrPipelineAnalysis& analysis,
bool hasMixedSamples,
const DstTexture* dstTexture) const {
+ SkASSERT(GrCustomXfermode::IsSupportedMode(fMode));
if (can_use_hw_blend_equation(fHWBlendEquation, analysis, caps)) {
SkASSERT(!dstTexture || !dstTexture->texture());
return new CustomXP(fMode, fHWBlendEquation);
@@ -377,59 +378,67 @@
}
GR_DEFINE_XP_FACTORY_TEST(CustomXPFactory);
-sk_sp<GrXPFactory> CustomXPFactory::TestCreate(GrProcessorTestData* d) {
+const GrXPFactory* CustomXPFactory::TestGet(GrProcessorTestData* d) {
int mode = d->fRandom->nextRangeU((int)SkBlendMode::kLastCoeffMode + 1,
(int)SkBlendMode::kLastSeparableMode);
- return sk_sp<GrXPFactory>(new CustomXPFactory(static_cast<SkBlendMode>(mode)));
+ return GrCustomXfermode::Get((SkBlendMode)mode);
}
///////////////////////////////////////////////////////////////////////////////
-sk_sp<GrXPFactory> GrCustomXfermode::MakeXPFactory(SkBlendMode mode) {
- static CustomXPFactory gOverlay(SkBlendMode::kOverlay);
- static CustomXPFactory gDarken(SkBlendMode::kDarken);
- static CustomXPFactory gLighten(SkBlendMode::kLighten);
- static CustomXPFactory gColorDodge(SkBlendMode::kColorDodge);
- static CustomXPFactory gColorBurn(SkBlendMode::kColorBurn);
- static CustomXPFactory gHardLight(SkBlendMode::kHardLight);
- static CustomXPFactory gSoftLight(SkBlendMode::kSoftLight);
- static CustomXPFactory gDifference(SkBlendMode::kDifference);
- static CustomXPFactory gExclusion(SkBlendMode::kExclusion);
- static CustomXPFactory gMultiply(SkBlendMode::kMultiply);
- static CustomXPFactory gHue(SkBlendMode::kHue);
- static CustomXPFactory gSaturation(SkBlendMode::kSaturation);
- static CustomXPFactory gColor(SkBlendMode::kColor);
- static CustomXPFactory gLuminosity(SkBlendMode::kLuminosity);
+const GrXPFactory* GrCustomXfermode::Get(SkBlendMode mode) {
+ // If these objects are constructed as static constexpr by cl.exe (2015 SP2) the vtables are
+ // null.
+#ifdef SK_BUILD_FOR_WIN
+#define _CONSTEXPR_
+#else
+#define _CONSTEXPR_ constexpr
+#endif
+ static _CONSTEXPR_ const CustomXPFactory gOverlay(SkBlendMode::kOverlay);
+ static _CONSTEXPR_ const CustomXPFactory gDarken(SkBlendMode::kDarken);
+ static _CONSTEXPR_ const CustomXPFactory gLighten(SkBlendMode::kLighten);
+ static _CONSTEXPR_ const CustomXPFactory gColorDodge(SkBlendMode::kColorDodge);
+ static _CONSTEXPR_ const CustomXPFactory gColorBurn(SkBlendMode::kColorBurn);
+ static _CONSTEXPR_ const CustomXPFactory gHardLight(SkBlendMode::kHardLight);
+ static _CONSTEXPR_ const CustomXPFactory gSoftLight(SkBlendMode::kSoftLight);
+ static _CONSTEXPR_ const CustomXPFactory gDifference(SkBlendMode::kDifference);
+ static _CONSTEXPR_ const CustomXPFactory gExclusion(SkBlendMode::kExclusion);
+ static _CONSTEXPR_ const CustomXPFactory gMultiply(SkBlendMode::kMultiply);
+ static _CONSTEXPR_ const CustomXPFactory gHue(SkBlendMode::kHue);
+ static _CONSTEXPR_ const CustomXPFactory gSaturation(SkBlendMode::kSaturation);
+ static _CONSTEXPR_ const CustomXPFactory gColor(SkBlendMode::kColor);
+ static _CONSTEXPR_ const CustomXPFactory gLuminosity(SkBlendMode::kLuminosity);
+#undef _CONSTEXPR_
switch (mode) {
case SkBlendMode::kOverlay:
- return sk_sp<GrXPFactory>(SkRef(&gOverlay));
+ return &gOverlay;
case SkBlendMode::kDarken:
- return sk_sp<GrXPFactory>(SkRef(&gDarken));
+ return &gDarken;
case SkBlendMode::kLighten:
- return sk_sp<GrXPFactory>(SkRef(&gLighten));
+ return &gLighten;
case SkBlendMode::kColorDodge:
- return sk_sp<GrXPFactory>(SkRef(&gColorDodge));
+ return &gColorDodge;
case SkBlendMode::kColorBurn:
- return sk_sp<GrXPFactory>(SkRef(&gColorBurn));
+ return &gColorBurn;
case SkBlendMode::kHardLight:
- return sk_sp<GrXPFactory>(SkRef(&gHardLight));
+ return &gHardLight;
case SkBlendMode::kSoftLight:
- return sk_sp<GrXPFactory>(SkRef(&gSoftLight));
+ return &gSoftLight;
case SkBlendMode::kDifference:
- return sk_sp<GrXPFactory>(SkRef(&gDifference));
+ return &gDifference;
case SkBlendMode::kExclusion:
- return sk_sp<GrXPFactory>(SkRef(&gExclusion));
+ return &gExclusion;
case SkBlendMode::kMultiply:
- return sk_sp<GrXPFactory>(SkRef(&gMultiply));
+ return &gMultiply;
case SkBlendMode::kHue:
- return sk_sp<GrXPFactory>(SkRef(&gHue));
+ return &gHue;
case SkBlendMode::kSaturation:
- return sk_sp<GrXPFactory>(SkRef(&gSaturation));
+ return &gSaturation;
case SkBlendMode::kColor:
- return sk_sp<GrXPFactory>(SkRef(&gColor));
+ return &gColor;
case SkBlendMode::kLuminosity:
- return sk_sp<GrXPFactory>(SkRef(&gLuminosity));
+ return &gLuminosity;
default:
SkASSERT(!GrCustomXfermode::IsSupportedMode(mode));
return nullptr;
diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp
index 0182acc..69c34ec 100644
--- a/src/gpu/effects/GrDisableColorXP.cpp
+++ b/src/gpu/effects/GrDisableColorXP.cpp
@@ -88,11 +88,6 @@
}
///////////////////////////////////////////////////////////////////////////////
-
-GrDisableColorXPFactory::GrDisableColorXPFactory() {
- this->initClassID<GrDisableColorXPFactory>();
-}
-
GrXferProcessor* GrDisableColorXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrPipelineAnalysis& analysis,
bool hasMixedSamples,
@@ -103,6 +98,6 @@
GR_DEFINE_XP_FACTORY_TEST(GrDisableColorXPFactory);
-sk_sp<GrXPFactory> GrDisableColorXPFactory::TestCreate(GrProcessorTestData*) {
- return GrDisableColorXPFactory::Make();
+const GrXPFactory* GrDisableColorXPFactory::TestGet(GrProcessorTestData*) {
+ return GrDisableColorXPFactory::Get();
}
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h
index 49e2459..9f56ae5 100644
--- a/src/gpu/effects/GrDisableColorXP.h
+++ b/src/gpu/effects/GrDisableColorXP.h
@@ -14,12 +14,14 @@
class GrProcOptInfo;
+// See the comment above GrXPFactory's definition about this warning suppression.
+#if defined(__GNUC__) || defined(__clang)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
class GrDisableColorXPFactory : public GrXPFactory {
public:
- static sk_sp<GrXPFactory> Make() {
- static GrDisableColorXPFactory gDisableColorXPFactory;
- return sk_sp<GrXPFactory>(SkRef(&gDisableColorXPFactory));
- }
+ static const GrXPFactory* Get();
void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
GrXPFactory::InvariantBlendedColor* blendedColor) const override {
@@ -28,7 +30,7 @@
}
private:
- GrDisableColorXPFactory();
+ constexpr GrDisableColorXPFactory() {}
GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
const GrPipelineAnalysis&,
@@ -39,13 +41,22 @@
return false;
}
- bool onIsEqual(const GrXPFactory& xpfBase) const override {
- return true;
- }
-
GR_DECLARE_XP_FACTORY_TEST;
typedef GrXPFactory INHERITED;
};
+#if defined(__GNUC__) || defined(__clang)
+#pragma GCC diagnostic pop
+#endif
+
+inline const GrXPFactory* GrDisableColorXPFactory::Get() {
+ // If this is constructed as static constexpr by cl.exe (2015 SP2) the vtable is null.
+#ifdef SK_BUILD_FOR_WIN
+ static const GrDisableColorXPFactory gDisableColorXPFactory;
+#else
+ static constexpr const GrDisableColorXPFactory gDisableColorXPFactory;
+#endif
+ return &gDisableColorXPFactory;
+}
#endif
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index df8b96d..a813a53 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -675,40 +675,71 @@
///////////////////////////////////////////////////////////////////////////////
-GrPorterDuffXPFactory::GrPorterDuffXPFactory(SkBlendMode xfermode)
- : fXfermode(xfermode) {
- SkASSERT((unsigned)fXfermode <= (unsigned)SkBlendMode::kLastCoeffMode);
- this->initClassID<GrPorterDuffXPFactory>();
-}
+constexpr GrPorterDuffXPFactory::GrPorterDuffXPFactory(SkBlendMode xfermode)
+ : fBlendMode(xfermode) {}
-sk_sp<GrXPFactory> GrPorterDuffXPFactory::Make(SkBlendMode xfermode) {
- static GrPorterDuffXPFactory gClearPDXPF(SkBlendMode::kClear);
- static GrPorterDuffXPFactory gSrcPDXPF(SkBlendMode::kSrc);
- static GrPorterDuffXPFactory gDstPDXPF(SkBlendMode::kDst);
- static GrPorterDuffXPFactory gSrcOverPDXPF(SkBlendMode::kSrcOver);
- static GrPorterDuffXPFactory gDstOverPDXPF(SkBlendMode::kDstOver);
- static GrPorterDuffXPFactory gSrcInPDXPF(SkBlendMode::kSrcIn);
- static GrPorterDuffXPFactory gDstInPDXPF(SkBlendMode::kDstIn);
- static GrPorterDuffXPFactory gSrcOutPDXPF(SkBlendMode::kSrcOut);
- static GrPorterDuffXPFactory gDstOutPDXPF(SkBlendMode::kDstOut);
- static GrPorterDuffXPFactory gSrcATopPDXPF(SkBlendMode::kSrcATop);
- static GrPorterDuffXPFactory gDstATopPDXPF(SkBlendMode::kDstATop);
- static GrPorterDuffXPFactory gXorPDXPF(SkBlendMode::kXor);
- static GrPorterDuffXPFactory gPlusPDXPF(SkBlendMode::kPlus);
- static GrPorterDuffXPFactory gModulatePDXPF(SkBlendMode::kModulate);
- static GrPorterDuffXPFactory gScreenPDXPF(SkBlendMode::kScreen);
+const GrXPFactory* GrPorterDuffXPFactory::Get(SkBlendMode blendMode) {
+ SkASSERT((unsigned)blendMode <= (unsigned)SkBlendMode::kLastCoeffMode);
- static GrPorterDuffXPFactory* gFactories[] = {
- &gClearPDXPF, &gSrcPDXPF, &gDstPDXPF, &gSrcOverPDXPF, &gDstOverPDXPF, &gSrcInPDXPF,
- &gDstInPDXPF, &gSrcOutPDXPF, &gDstOutPDXPF, &gSrcATopPDXPF, &gDstATopPDXPF, &gXorPDXPF,
- &gPlusPDXPF, &gModulatePDXPF, &gScreenPDXPF
- };
- GR_STATIC_ASSERT(SK_ARRAY_COUNT(gFactories) == (int)SkBlendMode::kLastCoeffMode + 1);
+ // If these objects are constructed as static constexpr by cl.exe (2015 SP2) the vtables are
+ // null.
+#ifdef SK_BUILD_FOR_WIN
+#define _CONSTEXPR_
+#else
+#define _CONSTEXPR_ constexpr
+#endif
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gClearPDXPF(SkBlendMode::kClear);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gSrcPDXPF(SkBlendMode::kSrc);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gDstPDXPF(SkBlendMode::kDst);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gSrcOverPDXPF(SkBlendMode::kSrcOver);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gDstOverPDXPF(SkBlendMode::kDstOver);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gSrcInPDXPF(SkBlendMode::kSrcIn);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gDstInPDXPF(SkBlendMode::kDstIn);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gSrcOutPDXPF(SkBlendMode::kSrcOut);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gDstOutPDXPF(SkBlendMode::kDstOut);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gSrcATopPDXPF(SkBlendMode::kSrcATop);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gDstATopPDXPF(SkBlendMode::kDstATop);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gXorPDXPF(SkBlendMode::kXor);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gPlusPDXPF(SkBlendMode::kPlus);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gModulatePDXPF(SkBlendMode::kModulate);
+ static _CONSTEXPR_ const GrPorterDuffXPFactory gScreenPDXPF(SkBlendMode::kScreen);
+#undef _CONSTEXPR_
- if ((int)xfermode < 0 || (int)xfermode > (int)SkBlendMode::kLastCoeffMode) {
- return nullptr;
+ switch (blendMode) {
+ case SkBlendMode::kClear:
+ return &gClearPDXPF;
+ case SkBlendMode::kSrc:
+ return &gSrcPDXPF;
+ case SkBlendMode::kDst:
+ return &gDstPDXPF;
+ case SkBlendMode::kSrcOver:
+ return &gSrcOverPDXPF;
+ case SkBlendMode::kDstOver:
+ return &gDstOverPDXPF;
+ case SkBlendMode::kSrcIn:
+ return &gSrcInPDXPF;
+ case SkBlendMode::kDstIn:
+ return &gDstInPDXPF;
+ case SkBlendMode::kSrcOut:
+ return &gSrcOutPDXPF;
+ case SkBlendMode::kDstOut:
+ return &gDstOutPDXPF;
+ case SkBlendMode::kSrcATop:
+ return &gSrcATopPDXPF;
+ case SkBlendMode::kDstATop:
+ return &gDstATopPDXPF;
+ case SkBlendMode::kXor:
+ return &gXorPDXPF;
+ case SkBlendMode::kPlus:
+ return &gPlusPDXPF;
+ case SkBlendMode::kModulate:
+ return &gModulatePDXPF;
+ case SkBlendMode::kScreen:
+ return &gScreenPDXPF;
+ default:
+ SkFAIL("Unexpected blend mode.");
+ return nullptr;
}
- return sk_sp<GrXPFactory>(SkRef(gFactories[(int)xfermode]));
}
GrXferProcessor* GrPorterDuffXPFactory::onCreateXferProcessor(const GrCaps& caps,
@@ -716,27 +747,27 @@
bool hasMixedSamples,
const DstTexture* dstTexture) const {
if (analysis.fUsesPLSDstRead) {
- return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, fXfermode);
+ return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, fBlendMode);
}
BlendFormula blendFormula;
if (analysis.fCoveragePOI.isFourChannelOutput()) {
- if (SkBlendMode::kSrcOver == fXfermode &&
+ if (SkBlendMode::kSrcOver == fBlendMode &&
kRGBA_GrColorComponentFlags == analysis.fColorPOI.validFlags() &&
!caps.shaderCaps()->dualSourceBlendingSupport() &&
!caps.shaderCaps()->dstReadInShaderSupport()) {
// If we don't have dual source blending or in shader dst reads, we fall back to this
// trick for rendering SrcOver LCD text instead of doing a dst copy.
SkASSERT(!dstTexture || !dstTexture->texture());
- return PDLCDXferProcessor::Create(fXfermode, analysis.fColorPOI);
+ return PDLCDXferProcessor::Create(fBlendMode, analysis.fColorPOI);
}
- blendFormula = get_lcd_blend_formula(analysis.fCoveragePOI, fXfermode);
+ blendFormula = get_lcd_blend_formula(analysis.fCoveragePOI, fBlendMode);
} else {
blendFormula = get_blend_formula(analysis.fColorPOI, analysis.fCoveragePOI, hasMixedSamples,
- fXfermode);
+ fBlendMode);
}
if (blendFormula.hasSecondaryOutput() && !caps.shaderCaps()->dualSourceBlendingSupport()) {
- return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, fXfermode);
+ return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, fBlendMode);
}
SkASSERT(!dstTexture || !dstTexture->texture());
@@ -746,7 +777,7 @@
void GrPorterDuffXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
InvariantBlendedColor* blendedColor) const {
// Find the blended color info based on the formula that does not have coverage.
- BlendFormula colorFormula = gBlendTable[colorPOI.isOpaque()][0][(int)fXfermode];
+ BlendFormula colorFormula = gBlendTable[colorPOI.isOpaque()][0][(int)fBlendMode];
if (colorFormula.usesDstColor()) {
blendedColor->fWillBlendWithDst = true;
blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
@@ -784,12 +815,12 @@
// blend. The one exception is when we are using srcover mode and we know the input color into
// the XP.
if (analysis.fCoveragePOI.isFourChannelOutput()) {
- if (SkBlendMode::kSrcOver == fXfermode &&
+ if (SkBlendMode::kSrcOver == fBlendMode &&
kRGBA_GrColorComponentFlags == analysis.fColorPOI.validFlags() &&
!caps.shaderCaps()->dstReadInShaderSupport()) {
return false;
}
- return get_lcd_blend_formula(analysis.fCoveragePOI, fXfermode).hasSecondaryOutput();
+ return get_lcd_blend_formula(analysis.fCoveragePOI, fBlendMode).hasSecondaryOutput();
}
// We fallback on the shader XP when the blend formula would use dual source blending but we
@@ -797,15 +828,15 @@
static const bool kHasMixedSamples = false;
SkASSERT(!caps.usesMixedSamples()); // We never use mixed samples without dual source blending.
auto formula = get_blend_formula(analysis.fColorPOI, analysis.fCoveragePOI, kHasMixedSamples,
- fXfermode);
+ fBlendMode);
return formula.hasSecondaryOutput();
}
GR_DEFINE_XP_FACTORY_TEST(GrPorterDuffXPFactory);
-sk_sp<GrXPFactory> GrPorterDuffXPFactory::TestCreate(GrProcessorTestData* d) {
+const GrXPFactory* GrPorterDuffXPFactory::TestGet(GrProcessorTestData* d) {
SkBlendMode mode = SkBlendMode(d->fRandom->nextULessThan((int)SkBlendMode::kLastCoeffMode));
- return GrPorterDuffXPFactory::Make(mode);
+ return GrPorterDuffXPFactory::Get(mode);
}
void GrPorterDuffXPFactory::TestGetXPOutputTypes(const GrXferProcessor* xp,
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index d9e0110..cbad5f2 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -596,7 +596,7 @@
SkASSERT(!args.fShape->inverseFilled());
GrPaint paint;
- paint.setXPFactory(GrDisableColorXPFactory::Make());
+ paint.setXPFactory(GrDisableColorXPFactory::Get());
this->internalDrawPath(args.fRenderTargetContext, paint, args.fAAType,
GrUserStencilSettings::kUnused, *args.fClip, *args.fViewMatrix,
diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp
index 207567b..cc6781c 100644
--- a/src/gpu/ops/GrMSAAPathRenderer.cpp
+++ b/src/gpu/ops/GrMSAAPathRenderer.cpp
@@ -718,7 +718,7 @@
SkASSERT(!args.fShape->mayBeInverseFilledAfterStyling());
GrPaint paint;
- paint.setXPFactory(GrDisableColorXPFactory::Make());
+ paint.setXPFactory(GrDisableColorXPFactory::Get());
this->internalDrawPath(args.fRenderTargetContext, paint, args.fAAType,
GrUserStencilSettings::kUnused, *args.fClip, *args.fViewMatrix,