diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-23 17:30:45 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-23 17:30:45 +0000 |
| commit | 374e75956e7a56bbbd2da5509f9c4117512515d2 (patch) | |
| tree | 530913490fa933364b30aeef8d5779c9405c7b65 /src/gpu/effects | |
| parent | 158618ec62c36b8261e195f04567e09ed76f6534 (diff) | |
Combine the emit functions in GrGLProgramStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6741064
git-svn-id: http://skia.googlecode.com/svn/trunk@6057 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/effects/GrSingleTextureEffect.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index b9c9f63ae3..9d6435060d 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -8,7 +8,7 @@ #include "GrConfigConversionEffect.h" #include "gl/GrGLProgramStage.h" -class GrGLConfigConversionEffect : public GrGLProgramStage { +class GrGLConfigConversionEffect : public GrGLLegacyProgramStage { public: GrGLConfigConversionEffect(const GrProgramStageFactory& factory, const GrCustomStage& s) : INHERITED (factory) { @@ -67,7 +67,7 @@ private: bool fSwapRedAndBlue; GrConfigConversionEffect::PMConversion fPMConversion; - typedef GrGLProgramStage INHERITED; + typedef GrGLLegacyProgramStage INHERITED; }; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index d7750826b9..726c2c39a7 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -15,7 +15,7 @@ typedef GrGLUniformManager::UniformHandle UniformHandle; static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidUniformHandle; -class GrGLConvolutionEffect : public GrGLProgramStage { +class GrGLConvolutionEffect : public GrGLLegacyProgramStage { public: GrGLConvolutionEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage); @@ -39,12 +39,12 @@ private: UniformHandle fKernelUni; UniformHandle fImageIncrementUni; - typedef GrGLProgramStage INHERITED; + typedef GrGLLegacyProgramStage INHERITED; }; GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage) - : GrGLProgramStage(factory) + : INHERITED(factory) , fKernelUni(kInvalidUniformHandle) , fImageIncrementUni(kInvalidUniformHandle) { const GrConvolutionEffect& c = diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp index f6f7b8c5bd..51d302592c 100644 --- a/src/gpu/effects/GrSingleTextureEffect.cpp +++ b/src/gpu/effects/GrSingleTextureEffect.cpp @@ -12,7 +12,7 @@ #include "GrProgramStageFactory.h" #include "GrTexture.h" -class GrGLSingleTextureEffect : public GrGLProgramStage { +class GrGLSingleTextureEffect : public GrGLLegacyProgramStage { public: GrGLSingleTextureEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage) : INHERITED (factory) { } @@ -32,7 +32,7 @@ public: private: - typedef GrGLProgramStage INHERITED; + typedef GrGLLegacyProgramStage INHERITED; }; /////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 219a752ab2..f40604156a 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -9,7 +9,7 @@ #include "gl/GrGLProgramStage.h" #include "GrProgramStageFactory.h" -class GrGLTextureDomainEffect : public GrGLProgramStage { +class GrGLTextureDomainEffect : public GrGLLegacyProgramStage { public: GrGLTextureDomainEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage); @@ -29,12 +29,12 @@ public: private: GrGLUniformManager::UniformHandle fNameUni; - typedef GrGLProgramStage INHERITED; + typedef GrGLLegacyProgramStage INHERITED; }; GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage) - : GrGLProgramStage(factory) + : INHERITED(factory) , fNameUni(GrGLUniformManager::kInvalidUniformHandle) { } |