| Index: src/gpu/GrAtlasTextContext.cpp
|
| diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
|
| index 81769db6ec149a7b0126f29f9f963441d1951bc5..6cfd13bcf42183cc751e6f992d687fcbb617c1cc 100644
|
| --- a/src/gpu/GrAtlasTextContext.cpp
|
| +++ b/src/gpu/GrAtlasTextContext.cpp
|
| @@ -1534,14 +1534,10 @@ public:
|
| texture));
|
| } else {
|
| GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
|
| -
|
| - // This will be ignored in the non A8 case
|
| - bool opaqueVertexColors = GrColorIsOpaque(this->color());
|
| gp.reset(GrBitmapTextGeoProc::Create(this->color(),
|
| texture,
|
| params,
|
| fMaskFormat,
|
| - opaqueVertexColors,
|
| localMatrix));
|
| }
|
|
|
| @@ -2000,7 +1996,6 @@ private:
|
| flags);
|
| } else {
|
| flags |= kColorAttr_DistanceFieldEffectFlag;
|
| - bool opaque = GrColorIsOpaque(color);
|
| #ifdef SK_GAMMA_APPLY_TO_A8
|
| U8CPU lum = SkColorSpaceLuminance::computeLuminance(fGamma, filteredColor);
|
| float correction = (*fDistanceAdjustTable)[lum >> kDistanceAdjustLumShift];
|
| @@ -2009,15 +2004,13 @@ private:
|
| texture,
|
| params,
|
| correction,
|
| - flags,
|
| - opaque);
|
| + flags);
|
| #else
|
| return GrDistanceFieldA8TextGeoProc::Create(color,
|
| viewMatrix,
|
| texture,
|
| params,
|
| - flags,
|
| - opaque);
|
| + flags);
|
| #endif
|
| }
|
|
|
|
|