| Index: src/gpu/effects/GrConvolutionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
|
| index 5fd62b8cdfeed43f75604c31fae950b0d3c88e6c..071106e0c8977d79c7c5a5d356003858bebdd00b 100644
|
| --- a/src/gpu/effects/GrConvolutionEffect.cpp
|
| +++ b/src/gpu/effects/GrConvolutionEffect.cpp
|
| @@ -145,14 +145,13 @@ void GrGLConvolutionEffect::GenKey(const GrProcessor& processor, const GrGLSLCap
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrConvolutionEffect::GrConvolutionEffect(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture,
|
| Direction direction,
|
| int radius,
|
| const float* kernel,
|
| bool useBounds,
|
| float bounds[2])
|
| - : INHERITED(procDataManager, texture, direction, radius), fUseBounds(useBounds) {
|
| + : INHERITED(texture, direction, radius), fUseBounds(useBounds) {
|
| this->initClassID<GrConvolutionEffect>();
|
| SkASSERT(radius <= kMaxKernelRadius);
|
| SkASSERT(kernel);
|
| @@ -163,14 +162,13 @@ GrConvolutionEffect::GrConvolutionEffect(GrProcessorDataManager* procDataManager
|
| memcpy(fBounds, bounds, sizeof(fBounds));
|
| }
|
|
|
| -GrConvolutionEffect::GrConvolutionEffect(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture,
|
| Direction direction,
|
| int radius,
|
| float gaussianSigma,
|
| bool useBounds,
|
| float bounds[2])
|
| - : INHERITED(procDataManager, texture, direction, radius), fUseBounds(useBounds) {
|
| + : INHERITED(texture, direction, radius), fUseBounds(useBounds) {
|
| this->initClassID<GrConvolutionEffect>();
|
| SkASSERT(radius <= kMaxKernelRadius);
|
| int width = this->width();
|
| @@ -232,8 +230,7 @@ const GrFragmentProcessor* GrConvolutionEffect::TestCreate(GrProcessorTestData*
|
| }
|
|
|
| bool useBounds = d->fRandom->nextBool();
|
| - return GrConvolutionEffect::Create(d->fProcDataManager,
|
| - d->fTextures[texIdx],
|
| + return GrConvolutionEffect::Create(d->fTextures[texIdx],
|
| dir,
|
| radius,
|
| kernel,
|
|
|