From d698f77c13d97c61109b861eac4d25b14a5de935 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 25 Oct 2012 13:22:00 +0000 Subject: GrGLProgramStage Renaming Part 1. Renamed cpp and h s/GrGLProgramStage/GrGLEffect/ Review URL: https://codereview.appspot.com/6759054 git-svn-id: http://skia.googlecode.com/svn/trunk@6090 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/effects/GrConfigConversionEffect.cpp | 2 +- src/gpu/effects/GrConvolutionEffect.cpp | 4 ++-- src/gpu/effects/GrSingleTextureEffect.cpp | 2 +- src/gpu/effects/GrTextureDomainEffect.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu/effects') diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 7bc203b062..4b288c801b 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrConfigConversionEffect.h" -#include "gl/GrGLProgramStage.h" +#include "gl/GrGLEffect.h" class GrGLConfigConversionEffect : public GrGLLegacyProgramStage { public: diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index e49302ef94..8713c5bfc3 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrConvolutionEffect.h" -#include "gl/GrGLProgramStage.h" +#include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" #include "GrProgramStageFactory.h" @@ -108,7 +108,7 @@ void GrGLConvolutionEffect::setData(const GrGLUniformManager& uman, const GrEffe uman.set1fv(fKernelUni, 0, this->width(), conv.kernel()); } -GrGLProgramStage::StageKey GrGLConvolutionEffect::GenKey(const GrEffect& s, +GrGLEffect::StageKey GrGLConvolutionEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { return static_cast(s).radius(); } diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp index 47e26e5093..715303098b 100644 --- a/src/gpu/effects/GrSingleTextureEffect.cpp +++ b/src/gpu/effects/GrSingleTextureEffect.cpp @@ -6,7 +6,7 @@ */ #include "effects/GrSingleTextureEffect.h" -#include "gl/GrGLProgramStage.h" +#include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" #include "GrProgramStageFactory.h" diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 1203392d66..ca54794936 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrTextureDomainEffect.h" -#include "gl/GrGLProgramStage.h" +#include "gl/GrGLEffect.h" #include "GrProgramStageFactory.h" class GrGLTextureDomainEffect : public GrGLLegacyProgramStage { -- cgit v1.2.3