From 587e08f361ee3e775a6bbc6dca761dbba82e422c Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 27 Jan 2017 10:59:27 -0500 Subject: Revert "Revert "Start of rewrite of GrFragmentProcessor optimizations."" This reverts commit 052fd5158f7f85e478a9f87c45fecaacf7d0f5f3. Disables the test (of unused code) until platform-specific issues are addressed. Change-Id: I7aa23a07954fccf382aa07d28afcbffb0bebcd6d Reviewed-on: https://skia-review.googlesource.com/7656 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- .../SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'experimental') diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index de5cfab039..c9fca4bd55 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -675,17 +675,17 @@ private: inout->setToUnknown(); } - GrPerlinNoise2Effect(SkPerlinNoiseShader2::Type type, - int numOctaves, bool stitchTiles, - SkPerlinNoiseShader2::PaintingData* paintingData, - GrTexture* permutationsTexture, GrTexture* noiseTexture, - const SkMatrix& matrix) - : fType(type) - , fNumOctaves(numOctaves) - , fStitchTiles(stitchTiles) - , fPermutationsSampler(permutationsTexture) - , fNoiseSampler(noiseTexture) - , fPaintingData(paintingData) { + GrPerlinNoise2Effect(SkPerlinNoiseShader2::Type type, int numOctaves, bool stitchTiles, + SkPerlinNoiseShader2::PaintingData* paintingData, + GrTexture* permutationsTexture, GrTexture* noiseTexture, + const SkMatrix& matrix) + : INHERITED(kNone_OptimizationFlags) + , fType(type) + , fNumOctaves(numOctaves) + , fStitchTiles(stitchTiles) + , fPermutationsSampler(permutationsTexture) + , fNoiseSampler(noiseTexture) + , fPaintingData(paintingData) { this->initClassID(); this->addTextureSampler(&fPermutationsSampler); this->addTextureSampler(&fNoiseSampler); @@ -703,7 +703,6 @@ private: TextureSampler fNoiseSampler; SkPerlinNoiseShader2::PaintingData* fPaintingData; -private: typedef GrFragmentProcessor INHERITED; }; @@ -1087,15 +1086,16 @@ private: inout->setToUnknown(); } - GrImprovedPerlinNoiseEffect(int octaves, SkScalar z, + GrImprovedPerlinNoiseEffect(int octaves, SkScalar z, SkPerlinNoiseShader2::PaintingData* paintingData, GrTexture* permutationsTexture, GrTexture* gradientTexture, const SkMatrix& matrix) - : fOctaves(octaves) - , fZ(z) - , fPermutationsSampler(permutationsTexture) - , fGradientSampler(gradientTexture) - , fPaintingData(paintingData) { + : INHERITED(kNone_OptimizationFlags) + , fOctaves(octaves) + , fZ(z) + , fPermutationsSampler(permutationsTexture) + , fGradientSampler(gradientTexture) + , fPaintingData(paintingData) { this->initClassID(); this->addTextureSampler(&fPermutationsSampler); this->addTextureSampler(&fGradientSampler); @@ -1112,7 +1112,6 @@ private: TextureSampler fGradientSampler; SkPerlinNoiseShader2::PaintingData* fPaintingData; -private: typedef GrFragmentProcessor INHERITED; }; -- cgit v1.2.3