| Index: src/effects/SkPerlinNoiseShader.cpp
|
| diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp
|
| index 045f3beff2845ec55fa9fd0c47d4d1fc590d9cac..3971a7943fac07a7a88ee0bda4542a9e169f3673 100644
|
| --- a/src/effects/SkPerlinNoiseShader.cpp
|
| +++ b/src/effects/SkPerlinNoiseShader.cpp
|
| @@ -516,9 +516,9 @@ public:
|
| int numOctaves, bool stitchTiles,
|
| SkPerlinNoiseShader::PaintingData* paintingData,
|
| GrTexture* permutationsTexture, GrTexture* noiseTexture,
|
| - const SkMatrix& matrix) {
|
| + const SkMatrix& matrix, GrRenderTarget* dst) {
|
| return new GrPerlinNoiseEffect(type, numOctaves, stitchTiles, paintingData,
|
| - permutationsTexture, noiseTexture, matrix);
|
| + permutationsTexture, noiseTexture, matrix, dst);
|
| }
|
|
|
| virtual ~GrPerlinNoiseEffect() { delete fPaintingData; }
|
| @@ -560,12 +560,12 @@ private:
|
| int numOctaves, bool stitchTiles,
|
| SkPerlinNoiseShader::PaintingData* paintingData,
|
| GrTexture* permutationsTexture, GrTexture* noiseTexture,
|
| - const SkMatrix& matrix)
|
| + const SkMatrix& matrix, GrRenderTarget* dst)
|
| : fType(type)
|
| , fNumOctaves(numOctaves)
|
| , fStitchTiles(stitchTiles)
|
| - , fPermutationsAccess(permutationsTexture)
|
| - , fNoiseAccess(noiseTexture)
|
| + , fPermutationsAccess(permutationsTexture, GrTextureParams::kNone_FilterMode,SkShader::kClamp_TileMode, dst)
|
| + , fNoiseAccess(noiseTexture, GrTextureParams::kNone_FilterMode,SkShader::kClamp_TileMode, dst)
|
| , fPaintingData(paintingData) {
|
| this->initClassID<GrPerlinNoiseEffect>();
|
| this->addTextureAccess(&fPermutationsAccess);
|
| @@ -611,7 +611,8 @@ const GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData*
|
| GrPaint grPaint;
|
| return shader->asFragmentProcessor(d->fContext,
|
| GrTest::TestMatrix(d->fRandom), nullptr,
|
| - kNone_SkFilterQuality);
|
| + kNone_SkFilterQuality,
|
| + NULL);
|
| }
|
|
|
| GrGLPerlinNoise::GrGLPerlinNoise(const GrProcessor& processor)
|
| @@ -917,7 +918,8 @@ const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(
|
| GrContext* context,
|
| const SkMatrix& viewM,
|
| const SkMatrix* externalLocalMatrix,
|
| - SkFilterQuality) const {
|
| + SkFilterQuality,
|
| + GrRenderTarget* dst) const {
|
| SkASSERT(context);
|
|
|
| SkMatrix localMatrix = this->getLocalMatrix();
|
| @@ -962,7 +964,7 @@ const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(
|
| fStitchTiles,
|
| paintingData,
|
| permutationsTexture, noiseTexture,
|
| - m));
|
| + m, dst));
|
| return GrFragmentProcessor::MulOutputByInputAlpha(inner);
|
| }
|
| delete paintingData;
|
|
|