| Index: src/gpu/effects/GrBicubicEffect.cpp
|
| diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp
|
| index d8a9726030063438f4c1a1e8b44e435da8990ca9..afcb55e8e8543eb10a10452e2bfc1f0c2dc0c8f6 100644
|
| --- a/src/gpu/effects/GrBicubicEffect.cpp
|
| +++ b/src/gpu/effects/GrBicubicEffect.cpp
|
| @@ -126,24 +126,21 @@ static inline void convert_row_major_scalar_coeffs_to_column_major_floats(float
|
| }
|
| }
|
|
|
| -GrBicubicEffect::GrBicubicEffect(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrBicubicEffect::GrBicubicEffect(GrTexture* texture,
|
| const SkScalar coefficients[16],
|
| const SkMatrix &matrix,
|
| const SkShader::TileMode tileModes[2])
|
| - : INHERITED(procDataManager, texture, matrix,
|
| - GrTextureParams(tileModes, GrTextureParams::kNone_FilterMode))
|
| + : INHERITED(texture, matrix, GrTextureParams(tileModes, GrTextureParams::kNone_FilterMode))
|
| , fDomain(GrTextureDomain::IgnoredDomain()) {
|
| this->initClassID<GrBicubicEffect>();
|
| convert_row_major_scalar_coeffs_to_column_major_floats(fCoefficients, coefficients);
|
| }
|
|
|
| -GrBicubicEffect::GrBicubicEffect(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrBicubicEffect::GrBicubicEffect(GrTexture* texture,
|
| const SkScalar coefficients[16],
|
| const SkMatrix &matrix,
|
| const SkRect& domain)
|
| - : INHERITED(procDataManager, texture, matrix,
|
| + : INHERITED(texture, matrix,
|
| GrTextureParams(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode))
|
| , fDomain(domain, GrTextureDomain::kClamp_Mode) {
|
| this->initClassID<GrBicubicEffect>();
|
| @@ -182,7 +179,7 @@ const GrFragmentProcessor* GrBicubicEffect::TestCreate(GrProcessorTestData* d) {
|
| for (int i = 0; i < 16; i++) {
|
| coefficients[i] = d->fRandom->nextSScalar1();
|
| }
|
| - return GrBicubicEffect::Create(d->fProcDataManager, d->fTextures[texIdx], coefficients);
|
| + return GrBicubicEffect::Create(d->fTextures[texIdx], coefficients);
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|