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/gpu/effects/GrTextureDomainEffect.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gpu/effects/GrTextureDomainEffect.cpp') diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index f40604156a..289b6210b4 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -12,7 +12,7 @@ class GrGLTextureDomainEffect : public GrGLLegacyProgramStage { public: GrGLTextureDomainEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage); + const GrEffect& stage); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* builder, @@ -22,9 +22,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 inline StageKey GenKey(const GrCustomStage&, const GrGLCaps&) { return 0; } + static inline StageKey GenKey(const GrEffect&, const GrGLCaps&) { return 0; } private: GrGLUniformManager::UniformHandle fNameUni; @@ -33,7 +33,7 @@ private: }; GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProgramStageFactory& factory, - const GrCustomStage& stage) + const GrEffect& stage) : INHERITED(factory) , fNameUni(GrGLUniformManager::kInvalidUniformHandle) { } @@ -60,7 +60,7 @@ void GrGLTextureDomainEffect::emitFS(GrGLShaderBuilder* builder, builder->fFSCode.append(";\n"); } -void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman, const GrCustomStage& data) { +void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman, const GrEffect& data) { const GrTextureDomainEffect& effect = static_cast(data); const GrRect& domain = effect.domain(); @@ -105,7 +105,7 @@ const GrProgramStageFactory& GrTextureDomainEffect::getFactory() const { return GrTProgramStageFactory::getInstance(); } -bool GrTextureDomainEffect::isEqual(const GrCustomStage& sBase) const { +bool GrTextureDomainEffect::isEqual(const GrEffect& sBase) const { const GrTextureDomainEffect& s = static_cast(sBase); return (INHERITED::isEqual(sBase) && this->fTextureDomain == s.fTextureDomain); } @@ -114,9 +114,9 @@ bool GrTextureDomainEffect::isEqual(const GrCustomStage& sBase) const { GR_DEFINE_CUSTOM_STAGE_TEST(GrTextureDomainEffect); -GrCustomStage* GrTextureDomainEffect::TestCreate(SkRandom* random, - GrContext* context, - GrTexture* textures[]) { +GrEffect* GrTextureDomainEffect::TestCreate(SkRandom* random, + GrContext* context, + GrTexture* textures[]) { int texIdx = random->nextBool() ? GrCustomStageUnitTest::kSkiaPMTextureIdx : GrCustomStageUnitTest::kAlphaTextureIdx; GrRect domain; -- cgit v1.2.3