| Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| index 96dea3eb1cc17c047e4b2794e9b482874f1be592..28220a72ec72dcf2b7489e79587de8d961a1c1f9 100755
|
| --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| @@ -252,7 +252,7 @@
|
| return SkNEW_ARGS(GrGLDistanceFieldTextureEffect, (*this, bt));
|
| }
|
|
|
| -void GrDistanceFieldTextureEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
|
| +void GrDistanceFieldTextureEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
|
| DistanceFieldBatchTracker* local = bt->cast<DistanceFieldBatchTracker>();
|
| local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init,
|
| SkToBool(fInColor));
|
| @@ -508,7 +508,7 @@
|
| }
|
|
|
| void GrDistanceFieldNoGammaTextureEffect::initBatchTracker(GrBatchTracker* bt,
|
| - const GrPipelineInfo& init) const {
|
| + const InitBT& init) const {
|
| DistanceFieldNoGammaBatchTracker* local = bt->cast<DistanceFieldNoGammaBatchTracker>();
|
| local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init,
|
| SkToBool(fInColor));
|
| @@ -824,7 +824,7 @@
|
| }
|
|
|
| void GrDistanceFieldLCDTextureEffect::initBatchTracker(GrBatchTracker* bt,
|
| - const GrPipelineInfo& init) const {
|
| + const InitBT& init) const {
|
| DistanceFieldLCDBatchTracker* local = bt->cast<DistanceFieldLCDBatchTracker>();
|
| local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false);
|
| local->fUsesLocalCoords = init.fUsesLocalCoords;
|
|
|