src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 571163002: removing GrDrawEffect

Unified Diff: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

Issue 571163002: removing GrDrawEffect (Closed) Base URL: https://skia.googlesource.com/skia.git@gp3

Patch Set: rebase Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

index ee7dd61387033af947a0920c32911e12235a860f..2253c31d16ce297fa8b1e3fb643cafaebad8ef83 100755

--- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

@@ -32,19 +32,19 @@

class GrGLDistanceFieldTextureEffect : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldTextureEffect(const GrBackendEffectFactory& factory,

- const GrDrawEffect& drawEffect)

+ const GrEffect& effect)

: INHERITED (factory)

, fTextureSize(SkISize::Make(-1,-1)) {}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrDrawEffect& drawEffect,

+ const GrEffect& effect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) SK_OVERRIDE {

const GrDistanceFieldTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldTextureEffect>();

+ GrEffect::CastEffect<GrDistanceFieldTextureEffect>(effect);

SkASSERT(1 == dfTexEffect.getVertexAttribs().count());

GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

@@ -127,10 +127,10 @@ public:

}

virtual void setData(const GrGLProgramDataManager& pdman,

- const GrDrawEffect& drawEffect) SK_OVERRIDE {

+ const GrEffect& effect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

- GrTexture* texture = drawEffect.effect()->texture(0);

+ GrTexture* texture = effect.texture(0);

if (texture->width() != fTextureSize.width() ||

texture->height() != fTextureSize.height()) {

fTextureSize = SkISize::Make(texture->width(), texture->height());

@@ -140,7 +140,7 @@ public:

}

#ifdef SK_GAMMA_APPLY_TO_A8

const GrDistanceFieldTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldTextureEffect>();

+ GrEffect::CastEffect<GrDistanceFieldTextureEffect>(effect);

float luminance = dfTexEffect.getLuminance();

if (luminance != fLuminance) {

pdman.set1f(fLuminanceUni, luminance);

@@ -149,10 +149,10 @@ public:

#endif

}

- static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,

+ static inline void GenKey(const GrEffect& effect, const GrGLCaps&,

GrEffectKeyBuilder* b) {

const GrDistanceFieldTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldTextureEffect>();

+ GrEffect::CastEffect<GrDistanceFieldTextureEffect>(effect);

b->add32(dfTexEffect.getFlags());

}

@@ -193,7 +193,8 @@ GrDistanceFieldTextureEffect::GrDistanceFieldTextureEffect(GrTexture* texture,

}

bool GrDistanceFieldTextureEffect::onIsEqual(const GrEffect& other) const {

- const GrDistanceFieldTextureEffect& cte = CastEffect<GrDistanceFieldTextureEffect>(other);

+ const GrDistanceFieldTextureEffect& cte =

+ GrEffect::CastEffect<GrDistanceFieldTextureEffect>(other);

return fTextureAccess == cte.fTextureAccess &&

#ifdef SK_GAMMA_APPLY_TO_A8

fGammaTextureAccess == cte.fGammaTextureAccess &&

@@ -260,19 +261,19 @@ GrEffect* GrDistanceFieldTextureEffect::TestCreate(SkRandom* random,

class GrGLDistanceFieldLCDTextureEffect : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldLCDTextureEffect(const GrBackendEffectFactory& factory,

- const GrDrawEffect& drawEffect)

+ const GrEffect& effect)

: INHERITED (factory)

, fTextureSize(SkISize::Make(-1,-1)) {}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrDrawEffect& drawEffect,

+ const GrEffect& effect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) SK_OVERRIDE {

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

+ GrEffect::CastEffect<GrDistanceFieldLCDTextureEffect>(effect);

SkASSERT(1 == dfTexEffect.getVertexAttribs().count());

SkString fsCoordName;

@@ -395,13 +396,13 @@ public:

}

virtual void setData(const GrGLProgramDataManager& pdman,

- const GrDrawEffect& drawEffect) SK_OVERRIDE {

+ const GrEffect& effect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

SkASSERT(fTextColorUni.isValid());

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

- GrTexture* texture = drawEffect.effect()->texture(0);

+ GrEffect::CastEffect<GrDistanceFieldLCDTextureEffect>(effect);

+ GrTexture* texture = effect.texture(0);

if (texture->width() != fTextureSize.width() ||

texture->height() != fTextureSize.height()) {

fTextureSize = SkISize::Make(texture->width(), texture->height());

@@ -426,10 +427,10 @@ public:

}

- static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,

+ static inline void GenKey(const GrEffect& effect, const GrGLCaps&,

GrEffectKeyBuilder* b) {

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

+ GrEffect::CastEffect<GrDistanceFieldLCDTextureEffect>(effect);

b->add32(dfTexEffect.getFlags());

}

@@ -465,7 +466,7 @@ GrDistanceFieldLCDTextureEffect::GrDistanceFieldLCDTextureEffect(

bool GrDistanceFieldLCDTextureEffect::onIsEqual(const GrEffect& other) const {

const GrDistanceFieldLCDTextureEffect& cte =

- CastEffect<GrDistanceFieldLCDTextureEffect>(other);

+ GrEffect::CastEffect<GrDistanceFieldLCDTextureEffect>(other);

return (fTextureAccess == cte.fTextureAccess &&

fGammaTextureAccess == cte.fGammaTextureAccess &&

fTextColor == cte.fTextColor &&

« include/gpu/GrEffect.h ('K') | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/effects/GrDitherEffect.cpp » ('j') | src/gpu/gl/GrGLEffect.h » ('J')