diff options
| author |  Brian Osman <brianosman@google.com> | 2018-01-03 09:57:29 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-03 15:35:34 +0000 |
| commit | 09068256d6a12a365f36f14c9fa7e3d6b221abec (patch) | |
| tree | ad2d9859231eed88aed7d38571947a97616af344 /src/gpu/effects/GrDistanceFieldGeoProc.cpp | |
| parent | b9bfb7b275d11eb6ba90dc2dfa9cfa9f73cc613e (diff) | |
Remove unused color from all distance field GPs and GrAtlasTextOp
Bug: skia:
Change-Id: I7f2bd68cc4f6ad65660a4415a08777bc71d34ab6
Reviewed-on: https://skia-review.googlesource.com/90522
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/effects/GrDistanceFieldGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index c63ce8f3b2..d8944fa9d0 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -206,7 +206,6 @@ private: /////////////////////////////////////////////////////////////////////////////// GrDistanceFieldA8TextGeoProc::GrDistanceFieldA8TextGeoProc( - GrColor color, const sk_sp<GrTextureProxy> proxies[kMaxTextures], const GrSamplerState& params, #ifdef SK_GAMMA_APPLY_TO_A8 @@ -215,7 +214,6 @@ GrDistanceFieldA8TextGeoProc::GrDistanceFieldA8TextGeoProc( uint32_t flags, const SkMatrix& localMatrix) : INHERITED(kGrDistanceFieldA8TextGeoProc_ClassID) - , fColor(color) #ifdef SK_GAMMA_APPLY_TO_A8 , fDistanceAdjust(distanceAdjust) #endif @@ -285,12 +283,10 @@ sk_sp<GrGeometryProcessor> GrDistanceFieldA8TextGeoProc::TestCreate(GrProcessorT flags |= d->fRandom->nextBool() ? kScaleOnly_DistanceFieldEffectFlag : 0; } SkMatrix localMatrix = GrTest::TestMatrix(d->fRandom); - GrColor color = GrRandomColor(d->fRandom); #ifdef SK_GAMMA_APPLY_TO_A8 float lum = d->fRandom->nextF(); #endif - return GrDistanceFieldA8TextGeoProc::Make(color, - proxies, + return GrDistanceFieldA8TextGeoProc::Make(proxies, samplerState, #ifdef SK_GAMMA_APPLY_TO_A8 lum, @@ -494,13 +490,11 @@ private: /////////////////////////////////////////////////////////////////////////////// GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc( - GrColor color, const SkMatrix& matrix, const sk_sp<GrTextureProxy> proxies[kMaxTextures], const GrSamplerState& params, uint32_t flags) : INHERITED(kGrDistanceFieldPathGeoProc_ClassID) - , fColor(color) , fMatrix(matrix) , fFlags(flags & kNonLCD_DistanceFieldEffectMask) , fInColor(nullptr) { @@ -563,8 +557,7 @@ sk_sp<GrGeometryProcessor> GrDistanceFieldPathGeoProc::TestCreate(GrProcessorTes flags |= d->fRandom->nextBool() ? kScaleOnly_DistanceFieldEffectFlag : 0; } - return GrDistanceFieldPathGeoProc::Make(GrRandomColor(d->fRandom), - GrTest::TestMatrix(d->fRandom), + return GrDistanceFieldPathGeoProc::Make(GrTest::TestMatrix(d->fRandom), proxies, samplerState, flags); @@ -791,14 +784,12 @@ private: /////////////////////////////////////////////////////////////////////////////// GrDistanceFieldLCDTextGeoProc::GrDistanceFieldLCDTextGeoProc( - GrColor color, const sk_sp<GrTextureProxy> proxies[kMaxTextures], const GrSamplerState& params, DistanceAdjust distanceAdjust, uint32_t flags, const SkMatrix& localMatrix) : INHERITED(kGrDistanceFieldLCDTextGeoProc_ClassID) - , fColor(color) , fDistanceAdjust(distanceAdjust) , fFlags(flags & kLCD_DistanceFieldEffectMask) , fLocalMatrix(localMatrix) { @@ -864,9 +855,7 @@ sk_sp<GrGeometryProcessor> GrDistanceFieldLCDTextGeoProc::TestCreate(GrProcessor flags |= d->fRandom->nextBool() ? kScaleOnly_DistanceFieldEffectFlag : 0; } flags |= d->fRandom->nextBool() ? kBGR_DistanceFieldEffectFlag : 0; - GrColor color = GrRandomColor(d->fRandom); SkMatrix localMatrix = GrTest::TestMatrix(d->fRandom); - return GrDistanceFieldLCDTextGeoProc::Make(color, proxies, samplerState, wa, flags, - localMatrix); + return GrDistanceFieldLCDTextGeoProc::Make(proxies, samplerState, wa, flags, localMatrix); } #endif |