| Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| index d5d334805c105eb56012bf8729353df9b1b99655..094d54c53f86865f96e4cbb099819c51b94710b4 100755
|
| --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| @@ -206,14 +206,14 @@ bool GrDistanceFieldTextureEffect::onIsEqual(const GrProcessor& other) const {
|
| fFlags == cte.fFlags;
|
| }
|
|
|
| -void GrDistanceFieldTextureEffect::getConstantColorComponents(GrColor* color,
|
| - uint32_t* validFlags) const {
|
| - if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
|
| - GrPixelConfigIsOpaque(this->texture(0)->config())) {
|
| - *validFlags = kA_GrColorComponentFlag;
|
| +void GrDistanceFieldTextureEffect::onComputeInvarientOutput(
|
| + InvarientOutput* invarientOutput) const {
|
| + if (invarientOutput->hasOpaqueAlpha() && GrPixelConfigIsOpaque(this->texture(0)->config())) {
|
| + invarientOutput->validFlags = kA_GrColorComponentFlag;
|
| } else {
|
| - *validFlags = 0;
|
| + invarientOutput->validFlags = 0;
|
| }
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendGeometryProcessorFactory& GrDistanceFieldTextureEffect::getFactory() const {
|
| @@ -476,14 +476,14 @@ bool GrDistanceFieldLCDTextureEffect::onIsEqual(const GrProcessor& other) const
|
| fFlags == cte.fFlags);
|
| }
|
|
|
| -void GrDistanceFieldLCDTextureEffect::getConstantColorComponents(GrColor* color,
|
| - uint32_t* validFlags) const {
|
| - if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
|
| - GrPixelConfigIsOpaque(this->texture(0)->config())) {
|
| - *validFlags = kA_GrColorComponentFlag;
|
| +void GrDistanceFieldLCDTextureEffect::onComputeInvarientOutput(
|
| + InvarientOutput* invarientOutput) const {
|
| + if (invarientOutput->hasOpaqueAlpha() && GrPixelConfigIsOpaque(this->texture(0)->config())) {
|
| + invarientOutput->validFlags = kA_GrColorComponentFlag;
|
| } else {
|
| - *validFlags = 0;
|
| + invarientOutput->validFlags = 0;
|
| }
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendGeometryProcessorFactory& GrDistanceFieldLCDTextureEffect::getFactory() const {
|
|
|