Clean up GrGLSLFragmentProcessor-derived classes
In some other patches it was observed that many of the GrGLSLFragmentProcessor-derived classes needlessly pass a parameter to their constructors.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1666773002
Review URL: https://codereview.chromium.org/1666773002
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index f05b7aa..ca2298c 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -152,8 +152,6 @@
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
class GLFP : public GrGLSLFragmentProcessor {
public:
- GLFP() {}
-
void emitCode(EmitArgs& args) override {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
this->emitChild(0, nullptr, args);
@@ -304,7 +302,6 @@
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
class GLFP : public GrGLSLFragmentProcessor {
public:
- GLFP() {}
void emitCode(EmitArgs& args) override {
SkString input(args.fInputColor);
for (int i = 0; i < this->numChildProcessors() - 1; ++i) {
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp
index 37ac4ab..cc38d62 100644
--- a/src/gpu/effects/GrBicubicEffect.cpp
+++ b/src/gpu/effects/GrBicubicEffect.cpp
@@ -23,9 +23,7 @@
class GrGLBicubicEffect : public GrGLSLFragmentProcessor {
public:
- GrGLBicubicEffect(const GrProcessor&);
-
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor& effect, const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
@@ -46,9 +44,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GrGLBicubicEffect::GrGLBicubicEffect(const GrProcessor&) {
-}
-
void GrGLBicubicEffect::emitCode(EmitArgs& args) {
const GrTextureDomain& domain = args.fFp.cast<GrBicubicEffect>().domain();
@@ -168,7 +163,7 @@
}
GrGLSLFragmentProcessor* GrBicubicEffect::onCreateGLSLInstance() const {
- return new GrGLBicubicEffect(*this);
+ return new GrGLBicubicEffect;
}
bool GrBicubicEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 5ac86a9..ace736c 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -16,9 +16,7 @@
class GrGLConfigConversionEffect : public GrGLSLFragmentProcessor {
public:
- GrGLConfigConversionEffect() {}
-
- virtual void emitCode(EmitArgs& args) override {
+ void emitCode(EmitArgs& args) override {
const GrConfigConversionEffect& cce = args.fFp.cast<GrConfigConversionEffect>();
const GrSwizzle& swizzle = cce.swizzle();
GrConfigConversionEffect::PMConversion pmConversion = cce.pmConversion();
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index dc7a528..f95d1a2 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -81,9 +81,11 @@
class GLAARectEffect : public GrGLSLFragmentProcessor {
public:
- GLAARectEffect(const GrProcessor&);
+ GLAARectEffect() {
+ fPrevRect.fLeft = SK_ScalarNaN;
+ }
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
@@ -96,10 +98,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLAARectEffect::GLAARectEffect(const GrProcessor& effect) {
- fPrevRect.fLeft = SK_ScalarNaN;
-}
-
void GLAARectEffect::emitCode(EmitArgs& args) {
const AARectEffect& aare = args.fFp.cast<AARectEffect>();
const char *rectName;
@@ -161,16 +159,18 @@
}
GrGLSLFragmentProcessor* AARectEffect::onCreateGLSLInstance() const {
- return new GLAARectEffect(*this);
+ return new GLAARectEffect;
}
//////////////////////////////////////////////////////////////////////////////
class GrGLConvexPolyEffect : public GrGLSLFragmentProcessor {
public:
- GrGLConvexPolyEffect(const GrProcessor&);
+ GrGLConvexPolyEffect() {
+ fPrevEdges[0] = SK_ScalarNaN;
+ }
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
@@ -183,10 +183,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GrGLConvexPolyEffect::GrGLConvexPolyEffect(const GrProcessor&) {
- fPrevEdges[0] = SK_ScalarNaN;
-}
-
void GrGLConvexPolyEffect::emitCode(EmitArgs& args) {
const GrConvexPolyEffect& cpe = args.fFp.cast<GrConvexPolyEffect>();
@@ -309,7 +305,7 @@
}
GrGLSLFragmentProcessor* GrConvexPolyEffect::onCreateGLSLInstance() const {
- return new GrGLConvexPolyEffect(*this);
+ return new GrGLConvexPolyEffect;
}
GrConvexPolyEffect::GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[])
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index fb68a29..adb62ae 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -18,7 +18,7 @@
public:
GrGLConvolutionEffect(const GrProcessor&);
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp
index 44aacfc..43fe937 100644
--- a/src/gpu/effects/GrDitherEffect.cpp
+++ b/src/gpu/effects/GrDitherEffect.cpp
@@ -60,17 +60,12 @@
class GLDitherEffect : public GrGLSLFragmentProcessor {
public:
- GLDitherEffect(const GrProcessor&);
-
- virtual void emitCode(EmitArgs& args) override;
+ void emitCode(EmitArgs& args) override;
private:
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLDitherEffect::GLDitherEffect(const GrProcessor&) {
-}
-
void GLDitherEffect::emitCode(EmitArgs& args) {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
// Generate a random number based on the fragment position. For this
@@ -97,7 +92,7 @@
}
GrGLSLFragmentProcessor* DitherEffect::onCreateGLSLInstance() const {
- return new GLDitherEffect(*this);
+ return new GLDitherEffect;
}
GrFragmentProcessor* GrDitherEffect::Create() { return DitherEffect::Create(); }
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 8867ab9..6d411c4 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -13,7 +13,7 @@
class GrGLMatrixConvolutionEffect : public GrGLSLFragmentProcessor {
public:
GrGLMatrixConvolutionEffect(const GrProcessor&);
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
index c7e685f..150b5b3 100644
--- a/src/gpu/effects/GrOvalEffect.cpp
+++ b/src/gpu/effects/GrOvalEffect.cpp
@@ -93,7 +93,7 @@
class GLCircleEffect : public GrGLSLFragmentProcessor {
public:
- GLCircleEffect(const GrProcessor&);
+ GLCircleEffect() : fPrevRadius(-1.0f) { }
virtual void emitCode(EmitArgs&) override;
@@ -110,10 +110,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLCircleEffect::GLCircleEffect(const GrProcessor&) {
- fPrevRadius = -1.f;
-}
-
void GLCircleEffect::emitCode(EmitArgs& args) {
const CircleEffect& ce = args.fFp.cast<CircleEffect>();
const char *circleName;
@@ -180,7 +176,7 @@
}
GrGLSLFragmentProcessor* CircleEffect::onCreateGLSLInstance() const {
- return new GLCircleEffect(*this);
+ return new GLCircleEffect;
}
//////////////////////////////////////////////////////////////////////////////
@@ -265,9 +261,11 @@
class GLEllipseEffect : public GrGLSLFragmentProcessor {
public:
- GLEllipseEffect(const GrProcessor&);
+ GLEllipseEffect() {
+ fPrevRadii.fX = -1.0f;
+ }
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
@@ -283,10 +281,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLEllipseEffect::GLEllipseEffect(const GrProcessor& effect) {
- fPrevRadii.fX = -1.f;
-}
-
void GLEllipseEffect::emitCode(EmitArgs& args) {
const EllipseEffect& ee = args.fFp.cast<EllipseEffect>();
const char *ellipseName;
@@ -392,7 +386,7 @@
}
GrGLSLFragmentProcessor* EllipseEffect::onCreateGLSLInstance() const {
- return new GLEllipseEffect(*this);
+ return new GLEllipseEffect;
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index 0b49276..44bd928 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -129,7 +129,9 @@
class GLCircularRRectEffect : public GrGLSLFragmentProcessor {
public:
- GLCircularRRectEffect(const GrProcessor&);
+ GLCircularRRectEffect() {
+ fPrevRRect.setEmpty();
+ }
virtual void emitCode(EmitArgs&) override;
@@ -145,10 +147,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLCircularRRectEffect::GLCircularRRectEffect(const GrProcessor& ) {
- fPrevRRect.setEmpty();
-}
-
void GLCircularRRectEffect::emitCode(EmitArgs& args) {
const CircularRRectEffect& crre = args.fFp.cast<CircularRRectEffect>();
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -382,7 +380,7 @@
}
GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLSLInstance() const {
- return new GLCircularRRectEffect(*this);
+ return new GLCircularRRectEffect;
}
//////////////////////////////////////////////////////////////////////////////
@@ -486,9 +484,11 @@
class GLEllipticalRRectEffect : public GrGLSLFragmentProcessor {
public:
- GLEllipticalRRectEffect(const GrProcessor&);
+ GLEllipticalRRectEffect() {
+ fPrevRRect.setEmpty();
+ }
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
@@ -503,10 +503,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GLEllipticalRRectEffect::GLEllipticalRRectEffect(const GrProcessor& effect) {
- fPrevRRect.setEmpty();
-}
-
void GLEllipticalRRectEffect::emitCode(EmitArgs& args) {
const EllipticalRRectEffect& erre = args.fFp.cast<EllipticalRRectEffect>();
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -679,7 +675,7 @@
}
GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLSLInstance() const {
- return new GLEllipticalRRectEffect(*this);
+ return new GLEllipticalRRectEffect;
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp
index 74e8624..6f47b04 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.cpp
+++ b/src/gpu/effects/GrSimpleTextureEffect.cpp
@@ -13,9 +13,7 @@
class GrGLSimpleTextureEffect : public GrGLSLFragmentProcessor {
public:
- GrGLSimpleTextureEffect(const GrProcessor&) {}
-
- virtual void emitCode(EmitArgs& args) override {
+ void emitCode(EmitArgs& args) override {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
fragBuilder->codeAppendf("\t%s = ", args.fOutputColor);
fragBuilder->appendTextureLookupAndModulate(args.fInputColor,
@@ -41,7 +39,7 @@
}
GrGLSLFragmentProcessor* GrSimpleTextureEffect::onCreateGLSLInstance() const {
- return new GrGLSimpleTextureEffect(*this);
+ return new GrGLSimpleTextureEffect;
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 00e8e82..2bba9b6 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -176,9 +176,7 @@
class GrGLTextureDomainEffect : public GrGLSLFragmentProcessor {
public:
- GrGLTextureDomainEffect(const GrProcessor&);
-
- virtual void emitCode(EmitArgs&) override;
+ void emitCode(EmitArgs&) override;
static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
@@ -190,9 +188,6 @@
typedef GrGLSLFragmentProcessor INHERITED;
};
-GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProcessor&) {
-}
-
void GrGLTextureDomainEffect::emitCode(EmitArgs& args) {
const GrTextureDomainEffect& textureDomainEffect = args.fFp.cast<GrTextureDomainEffect>();
const GrTextureDomain& domain = textureDomainEffect.textureDomain();
@@ -261,7 +256,7 @@
}
GrGLSLFragmentProcessor* GrTextureDomainEffect::onCreateGLSLInstance() const {
- return new GrGLTextureDomainEffect(*this);
+ return new GrGLTextureDomainEffect;
}
bool GrTextureDomainEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index c83d6be..7a358d6 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -59,8 +59,6 @@
class GLComposeTwoFragmentProcessor : public GrGLSLFragmentProcessor {
public:
- GLComposeTwoFragmentProcessor(const GrProcessor& processor) {}
-
void emitCode(EmitArgs&) override;
private:
@@ -82,7 +80,7 @@
}
GrGLSLFragmentProcessor* ComposeTwoFragmentProcessor::onCreateGLSLInstance() const{
- return new GLComposeTwoFragmentProcessor(*this);
+ return new GLComposeTwoFragmentProcessor;
}
/////////////////////////////////////////////////////////////////////
@@ -229,8 +227,6 @@
class GLComposeOneFragmentProcessor : public GrGLSLFragmentProcessor {
public:
- GLComposeOneFragmentProcessor(const GrProcessor& processor) {}
-
void emitCode(EmitArgs& args) override {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
SkXfermode::Mode mode = args.fFp.cast<ComposeOneFragmentProcessor>().mode();
@@ -278,7 +274,7 @@
}
GrGLSLFragmentProcessor* ComposeOneFragmentProcessor::onCreateGLSLInstance() const {
- return new GLComposeOneFragmentProcessor(*this);
+ return new GLComposeOneFragmentProcessor;
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/effects/GrYUVEffect.cpp b/src/gpu/effects/GrYUVEffect.cpp
index e4d9d61..a227e05 100644
--- a/src/gpu/effects/GrYUVEffect.cpp
+++ b/src/gpu/effects/GrYUVEffect.cpp
@@ -98,8 +98,6 @@
// this class always generates the same code.
static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {}
- GLSLProcessor(const GrProcessor&) {}
-
void emitCode(EmitArgs& args) override {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
@@ -164,7 +162,7 @@
}
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
- return new GLSLProcessor(*this);
+ return new GLSLProcessor;
}
void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
@@ -225,7 +223,7 @@
class GLSLProcessor : public GrGLSLFragmentProcessor {
public:
- GLSLProcessor(const GrProcessor&) : fLastColorSpace(-1), fLastOutputChannels(-1) {}
+ GLSLProcessor() : fLastColorSpace(-1), fLastOutputChannels(-1) {}
void emitCode(EmitArgs& args) override {
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
@@ -320,7 +318,7 @@
private:
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
- return new GLSLProcessor(*this);
+ return new GLSLProcessor;
}
void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {