| Index: src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| index 358f8082f22bf5ab22f763aefc6cebe7dcd86d6c..1046509ca09c1e8a37b4b7c783bd1b35c0b7f275 100644
|
| --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| @@ -138,8 +138,8 @@ GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture,
|
| SkScalar bias,
|
| const SkIPoint& kernelOffset,
|
| GrTextureDomain::Mode tileMode,
|
| - bool convolveAlpha)
|
| - : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture)),
|
| + bool convolveAlpha, GrRenderTarget* dst)
|
| + : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture), kLocal_GrCoordSet, dst),
|
| fKernelSize(kernelSize),
|
| fGain(SkScalarToFloat(gain)),
|
| fBias(SkScalarToFloat(bias) / 255.0f),
|
| @@ -188,7 +188,7 @@ GrMatrixConvolutionEffect::CreateGaussian(GrTexture* texture,
|
| GrTextureDomain::Mode tileMode,
|
| bool convolveAlpha,
|
| SkScalar sigmaX,
|
| - SkScalar sigmaY) {
|
| + SkScalar sigmaY, GrRenderTarget* dst) {
|
| float kernel[MAX_KERNEL_SIZE];
|
| int width = kernelSize.width();
|
| int height = kernelSize.height();
|
| @@ -215,8 +215,8 @@ GrMatrixConvolutionEffect::CreateGaussian(GrTexture* texture,
|
| for (int i = 0; i < width * height; ++i) {
|
| kernel[i] *= scale;
|
| }
|
| - return new GrMatrixConvolutionEffect(texture, bounds, kernelSize, kernel, gain, bias,
|
| - kernelOffset, tileMode, convolveAlpha);
|
| + return new GrMatrixConvolutionEffect(texture, bounds, kernelSize, kernel, gain,
|
| + bias, kernelOffset, tileMode, convolveAlpha, dst);
|
| }
|
|
|
| GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMatrixConvolutionEffect);
|
| @@ -250,5 +250,5 @@ const GrFragmentProcessor* GrMatrixConvolutionEffect::TestCreate(GrProcessorTest
|
| bias,
|
| kernelOffset,
|
| tileMode,
|
| - convolveAlpha);
|
| + convolveAlpha, NULL);
|
| }
|
|
|