src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 577593003: Revert of removing GrDrawEffect

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

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

Patch Set: 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 28035efa86244d93fddcf69a690016abb6c7868c..b689c8f6a1432ebd649f5d42c2ed5f0611ca5590 100755

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

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

@@ -32,7 +32,7 @@

class GrGLDistanceFieldTextureEffect : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldTextureEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect)

+ const GrDrawEffect& drawEffect)

: INHERITED (factory)

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

#ifdef SK_GAMMA_APPLY_TO_A8

@@ -41,14 +41,14 @@

{}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrEffect& effect,

+ const GrDrawEffect& drawEffect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) SK_OVERRIDE {

const GrDistanceFieldTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldTextureEffect>();

+ drawEffect.castEffect<GrDistanceFieldTextureEffect>();

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

GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

@@ -131,10 +131,10 @@

}

virtual void setData(const GrGLProgramDataManager& pdman,

- const GrEffect& effect) SK_OVERRIDE {

+ const GrDrawEffect& drawEffect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

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

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

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

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

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

@@ -144,7 +144,7 @@

}

#ifdef SK_GAMMA_APPLY_TO_A8

const GrDistanceFieldTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldTextureEffect>();

+ drawEffect.castEffect<GrDistanceFieldTextureEffect>();

float luminance = dfTexEffect.getLuminance();

if (luminance != fLuminance) {

pdman.set1f(fLuminanceUni, luminance);

@@ -153,10 +153,10 @@

#endif

}

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

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

GrEffectKeyBuilder* b) {

const GrDistanceFieldTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldTextureEffect>();

+ drawEffect.castEffect<GrDistanceFieldTextureEffect>();

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

}

@@ -197,7 +197,7 @@

}

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

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

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

return fTextureAccess == cte.fTextureAccess &&

#ifdef SK_GAMMA_APPLY_TO_A8

fGammaTextureAccess == cte.fGammaTextureAccess &&

@@ -264,20 +264,20 @@

class GrGLDistanceFieldLCDTextureEffect : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldLCDTextureEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect)

+ const GrDrawEffect& drawEffect)

: INHERITED (factory)

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

, fTextColor(GrColor_ILLEGAL) {}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrEffect& effect,

+ const GrDrawEffect& drawEffect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) SK_OVERRIDE {

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldLCDTextureEffect>();

+ drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

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

SkString fsCoordName;

@@ -400,13 +400,13 @@

}

virtual void setData(const GrGLProgramDataManager& pdman,

- const GrEffect& effect) SK_OVERRIDE {

+ const GrDrawEffect& drawEffect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

SkASSERT(fTextColorUni.isValid());

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldLCDTextureEffect>();

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

+ drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

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

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

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

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

@@ -431,10 +431,10 @@

}

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

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

GrEffectKeyBuilder* b) {

const GrDistanceFieldLCDTextureEffect& dfTexEffect =

- effect.cast<GrDistanceFieldLCDTextureEffect>();

+ drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();

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

}

@@ -469,7 +469,8 @@

}

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

- const GrDistanceFieldLCDTextureEffect& cte = other.cast<GrDistanceFieldLCDTextureEffect>();

+ const GrDistanceFieldLCDTextureEffect& cte =

+ CastEffect<GrDistanceFieldLCDTextureEffect>(other);

return (fTextureAccess == cte.fTextureAccess &&

fGammaTextureAccess == cte.fGammaTextureAccess &&

fTextColor == cte.fTextColor &&

« no previous file with comments | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/effects/GrDitherEffect.cpp » ('j') | no next file with comments »