From a469c28c3c16214733a25201a286970f57b3d944 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 24 Oct 2012 18:28:34 +0000 Subject: CustomStage Renaming Part 1 Search and replace: GrCustomStage->GrEffect GrCustomStageTestFactory->GrEffectTestFactory renamed the cpp/h files from customStage->effect reordered gypi, #includes, forward decls to maintain alphabetical sort. manually fixed up some whitespace and linewraps deleted a commented out #include R=robertphillips@google.com Review URL: https://codereview.appspot.com/6758046 git-svn-id: http://skia.googlecode.com/svn/trunk@6076 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/gradients/SkGradientShader.cpp | 2 +- src/effects/gradients/SkGradientShaderPriv.h | 8 ++++---- src/effects/gradients/SkLinearGradient.cpp | 16 +++++++-------- src/effects/gradients/SkRadialGradient.cpp | 16 +++++++-------- src/effects/gradients/SkSweepGradient.cpp | 16 +++++++-------- .../gradients/SkTwoPointConicalGradient.cpp | 24 +++++++++++----------- src/effects/gradients/SkTwoPointRadialGradient.cpp | 24 +++++++++++----------- 7 files changed, 53 insertions(+), 53 deletions(-) (limited to 'src/effects/gradients') 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(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(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(sampler.getCustomStage()); + return const_cast(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 stage(SkNEW_ARGS(GrLinearGradient, (context, *this, fTileMode))); + SkAutoTUnref 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(sampler.getCustomStage()); + return const_cast(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 stage(SkNEW_ARGS(GrRadialGradient, (context, *this, fTileMode))); + SkAutoTUnref 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(sampler.getCustomStage()); + return const_cast(sampler.getCustomStage()); } ///////////////////////////////////////////////////////////////////// @@ -466,7 +466,7 @@ void GrGLSweepGradient::emitFS(GrGLShaderBuilder* builder, ///////////////////////////////////////////////////////////////////// bool SkSweepGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { - SkAutoTUnref stage(SkNEW_ARGS(GrSweepGradient, (context, *this))); + SkAutoTUnref 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::getInstance(); } - virtual bool isEqual(const GrCustomStage& sBase) const SK_OVERRIDE { + virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrConical2Gradient& s = static_cast(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(sampler.getCustomStage()); + return const_cast(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(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(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::getInstance(); } - virtual bool isEqual(const GrCustomStage& sBase) const SK_OVERRIDE { + virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrRadial2Gradient& s = static_cast(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(sampler.getCustomStage()); + return const_cast(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(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(s).isDegenerate()); } -- cgit v1.2.3