diff options
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkColorMatrixFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 8 | ||||
-rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkTableColorFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkLinearGradient.cpp | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkRadialGradient.cpp | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkSweepGradient.cpp | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.cpp | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 4 |
11 files changed, 24 insertions, 24 deletions
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 77f99963f7..cd7f1551fa 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -337,7 +337,7 @@ public: return cme.fMatrix == fMatrix; } - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; class GLProgramStage : public GrGLLegacyProgramStage { public: @@ -412,7 +412,7 @@ private: typedef GrGLLegacyProgramStage INHERITED; }; -GR_DEFINE_CUSTOM_STAGE_TEST(ColorMatrixEffect); +GR_DEFINE_EFFECT_TEST(ColorMatrixEffect); GrEffect* ColorMatrixEffect::TestCreate(SkRandom* random, GrContext*, diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index ab962fb2b7..267ce99a54 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -332,7 +332,7 @@ public: virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; SkScalar kd() const { return fKD; } private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrLightingEffect INHERITED; SkScalar fKD; }; @@ -355,7 +355,7 @@ public: SkScalar shininess() const { return fShininess; } private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrLightingEffect INHERITED; SkScalar fKS; SkScalar fShininess; @@ -1038,7 +1038,7 @@ bool GrDiffuseLightingEffect::isEqual(const GrEffect& sBase) const { this->kd() == s.kd(); } -GR_DEFINE_CUSTOM_STAGE_TEST(GrDiffuseLightingEffect); +GR_DEFINE_EFFECT_TEST(GrDiffuseLightingEffect); GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random, GrContext* context, @@ -1244,7 +1244,7 @@ bool GrSpecularLightingEffect::isEqual(const GrEffect& sBase) const { this->shininess() == s.shininess(); } -GR_DEFINE_CUSTOM_STAGE_TEST(GrSpecularLightingEffect); +GR_DEFINE_EFFECT_TEST(GrSpecularLightingEffect); GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 5ce00e943b..c25e951ccf 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -57,7 +57,7 @@ public: typedef GrGLMagnifierEffect GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; float fXOffset; float fYOffset; @@ -181,7 +181,7 @@ GrGLProgramStage::StageKey GrGLMagnifierEffect::GenKey(const GrEffect& s, ///////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrMagnifierEffect); +GR_DEFINE_EFFECT_TEST(GrMagnifierEffect); GrEffect* GrMagnifierEffect::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 2f6d71ca88..988c9018cb 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -274,7 +274,7 @@ private: TileMode fTileMode; bool fConvolveAlpha; - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrSingleTextureEffect INHERITED; }; @@ -486,7 +486,7 @@ bool GrMatrixConvolutionEffect::isEqual(const GrEffect& sBase) const { fConvolveAlpha == s.convolveAlpha(); } -GR_DEFINE_CUSTOM_STAGE_TEST(GrMatrixConvolutionEffect); +GR_DEFINE_EFFECT_TEST(GrMatrixConvolutionEffect); // A little bit less than the minimum # uniforms required by DX9SM2 (32). // Allows for a 5x5 kernel (or 25x1, for that matter). diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index fb82f4f4cf..8df5def977 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -259,7 +259,7 @@ protected: MorphologyType fType; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef Gr1DKernelEffect INHERITED; }; @@ -398,7 +398,7 @@ bool GrMorphologyEffect::isEqual(const GrEffect& sBase) const { /////////////////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrMorphologyEffect); +GR_DEFINE_EFFECT_TEST(GrMorphologyEffect); GrEffect* GrMorphologyEffect::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index cbbf7e1fc7..1412952ef7 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -237,7 +237,7 @@ public: typedef GLColorTableEffect GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; GrTextureAccess fTextureAccess; @@ -342,7 +342,7 @@ const GrTextureAccess& ColorTableEffect::textureAccess(int index) const { /////////////////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(ColorTableEffect); +GR_DEFINE_EFFECT_TEST(ColorTableEffect); GrEffect* ColorTableEffect::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 21b415d58b..2de4fc6187 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -515,14 +515,14 @@ public: typedef GrGLLinearGradient GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrGradientEffect INHERITED; }; ///////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrLinearGradient); +GR_DEFINE_EFFECT_TEST(GrLinearGradient); GrEffect* GrLinearGradient::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 74d16d56cc..dbf5e7e009 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -514,14 +514,14 @@ public: typedef GrGLRadialGradient GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrGradientEffect INHERITED; }; ///////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrRadialGradient); +GR_DEFINE_EFFECT_TEST(GrRadialGradient); GrEffect* GrRadialGradient::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 365507b98f..11e1a78a13 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -422,14 +422,14 @@ public: typedef GrGLSweepGradient GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; typedef GrGradientEffect INHERITED; }; ///////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrSweepGradient); +GR_DEFINE_EFFECT_TEST(GrSweepGradient); GrEffect* GrSweepGradient::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 4472d03d9f..4e85c73367 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -398,7 +398,7 @@ public: typedef GrGLConical2Gradient GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; // @{ // Cache of values - these can change arbitrarily, EXCEPT @@ -413,7 +413,7 @@ private: typedef GrGradientEffect INHERITED; }; -GR_DEFINE_CUSTOM_STAGE_TEST(GrConical2Gradient); +GR_DEFINE_EFFECT_TEST(GrConical2Gradient); GrEffect* GrConical2Gradient::TestCreate(SkRandom* random, GrContext* context, diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 78220f8d2a..d4ce9fa931 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -430,7 +430,7 @@ public: typedef GrGLRadial2Gradient GLProgramStage; private: - GR_DECLARE_CUSTOM_STAGE_TEST; + GR_DECLARE_EFFECT_TEST; // @{ // Cache of values - these can change arbitrarily, EXCEPT @@ -447,7 +447,7 @@ private: ///////////////////////////////////////////////////////////////////// -GR_DEFINE_CUSTOM_STAGE_TEST(GrRadial2Gradient); +GR_DEFINE_EFFECT_TEST(GrRadial2Gradient); GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random, GrContext* context, |