diff options
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 12 | ||||
-rw-r--r-- | src/effects/SkColorMatrixFilter.cpp | 22 | ||||
-rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 62 | ||||
-rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 26 | ||||
-rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 24 | ||||
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 22 | ||||
-rw-r--r-- | src/effects/SkTableColorFilter.cpp | 32 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 8 | ||||
-rw-r--r-- | src/effects/gradients/SkLinearGradient.cpp | 16 | ||||
-rw-r--r-- | src/effects/gradients/SkRadialGradient.cpp | 16 | ||||
-rw-r--r-- | src/effects/gradients/SkSweepGradient.cpp | 16 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.cpp | 24 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 24 |
14 files changed, 153 insertions, 153 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index b93190f679..b658acc57a 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -113,7 +113,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy, class GrGLBlendEffect : public GrGLLegacyProgramStage { public: GrGLBlendEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual ~GrGLBlendEffect(); virtual void emitFS(GrGLShaderBuilder* builder, @@ -124,7 +124,7 @@ public: virtual void emitVS(GrGLShaderBuilder* builder, const char* vertexCoords) SK_OVERRIDE {} - static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps&); + static inline StageKey GenKey(const GrEffect& s, const GrGLCaps&); private: typedef GrGLLegacyProgramStage INHERITED; @@ -138,7 +138,7 @@ public: GrBlendEffect(SkBlendImageFilter::Mode mode, GrTexture* foreground); virtual ~GrBlendEffect(); - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; const GrProgramStageFactory& getFactory() const; SkBlendImageFilter::Mode mode() const { return fMode; } @@ -224,7 +224,7 @@ GrBlendEffect::GrBlendEffect(SkBlendImageFilter::Mode mode, GrTexture* foregroun GrBlendEffect::~GrBlendEffect() { } -bool GrBlendEffect::isEqual(const GrCustomStage& sBase) const { +bool GrBlendEffect::isEqual(const GrEffect& sBase) const { const GrBlendEffect& s = static_cast<const GrBlendEffect&>(sBase); return INHERITED::isEqual(sBase) && fMode == s.fMode; @@ -237,7 +237,7 @@ const GrProgramStageFactory& GrBlendEffect::getFactory() const { /////////////////////////////////////////////////////////////////////////////// GrGLBlendEffect::GrGLBlendEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory), fMode(static_cast<const GrBlendEffect&>(stage).mode()) { } @@ -275,7 +275,7 @@ void GrGLBlendEffect::emitFS(GrGLShaderBuilder* builder, } } -GrGLProgramStage::StageKey GrGLBlendEffect::GenKey(const GrCustomStage& s, const GrGLCaps&) { +GrGLProgramStage::StageKey GrGLBlendEffect::GenKey(const GrEffect& s, const GrGLCaps&) { return static_cast<const GrBlendEffect&>(s).mode(); } #endif diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 6af7dec8d5..77f99963f7 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -319,20 +319,20 @@ bool SkColorMatrixFilter::asColorMatrix(SkScalar matrix[20]) { } #if SK_SUPPORT_GPU -#include "GrCustomStage.h" +#include "GrEffect.h" #include "gl/GrGLProgramStage.h" -class ColorMatrixEffect : public GrCustomStage { +class ColorMatrixEffect : public GrEffect { public: static const char* Name() { return "Color Matrix"; } - ColorMatrixEffect(const SkColorMatrix& matrix) : GrCustomStage(0), fMatrix(matrix) {} + ColorMatrixEffect(const SkColorMatrix& matrix) : GrEffect(0), fMatrix(matrix) {} virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { return GrTProgramStageFactory<ColorMatrixEffect>::getInstance(); } - virtual bool isEqual(const GrCustomStage& s) const { + virtual bool isEqual(const GrEffect& s) const { const ColorMatrixEffect& cme = static_cast<const ColorMatrixEffect&>(s); return cme.fMatrix == fMatrix; } @@ -342,10 +342,10 @@ public: class GLProgramStage : public GrGLLegacyProgramStage { public: // this class always generates the same code. - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps&) { return 0; } + static StageKey GenKey(const GrEffect& s, const GrGLCaps&) { return 0; } GLProgramStage(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fMatrixHandle(GrGLUniformManager::kInvalidUniformHandle) , fVectorHandle(GrGLUniformManager::kInvalidUniformHandle) { @@ -383,7 +383,7 @@ public: } virtual void setData(const GrGLUniformManager& uniManager, - const GrCustomStage& stage) SK_OVERRIDE { + const GrEffect& stage) SK_OVERRIDE { const ColorMatrixEffect& cme = static_cast<const ColorMatrixEffect&>(stage); const float* m = cme.fMatrix.fMat; // The GL matrix is transposed from SkColorMatrix. @@ -414,9 +414,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(ColorMatrixEffect); -GrCustomStage* ColorMatrixEffect::TestCreate(SkRandom* random, - GrContext*, - GrTexture* dummyTextures[2]) { +GrEffect* ColorMatrixEffect::TestCreate(SkRandom* random, + GrContext*, + GrTexture* dummyTextures[2]) { SkColorMatrix colorMatrix; for (int i = 0; i < SK_ARRAY_COUNT(colorMatrix.fMat); ++i) { colorMatrix.fMat[i] = random->nextSScalar1(); @@ -424,7 +424,7 @@ GrCustomStage* ColorMatrixEffect::TestCreate(SkRandom* random, return SkNEW_ARGS(ColorMatrixEffect, (colorMatrix)); } -GrCustomStage* SkColorMatrixFilter::asNewCustomStage(GrContext*) const { +GrEffect* SkColorMatrixFilter::asNewCustomStage(GrContext*) const { return SkNEW_ARGS(ColorMatrixEffect, (fMatrix)); } diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 6f089b0019..8e98415224 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -18,7 +18,7 @@ #include "effects/GrSingleTextureEffect.h" #include "gl/GrGLProgramStage.h" #include "gl/GrGLTexture.h" -#include "GrCustomStage.h" +#include "GrEffect.h" class GrGLDiffuseLightingEffect; class GrGLSpecularLightingEffect; @@ -264,7 +264,7 @@ public: SkScalar kd, SkImageFilter* input); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiffuseLightingImageFilter) - virtual bool asNewCustomStage(GrCustomStage** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; SkScalar kd() const { return fKD; } protected: @@ -284,7 +284,7 @@ public: SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter) - virtual bool asNewCustomStage(GrCustomStage** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } @@ -307,7 +307,7 @@ public: GrLightingEffect(GrTexture* texture, const SkLight* light, SkScalar surfaceScale); virtual ~GrLightingEffect(); - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; const SkLight* light() const { return fLight; } SkScalar surfaceScale() const { return fSurfaceScale; } @@ -329,7 +329,7 @@ public: typedef GrGLDiffuseLightingEffect GLProgramStage; virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; SkScalar kd() const { return fKD; } private: GR_DECLARE_CUSTOM_STAGE_TEST; @@ -350,7 +350,7 @@ public: typedef GrGLSpecularLightingEffect GLProgramStage; virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } @@ -821,7 +821,7 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy*, return true; } -bool SkDiffuseLightingImageFilter::asNewCustomStage(GrCustomStage** stage, +bool SkDiffuseLightingImageFilter::asNewCustomStage(GrEffect** stage, GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { @@ -890,7 +890,7 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy*, return true; } -bool SkSpecularLightingImageFilter::asNewCustomStage(GrCustomStage** stage, +bool SkSpecularLightingImageFilter::asNewCustomStage(GrEffect** stage, GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { @@ -942,7 +942,7 @@ SkLight* create_random_light(SkRandom* random) { class GrGLLightingEffect : public GrGLLegacyProgramStage { public: GrGLLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual ~GrGLLightingEffect(); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; @@ -955,9 +955,9 @@ public: virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) = 0; - static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); + static inline StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; private: typedef GrGLLegacyProgramStage INHERITED; @@ -972,10 +972,10 @@ private: class GrGLDiffuseLightingEffect : public GrGLLightingEffect { public: GrGLDiffuseLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; private: typedef GrGLLightingEffect INHERITED; @@ -988,10 +988,10 @@ private: class GrGLSpecularLightingEffect : public GrGLLightingEffect { public: GrGLSpecularLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; private: typedef GrGLLightingEffect INHERITED; @@ -1013,7 +1013,7 @@ GrLightingEffect::~GrLightingEffect() { fLight->unref(); } -bool GrLightingEffect::isEqual(const GrCustomStage& sBase) const { +bool GrLightingEffect::isEqual(const GrEffect& sBase) const { const GrLightingEffect& s = static_cast<const GrLightingEffect&>(sBase); return INHERITED::isEqual(sBase) && @@ -1031,7 +1031,7 @@ const GrProgramStageFactory& GrDiffuseLightingEffect::getFactory() const { return GrTProgramStageFactory<GrDiffuseLightingEffect>::getInstance(); } -bool GrDiffuseLightingEffect::isEqual(const GrCustomStage& sBase) const { +bool GrDiffuseLightingEffect::isEqual(const GrEffect& sBase) const { const GrDiffuseLightingEffect& s = static_cast<const GrDiffuseLightingEffect&>(sBase); return INHERITED::isEqual(sBase) && @@ -1040,9 +1040,9 @@ bool GrDiffuseLightingEffect::isEqual(const GrCustomStage& sBase) const { GR_DEFINE_CUSTOM_STAGE_TEST(GrDiffuseLightingEffect); -GrCustomStage* GrDiffuseLightingEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { SkScalar surfaceScale = random->nextSScalar1(); SkScalar kd = random->nextUScalar1(); SkAutoTUnref<SkLight> light(create_random_light(random)); @@ -1054,7 +1054,7 @@ GrCustomStage* GrDiffuseLightingEffect::TestCreate(SkRandom* random, /////////////////////////////////////////////////////////////////////////////// GrGLLightingEffect::GrGLLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fImageIncrementUni(kInvalidUniformHandle) , fSurfaceScaleUni(kInvalidUniformHandle) { @@ -1168,12 +1168,12 @@ void GrGLLightingEffect::emitFS(GrGLShaderBuilder* builder, GrGLSLMulVarBy4f(code, 2, outputColor, inputColor); } -GrGLProgramStage::StageKey GrGLLightingEffect::GenKey(const GrCustomStage& s, +GrGLProgramStage::StageKey GrGLLightingEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { return static_cast<const GrLightingEffect&>(s).light()->type(); } -void GrGLLightingEffect::setData(const GrGLUniformManager& uman, const GrCustomStage& data) { +void GrGLLightingEffect::setData(const GrGLUniformManager& uman, const GrEffect& data) { const GrLightingEffect& effect = static_cast<const GrLightingEffect&>(data); GrGLTexture* texture = static_cast<GrGLTexture*>(data.texture(0)); @@ -1188,7 +1188,7 @@ void GrGLLightingEffect::setData(const GrGLUniformManager& uman, const GrCustomS /////////////////////////////////////////////////////////////////////////////// GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory, stage) , fKDUni(kInvalidUniformHandle) { } @@ -1217,7 +1217,7 @@ void GrGLDiffuseLightingEffect::emitLightFunc(GrGLShaderBuilder* builder, SkStri funcName); } -void GrGLDiffuseLightingEffect::setData(const GrGLUniformManager& uman, const GrCustomStage& data) { +void GrGLDiffuseLightingEffect::setData(const GrGLUniformManager& uman, const GrEffect& data) { INHERITED::setData(uman, data); const GrDiffuseLightingEffect& effect = static_cast<const GrDiffuseLightingEffect&>(data); @@ -1236,7 +1236,7 @@ const GrProgramStageFactory& GrSpecularLightingEffect::getFactory() const { return GrTProgramStageFactory<GrSpecularLightingEffect>::getInstance(); } -bool GrSpecularLightingEffect::isEqual(const GrCustomStage& sBase) const { +bool GrSpecularLightingEffect::isEqual(const GrEffect& sBase) const { const GrSpecularLightingEffect& s = static_cast<const GrSpecularLightingEffect&>(sBase); return INHERITED::isEqual(sBase) && @@ -1246,9 +1246,9 @@ bool GrSpecularLightingEffect::isEqual(const GrCustomStage& sBase) const { GR_DEFINE_CUSTOM_STAGE_TEST(GrSpecularLightingEffect); -GrCustomStage* GrSpecularLightingEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { SkScalar surfaceScale = random->nextSScalar1(); SkScalar ks = random->nextUScalar1(); SkScalar shininess = random->nextUScalar1(); @@ -1260,7 +1260,7 @@ GrCustomStage* GrSpecularLightingEffect::TestCreate(SkRandom* random, /////////////////////////////////////////////////////////////////////////////// GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : GrGLLightingEffect(factory, stage) , fKSUni(kInvalidUniformHandle) , fShininessUni(kInvalidUniformHandle) { @@ -1297,7 +1297,7 @@ void GrGLSpecularLightingEffect::emitLightFunc(GrGLShaderBuilder* builder, SkStr } void GrGLSpecularLightingEffect::setData(const GrGLUniformManager& uman, - const GrCustomStage& data) { + const GrEffect& data) { INHERITED::setData(uman, data); const GrSpecularLightingEffect& effect = static_cast<const GrSpecularLightingEffect&>(data); uman.set1f(fKSUni, effect.ks()); diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 42d2b6b454..5ce00e943b 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -45,7 +45,7 @@ public: static const char* Name() { return "Magnifier"; } virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; float x_offset() const { return fXOffset; } float y_offset() const { return fYOffset; } @@ -75,7 +75,7 @@ typedef GrGLUniformManager::UniformHandle UniformHandle; class GrGLMagnifierEffect : public GrGLLegacyProgramStage { public: GrGLMagnifierEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* state) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* state, @@ -86,9 +86,9 @@ public: const TextureSamplerArray&) SK_OVERRIDE; virtual void setData(const GrGLUniformManager& uman, - const GrCustomStage& data) SK_OVERRIDE; + const GrEffect& data) SK_OVERRIDE; - static inline StageKey GenKey(const GrCustomStage&, const GrGLCaps&); + static inline StageKey GenKey(const GrEffect&, const GrGLCaps&); private: @@ -100,7 +100,7 @@ private: }; GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fOffsetVar(GrGLUniformManager::kInvalidUniformHandle) , fZoomVar(GrGLUniformManager::kInvalidUniformHandle) @@ -165,7 +165,7 @@ void GrGLMagnifierEffect::emitFS(GrGLShaderBuilder* state, } void GrGLMagnifierEffect::setData(const GrGLUniformManager& uman, - const GrCustomStage& data) { + const GrEffect& data) { const GrMagnifierEffect& zoom = static_cast<const GrMagnifierEffect&>(data); @@ -174,7 +174,7 @@ void GrGLMagnifierEffect::setData(const GrGLUniformManager& uman, uman.set2f(fInsetVar, zoom.x_inset(), zoom.y_inset()); } -GrGLProgramStage::StageKey GrGLMagnifierEffect::GenKey(const GrCustomStage& s, +GrGLProgramStage::StageKey GrGLMagnifierEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { return 0; } @@ -183,9 +183,9 @@ GrGLProgramStage::StageKey GrGLMagnifierEffect::GenKey(const GrCustomStage& s, GR_DEFINE_CUSTOM_STAGE_TEST(GrMagnifierEffect); -GrCustomStage* GrMagnifierEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture** textures) { +GrEffect* GrMagnifierEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture** textures) { const int kMaxWidth = 200; const int kMaxHeight = 200; const int kMaxInset = 20; @@ -201,7 +201,7 @@ GrCustomStage* GrMagnifierEffect::TestCreate(SkRandom* random, SkIntToScalar(width), SkIntToScalar(height)), inset)); GrSamplerState sampler; - GrCustomStage* stage; + GrEffect* stage; filter->asNewCustomStage(&stage, textures[0]); GrAssert(NULL != stage); return stage; @@ -213,7 +213,7 @@ const GrProgramStageFactory& GrMagnifierEffect::getFactory() const { return GrTProgramStageFactory<GrMagnifierEffect>::getInstance(); } -bool GrMagnifierEffect::isEqual(const GrCustomStage& sBase) const { +bool GrMagnifierEffect::isEqual(const GrEffect& sBase) const { const GrMagnifierEffect& s = static_cast<const GrMagnifierEffect&>(sBase); return (this->fXOffset == s.fXOffset && @@ -243,7 +243,7 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(SkRect srcRect, SkScalar inset) SkASSERT(srcRect.x() >= 0 && srcRect.y() >= 0 && inset >= 0); } -bool SkMagnifierImageFilter::asNewCustomStage(GrCustomStage** stage, +bool SkMagnifierImageFilter::asNewCustomStage(GrEffect** stage, GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index ccc8859013..3d26189029 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -263,7 +263,7 @@ public: typedef GrGLMatrixConvolutionEffect GLProgramStage; virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; private: SkISize fKernelSize; @@ -282,7 +282,7 @@ private: class GrGLMatrixConvolutionEffect : public GrGLLegacyProgramStage { public: GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* state, const char* vertexCoords) SK_OVERRIDE {} @@ -291,9 +291,9 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); + static inline StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; private: typedef GrGLUniformManager::UniformHandle UniformHandle; @@ -312,7 +312,7 @@ private: }; GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fKernelUni(GrGLUniformManager::kInvalidUniformHandle) , fImageIncrementUni(GrGLUniformManager::kInvalidUniformHandle) @@ -415,7 +415,7 @@ int encodeXY(int x, int y) { }; -GrGLProgramStage::StageKey GrGLMatrixConvolutionEffect::GenKey(const GrCustomStage& s, +GrGLProgramStage::StageKey GrGLMatrixConvolutionEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { const GrMatrixConvolutionEffect& m = static_cast<const GrMatrixConvolutionEffect&>(s); StageKey key = encodeXY(m.kernelSize().width(), m.kernelSize().height()); @@ -425,7 +425,7 @@ GrGLProgramStage::StageKey GrGLMatrixConvolutionEffect::GenKey(const GrCustomSta } void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman, - const GrCustomStage& data) { + const GrEffect& data) { const GrMatrixConvolutionEffect& effect = static_cast<const GrMatrixConvolutionEffect&>(data); GrGLTexture& texture = @@ -473,7 +473,7 @@ const GrProgramStageFactory& GrMatrixConvolutionEffect::getFactory() const { return GrTProgramStageFactory<GrMatrixConvolutionEffect>::getInstance(); } -bool GrMatrixConvolutionEffect::isEqual(const GrCustomStage& sBase) const { +bool GrMatrixConvolutionEffect::isEqual(const GrEffect& sBase) const { const GrMatrixConvolutionEffect& s = static_cast<const GrMatrixConvolutionEffect&>(sBase); return INHERITED::isEqual(sBase) && @@ -492,9 +492,9 @@ GR_DEFINE_CUSTOM_STAGE_TEST(GrMatrixConvolutionEffect); // Allows for a 5x5 kernel (or 25x1, for that matter). #define MAX_KERNEL_SIZE 25 -GrCustomStage* GrMatrixConvolutionEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* GrMatrixConvolutionEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { int texIdx = random->nextBool() ? GrCustomStageUnitTest::kSkiaPMTextureIdx : GrCustomStageUnitTest::kAlphaTextureIdx; int width = random->nextRangeU(1, MAX_KERNEL_SIZE); @@ -521,7 +521,7 @@ GrCustomStage* GrMatrixConvolutionEffect::TestCreate(SkRandom* random, } -bool SkMatrixConvolutionImageFilter::asNewCustomStage(GrCustomStage** stage, +bool SkMatrixConvolutionImageFilter::asNewCustomStage(GrEffect** stage, GrTexture* texture) const { bool ok = fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE; if (ok && stage) { diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 7d241cecf8..dcd38b7b2f 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -252,7 +252,7 @@ public: typedef GrGLMorphologyEffect GLProgramStage; virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; protected: @@ -269,7 +269,7 @@ private: class GrGLMorphologyEffect : public GrGLLegacyProgramStage { public: GrGLMorphologyEffect (const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* state, @@ -279,9 +279,9 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); + static inline StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; private: int width() const { return GrMorphologyEffect::WidthFromRadius(fRadius); } @@ -294,7 +294,7 @@ private: }; GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fImageIncrementUni(GrGLUniformManager::kInvalidUniformHandle) { const GrMorphologyEffect& m = static_cast<const GrMorphologyEffect&>(stage); @@ -341,7 +341,7 @@ void GrGLMorphologyEffect::emitFS(GrGLShaderBuilder* builder, GrGLSLMulVarBy4f(code, 2, outputColor, inputColor); } -GrGLProgramStage::StageKey GrGLMorphologyEffect::GenKey(const GrCustomStage& s, +GrGLProgramStage::StageKey GrGLMorphologyEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { const GrMorphologyEffect& m = static_cast<const GrMorphologyEffect&>(s); StageKey key = static_cast<StageKey>(m.radius()); @@ -349,7 +349,7 @@ GrGLProgramStage::StageKey GrGLMorphologyEffect::GenKey(const GrCustomStage& s, return key; } -void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman, const GrCustomStage& data) { +void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman, const GrEffect& data) { const Gr1DKernelEffect& kern = static_cast<const Gr1DKernelEffect&>(data); GrGLTexture& texture = @@ -387,7 +387,7 @@ const GrProgramStageFactory& GrMorphologyEffect::getFactory() const { return GrTProgramStageFactory<GrMorphologyEffect>::getInstance(); } -bool GrMorphologyEffect::isEqual(const GrCustomStage& sBase) const { +bool GrMorphologyEffect::isEqual(const GrEffect& sBase) const { const GrMorphologyEffect& s = static_cast<const GrMorphologyEffect&>(sBase); return (INHERITED::isEqual(sBase) && @@ -400,9 +400,9 @@ bool GrMorphologyEffect::isEqual(const GrCustomStage& sBase) const { GR_DEFINE_CUSTOM_STAGE_TEST(GrMorphologyEffect); -GrCustomStage* GrMorphologyEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* GrMorphologyEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { int texIdx = random->nextBool() ? GrCustomStageUnitTest::kSkiaPMTextureIdx : GrCustomStageUnitTest::kAlphaTextureIdx; Direction dir = random->nextBool() ? kX_Direction : kY_Direction; diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 7d8fbf81ae..71d56e28e7 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -41,7 +41,7 @@ public: virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrCustomStage* asNewCustomStage(GrContext* context) const SK_OVERRIDE; + virtual GrEffect* asNewCustomStage(GrContext* context) const SK_OVERRIDE; #endif virtual void filterSpan(const SkPMColor src[], int count, @@ -216,13 +216,13 @@ bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const { #if SK_SUPPORT_GPU -#include "GrCustomStage.h" +#include "GrEffect.h" #include "gl/GrGLProgramStage.h" #include "SkGr.h" class GLColorTableEffect; -class ColorTableEffect : public GrCustomStage { +class ColorTableEffect : public GrEffect { public: explicit ColorTableEffect(GrTexture* texture); @@ -230,7 +230,7 @@ public: static const char* Name() { return "ColorTable"; } virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE; + virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; virtual const GrTextureAccess& textureAccess(int index) const SK_OVERRIDE; @@ -241,13 +241,13 @@ private: GrTextureAccess fTextureAccess; - typedef GrCustomStage INHERITED; + typedef GrEffect INHERITED; }; class GLColorTableEffect : public GrGLLegacyProgramStage { public: GLColorTableEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* state) SK_OVERRIDE {} virtual void emitVS(GrGLShaderBuilder* state, @@ -257,9 +257,9 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE {} + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE {} - static StageKey GenKey(const GrCustomStage&, const GrGLCaps&); + static StageKey GenKey(const GrEffect&, const GrGLCaps&); private: @@ -267,7 +267,7 @@ private: }; GLColorTableEffect::GLColorTableEffect( - const GrProgramStageFactory& factory, const GrCustomStage& stage) + const GrProgramStageFactory& factory, const GrEffect& stage) : INHERITED(factory) { } @@ -312,7 +312,7 @@ void GLColorTableEffect::emitFS(GrGLShaderBuilder* builder, code->appendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor); } -GrGLProgramStage::StageKey GLColorTableEffect::GenKey(const GrCustomStage& s, +GrGLProgramStage::StageKey GLColorTableEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { return 0; } @@ -331,7 +331,7 @@ const GrProgramStageFactory& ColorTableEffect::getFactory() const { return GrTProgramStageFactory<ColorTableEffect>::getInstance(); } -bool ColorTableEffect::isEqual(const GrCustomStage& sBase) const { +bool ColorTableEffect::isEqual(const GrEffect& sBase) const { return INHERITED::isEqual(sBase); } @@ -344,18 +344,18 @@ const GrTextureAccess& ColorTableEffect::textureAccess(int index) const { GR_DEFINE_CUSTOM_STAGE_TEST(ColorTableEffect); -GrCustomStage* ColorTableEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* ColorTableEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { return SkNEW_ARGS(ColorTableEffect, (textures[GrCustomStageUnitTest::kAlphaTextureIdx])); } -GrCustomStage* SkTable_ColorFilter::asNewCustomStage(GrContext* context) const { +GrEffect* SkTable_ColorFilter::asNewCustomStage(GrContext* context) const { SkBitmap bitmap; this->asComponentTable(&bitmap); // passing NULL because this custom effect does no tiling or filtering. GrTexture* texture = GrLockCachedBitmapTexture(context, bitmap, NULL); - GrCustomStage* stage = SkNEW_ARGS(ColorTableEffect, (texture)); + GrEffect* stage = SkNEW_ARGS(ColorTableEffect, (texture)); // Unlock immediately, this is not great, but we don't have a way of // knowing when else to unlock it currently. TODO: Remove this when diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 443eec6fbf..e6d159607d 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -687,7 +687,7 @@ void GrGLGradientStage::setupVariables(GrGLShaderBuilder* builder) { kFloat_GrSLType, "GradientYCoordFS"); } -void GrGLGradientStage::setData(const GrGLUniformManager& uman, const GrCustomStage& stage) { +void GrGLGradientStage::setData(const GrGLUniformManager& uman, const GrEffect& stage) { GrScalar yCoord = static_cast<const GrGradientEffect&>(stage).getYCoord(); if (yCoord != fCachedYCoord) { uman.set1f(fFSYUni, yCoord); diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 28571d2f0b..96709c9916 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -223,7 +223,7 @@ class GrProgramStageFactory; class GrTextureStripAtlas; // Base class for Gr gradient effects -class GrGradientEffect : public GrCustomStage { +class GrGradientEffect : public GrEffect { public: GrGradientEffect(GrContext* ctx, @@ -237,7 +237,7 @@ public: bool useAtlas() const { return SkToBool(-1 != fRow); } GrScalar getYCoord() const { return fYCoord; }; - virtual bool isEqual(const GrCustomStage& stage) const SK_OVERRIDE { + virtual bool isEqual(const GrEffect& stage) const SK_OVERRIDE { const GrGradientEffect& s = static_cast<const GrGradientEffect&>(stage); return INHERITED::isEqual(stage) && this->useAtlas() == s.useAtlas() && fYCoord == s.getYCoord(); @@ -264,7 +264,7 @@ private: GrTextureStripAtlas* fAtlas; int fRow; - typedef GrCustomStage INHERITED; + typedef GrEffect INHERITED; }; @@ -278,7 +278,7 @@ public: virtual ~GrGLGradientStage(); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; // emit code that gets a fragment's color from an expression for t; for now // this always uses the texture, but for simpler cases we'll be able to lerp diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 29af42b694..5b351d33d0 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -480,7 +480,7 @@ class GrGLLinearGradient : public GrGLGradientStage { public: GrGLLinearGradient(const GrProgramStageFactory& factory, - const GrCustomStage&) + const GrEffect&) : INHERITED (factory) { } virtual ~GrGLLinearGradient() { } @@ -491,7 +491,7 @@ public: const char* outputColor, const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps) { return 0; } + static StageKey GenKey(const GrEffect& s, const GrGLCaps& caps) { return 0; } private: @@ -524,9 +524,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(GrLinearGradient); -GrCustomStage* GrLinearGradient::TestCreate(SkRandom* random, - GrContext* context, - GrTexture**) { +GrEffect* GrLinearGradient::TestCreate(SkRandom* random, + GrContext* context, + GrTexture**) { SkPoint points[] = {{random->nextUScalar1(), random->nextUScalar1()}, {random->nextUScalar1(), random->nextUScalar1()}}; @@ -541,9 +541,9 @@ GrCustomStage* GrLinearGradient::TestCreate(SkRandom* random, GrSamplerState sampler; shader->asNewCustomStage(context, &sampler); GrAssert(NULL != sampler.getCustomStage()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrCustomStage* + // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* sampler.getCustomStage()->ref(); - return const_cast<GrCustomStage*>(sampler.getCustomStage()); + return const_cast<GrEffect*>(sampler.getCustomStage()); } ///////////////////////////////////////////////////////////////////// @@ -562,7 +562,7 @@ void GrGLLinearGradient::emitFS(GrGLShaderBuilder* builder, bool SkLinearGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); - SkAutoTUnref<GrCustomStage> stage(SkNEW_ARGS(GrLinearGradient, (context, *this, fTileMode))); + SkAutoTUnref<GrEffect> stage(SkNEW_ARGS(GrLinearGradient, (context, *this, fTileMode))); SkMatrix matrix; if (this->getLocalMatrix(&matrix)) { diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 0156acdd54..ca8325d91b 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -477,7 +477,7 @@ class GrGLRadialGradient : public GrGLGradientStage { public: GrGLRadialGradient(const GrProgramStageFactory& factory, - const GrCustomStage&) : INHERITED (factory) { } + const GrEffect&) : INHERITED (factory) { } virtual ~GrGLRadialGradient() { } virtual void emitVS(GrGLShaderBuilder* builder, @@ -487,7 +487,7 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps) { return 0; } + static StageKey GenKey(const GrEffect& s, const GrGLCaps& caps) { return 0; } private: @@ -523,9 +523,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(GrRadialGradient); -GrCustomStage* GrRadialGradient::TestCreate(SkRandom* random, - GrContext* context, - GrTexture**) { +GrEffect* GrRadialGradient::TestCreate(SkRandom* random, + GrContext* context, + GrTexture**) { SkPoint center = {random->nextUScalar1(), random->nextUScalar1()}; SkScalar radius = random->nextUScalar1(); @@ -540,9 +540,9 @@ GrCustomStage* GrRadialGradient::TestCreate(SkRandom* random, GrSamplerState sampler; shader->asNewCustomStage(context, &sampler); GrAssert(NULL != sampler.getCustomStage()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrCustomStage* + // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* sampler.getCustomStage()->ref(); - return const_cast<GrCustomStage*>(sampler.getCustomStage()); + return const_cast<GrEffect*>(sampler.getCustomStage()); } ///////////////////////////////////////////////////////////////////// @@ -560,7 +560,7 @@ void GrGLRadialGradient::emitFS(GrGLShaderBuilder* builder, bool SkRadialGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); - SkAutoTUnref<GrCustomStage> stage(SkNEW_ARGS(GrRadialGradient, (context, *this, fTileMode))); + SkAutoTUnref<GrEffect> stage(SkNEW_ARGS(GrRadialGradient, (context, *this, fTileMode))); SkMatrix matrix; if (this->getLocalMatrix(&matrix)) { diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index e731f8496a..416babc622 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -386,7 +386,7 @@ class GrGLSweepGradient : public GrGLGradientStage { public: GrGLSweepGradient(const GrProgramStageFactory& factory, - const GrCustomStage&) : INHERITED (factory) { } + const GrEffect&) : INHERITED (factory) { } virtual ~GrGLSweepGradient() { } virtual void emitVS(GrGLShaderBuilder* builder, @@ -396,7 +396,7 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps) { return 0; } + static StageKey GenKey(const GrEffect& s, const GrGLCaps& caps) { return 0; } private: @@ -431,9 +431,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(GrSweepGradient); -GrCustomStage* GrSweepGradient::TestCreate(SkRandom* random, - GrContext* context, - GrTexture**) { +GrEffect* GrSweepGradient::TestCreate(SkRandom* random, + GrContext* context, + GrTexture**) { SkPoint center = {random->nextUScalar1(), random->nextUScalar1()}; SkColor colors[kMaxRandomGradientColors]; @@ -446,9 +446,9 @@ GrCustomStage* GrSweepGradient::TestCreate(SkRandom* random, GrSamplerState sampler; shader->asNewCustomStage(context, &sampler); GrAssert(NULL != sampler.getCustomStage()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrCustomStage* + // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* sampler.getCustomStage()->ref(); - return const_cast<GrCustomStage*>(sampler.getCustomStage()); + return const_cast<GrEffect*>(sampler.getCustomStage()); } ///////////////////////////////////////////////////////////////////// @@ -466,7 +466,7 @@ void GrGLSweepGradient::emitFS(GrGLShaderBuilder* builder, ///////////////////////////////////////////////////////////////////// bool SkSweepGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { - SkAutoTUnref<GrCustomStage> stage(SkNEW_ARGS(GrSweepGradient, (context, *this))); + SkAutoTUnref<GrEffect> stage(SkNEW_ARGS(GrSweepGradient, (context, *this))); SkMatrix matrix; diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index b78b3febcd..1b0f58f7b0 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -323,7 +323,7 @@ class GrGLConical2Gradient : public GrGLGradientStage { public: GrGLConical2Gradient(const GrProgramStageFactory& factory, - const GrCustomStage&); + const GrEffect&); virtual ~GrGLConical2Gradient() { } virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; @@ -333,9 +333,9 @@ public: const char* outputColor, const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); + static StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); protected: @@ -381,7 +381,7 @@ public: virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { return GrTProgramStageFactory<GrConical2Gradient>::getInstance(); } - virtual bool isEqual(const GrCustomStage& sBase) const SK_OVERRIDE { + virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrConical2Gradient& s = static_cast<const GrConical2Gradient&>(sBase); return (INHERITED::isEqual(sBase) && this->fCenterX1 == s.fCenterX1 && @@ -415,9 +415,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(GrConical2Gradient); -GrCustomStage* GrConical2Gradient::TestCreate(SkRandom* random, - GrContext* context, - GrTexture**) { +GrEffect* GrConical2Gradient::TestCreate(SkRandom* random, + GrContext* context, + GrTexture**) { SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()}; SkScalar radius1 = random->nextUScalar1(); SkPoint center2; @@ -440,9 +440,9 @@ GrCustomStage* GrConical2Gradient::TestCreate(SkRandom* random, GrSamplerState sampler; shader->asNewCustomStage(context, &sampler); GrAssert(NULL != sampler.getCustomStage()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrCustomStage* + // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* sampler.getCustomStage()->ref(); - return const_cast<GrCustomStage*>(sampler.getCustomStage()); + return const_cast<GrEffect*>(sampler.getCustomStage()); } @@ -450,7 +450,7 @@ GrCustomStage* GrConical2Gradient::TestCreate(SkRandom* random, GrGLConical2Gradient::GrGLConical2Gradient( const GrProgramStageFactory& factory, - const GrCustomStage& baseData) + const GrEffect& baseData) : INHERITED(factory) , fVSParamUni(kInvalidUniformHandle) , fFSParamUni(kInvalidUniformHandle) @@ -626,7 +626,7 @@ void GrGLConical2Gradient::emitFS(GrGLShaderBuilder* builder, } } -void GrGLConical2Gradient::setData(const GrGLUniformManager& uman, const GrCustomStage& baseData) { +void GrGLConical2Gradient::setData(const GrGLUniformManager& uman, const GrEffect& baseData) { INHERITED::setData(uman, baseData); const GrConical2Gradient& data = static_cast<const GrConical2Gradient&>(baseData); @@ -663,7 +663,7 @@ void GrGLConical2Gradient::setData(const GrGLUniformManager& uman, const GrCusto } } -GrCustomStage::StageKey GrGLConical2Gradient::GenKey(const GrCustomStage& s, const GrGLCaps& caps) { +GrEffect::StageKey GrGLConical2Gradient::GenKey(const GrEffect& s, const GrGLCaps& caps) { return (static_cast<const GrConical2Gradient&>(s).isDegenerate()); } diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 00578aadbe..50938f6fe7 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -358,7 +358,7 @@ class GrGLRadial2Gradient : public GrGLGradientStage { public: GrGLRadial2Gradient(const GrProgramStageFactory& factory, - const GrCustomStage&); + const GrEffect&); virtual ~GrGLRadial2Gradient() { } virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; @@ -368,9 +368,9 @@ public: const char* outputColor, const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; - static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); + static StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); protected: @@ -413,7 +413,7 @@ public: virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { return GrTProgramStageFactory<GrRadial2Gradient>::getInstance(); } - virtual bool isEqual(const GrCustomStage& sBase) const SK_OVERRIDE { + virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrRadial2Gradient& s = static_cast<const GrRadial2Gradient&>(sBase); return (INHERITED::isEqual(sBase) && this->fCenterX1 == s.fCenterX1 && @@ -449,9 +449,9 @@ private: GR_DEFINE_CUSTOM_STAGE_TEST(GrRadial2Gradient); -GrCustomStage* GrRadial2Gradient::TestCreate(SkRandom* random, - GrContext* context, - GrTexture**) { +GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random, + GrContext* context, + GrTexture**) { SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()}; SkScalar radius1 = random->nextUScalar1(); SkPoint center2; @@ -474,16 +474,16 @@ GrCustomStage* GrRadial2Gradient::TestCreate(SkRandom* random, GrSamplerState sampler; shader->asNewCustomStage(context, &sampler); GrAssert(NULL != sampler.getCustomStage()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrCustomStage* + // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* sampler.getCustomStage()->ref(); - return const_cast<GrCustomStage*>(sampler.getCustomStage()); + return const_cast<GrEffect*>(sampler.getCustomStage()); } ///////////////////////////////////////////////////////////////////// GrGLRadial2Gradient::GrGLRadial2Gradient( const GrProgramStageFactory& factory, - const GrCustomStage& baseData) + const GrEffect& baseData) : INHERITED(factory) , fVSParamUni(kInvalidUniformHandle) , fFSParamUni(kInvalidUniformHandle) @@ -601,7 +601,7 @@ void GrGLRadial2Gradient::emitFS(GrGLShaderBuilder* builder, this->emitColorLookup(builder, t.c_str(), outputColor, inputColor, samplers[0]); } -void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, const GrCustomStage& baseData) { +void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, const GrEffect& baseData) { INHERITED::setData(uman, baseData); const GrRadial2Gradient& data = static_cast<const GrRadial2Gradient&>(baseData); @@ -636,7 +636,7 @@ void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, const GrCustom } } -GrCustomStage::StageKey GrGLRadial2Gradient::GenKey(const GrCustomStage& s, const GrGLCaps& caps) { +GrEffect::StageKey GrGLRadial2Gradient::GenKey(const GrEffect& s, const GrGLCaps& caps) { return (static_cast<const GrRadial2Gradient&>(s).isDegenerate()); } |