aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/effects/SkBlendImageFilter.cpp4
-rw-r--r--src/effects/SkColorMatrixFilter.cpp4
-rw-r--r--src/effects/SkLightingImageFilter.cpp4
-rw-r--r--src/effects/SkMagnifierImageFilter.cpp4
-rw-r--r--src/effects/SkMatrixConvolutionImageFilter.cpp4
-rw-r--r--src/effects/SkMorphologyImageFilter.cpp4
-rw-r--r--src/effects/SkTableColorFilter.cpp4
-rw-r--r--src/effects/gradients/SkGradientShaderPriv.h4
-rw-r--r--src/gpu/effects/GrConfigConversionEffect.cpp4
-rw-r--r--src/gpu/effects/GrConvolutionEffect.cpp4
-rw-r--r--src/gpu/effects/GrSingleTextureEffect.cpp4
-rw-r--r--src/gpu/effects/GrTextureDomainEffect.cpp4
-rw-r--r--src/gpu/gl/GrGLEffect.h4
13 files changed, 26 insertions, 26 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index 4f46d60d65..9722684c65 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -110,7 +110,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy,
///////////////////////////////////////////////////////////////////////////////
#if SK_SUPPORT_GPU
-class GrGLBlendEffect : public GrGLLegacyProgramStage {
+class GrGLBlendEffect : public GrGLLegacyEffect {
public:
GrGLBlendEffect(const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -127,7 +127,7 @@ public:
static inline StageKey GenKey(const GrEffect& s, const GrGLCaps&);
private:
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
SkBlendImageFilter::Mode fMode;
};
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 37b3e20a3d..b7d479a821 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -339,7 +339,7 @@ public:
GR_DECLARE_EFFECT_TEST;
- class GLProgramStage : public GrGLLegacyProgramStage {
+ class GLProgramStage : public GrGLLegacyEffect {
public:
// this class always generates the same code.
static StageKey GenKey(const GrEffect& s, const GrGLCaps&) { return 0; }
@@ -409,7 +409,7 @@ public:
private:
SkColorMatrix fMatrix;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GR_DEFINE_EFFECT_TEST(ColorMatrixEffect);
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 6dda94dca6..53a3ac9b58 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -939,7 +939,7 @@ SkLight* create_random_light(SkRandom* random) {
}
-class GrGLLightingEffect : public GrGLLegacyProgramStage {
+class GrGLLightingEffect : public GrGLLegacyEffect {
public:
GrGLLightingEffect(const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -960,7 +960,7 @@ public:
virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE;
private:
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
UniformHandle fImageIncrementUni;
UniformHandle fSurfaceScaleUni;
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 56991b9220..93ec733f9f 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -72,7 +72,7 @@ private:
// For brevity
typedef GrGLUniformManager::UniformHandle UniformHandle;
-class GrGLMagnifierEffect : public GrGLLegacyProgramStage {
+class GrGLMagnifierEffect : public GrGLLegacyEffect {
public:
GrGLMagnifierEffect(const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -96,7 +96,7 @@ private:
UniformHandle fZoomVar;
UniformHandle fInsetVar;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProgramStageFactory& factory,
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index ddd93ba3ec..b96d556d34 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -279,7 +279,7 @@ private:
typedef GrSingleTextureEffect INHERITED;
};
-class GrGLMatrixConvolutionEffect : public GrGLLegacyProgramStage {
+class GrGLMatrixConvolutionEffect : public GrGLLegacyEffect {
public:
GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -308,7 +308,7 @@ private:
UniformHandle fGainUni;
UniformHandle fBiasUni;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory,
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 8e12b5e275..bc5bf46453 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -266,7 +266,7 @@ private:
///////////////////////////////////////////////////////////////////////////////
-class GrGLMorphologyEffect : public GrGLLegacyProgramStage {
+class GrGLMorphologyEffect : public GrGLLegacyEffect {
public:
GrGLMorphologyEffect (const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -290,7 +290,7 @@ private:
GrMorphologyEffect::MorphologyType fType;
GrGLUniformManager::UniformHandle fImageIncrementUni;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProgramStageFactory& factory,
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index c9dec5500c..09c3ec1a59 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -244,7 +244,7 @@ private:
typedef GrEffect INHERITED;
};
-class GLColorTableEffect : public GrGLLegacyProgramStage {
+class GLColorTableEffect : public GrGLLegacyEffect {
public:
GLColorTableEffect(const GrProgramStageFactory& factory,
const GrEffect& effect);
@@ -263,7 +263,7 @@ public:
private:
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GLColorTableEffect::GLColorTableEffect(
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 841771644c..c24b3cb6f5 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -271,7 +271,7 @@ private:
///////////////////////////////////////////////////////////////////////////////
// Base class for GL gradient effects
-class GrGLGradientStage : public GrGLLegacyProgramStage {
+class GrGLGradientStage : public GrGLLegacyEffect {
public:
GrGLGradientStage(const GrProgramStageFactory& factory);
@@ -293,7 +293,7 @@ private:
GrScalar fCachedYCoord;
GrGLUniformManager::UniformHandle fFSYUni;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
#endif
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 4b288c801b..b09c8eab09 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -8,7 +8,7 @@
#include "GrConfigConversionEffect.h"
#include "gl/GrGLEffect.h"
-class GrGLConfigConversionEffect : public GrGLLegacyProgramStage {
+class GrGLConfigConversionEffect : public GrGLLegacyEffect {
public:
GrGLConfigConversionEffect(const GrProgramStageFactory& factory,
const GrEffect& s) : INHERITED (factory) {
@@ -67,7 +67,7 @@ private:
bool fSwapRedAndBlue;
GrConfigConversionEffect::PMConversion fPMConversion;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index 8713c5bfc3..0afdbb8a81 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 GrGLLegacyProgramStage {
+class GrGLConvolutionEffect : public GrGLLegacyEffect {
public:
GrGLConvolutionEffect(const GrProgramStageFactory&, const GrEffect&);
@@ -38,7 +38,7 @@ private:
UniformHandle fKernelUni;
UniformHandle fImageIncrementUni;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProgramStageFactory& factory,
diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp
index 715303098b..03a36f6aaf 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 GrGLLegacyProgramStage {
+class GrGLSingleTextureEffect : public GrGLLegacyEffect {
public:
GrGLSingleTextureEffect(const GrProgramStageFactory& factory, const GrEffect&)
: INHERITED (factory) {
@@ -33,7 +33,7 @@ public:
private:
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
index ca54794936..c7a9eb215c 100644
--- a/src/gpu/effects/GrTextureDomainEffect.cpp
+++ b/src/gpu/effects/GrTextureDomainEffect.cpp
@@ -9,7 +9,7 @@
#include "gl/GrGLEffect.h"
#include "GrProgramStageFactory.h"
-class GrGLTextureDomainEffect : public GrGLLegacyProgramStage {
+class GrGLTextureDomainEffect : public GrGLLegacyEffect {
public:
GrGLTextureDomainEffect(const GrProgramStageFactory&, const GrEffect&);
@@ -28,7 +28,7 @@ public:
private:
GrGLUniformManager::UniformHandle fNameUni;
- typedef GrGLLegacyProgramStage INHERITED;
+ typedef GrGLLegacyEffect INHERITED;
};
GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProgramStageFactory& factory,
diff --git a/src/gpu/gl/GrGLEffect.h b/src/gpu/gl/GrGLEffect.h
index 32adcdd37d..06dfad7148 100644
--- a/src/gpu/gl/GrGLEffect.h
+++ b/src/gpu/gl/GrGLEffect.h
@@ -93,9 +93,9 @@ protected:
* to continue to work by change their parent class to this class. New program stages should not use
* this interface. It will be removed once older stages are modified to implement emitCode().
*/
-class GrGLLegacyProgramStage : public GrGLEffect {
+class GrGLLegacyEffect : public GrGLEffect {
public:
- GrGLLegacyProgramStage(const GrProgramStageFactory& factory) : GrGLEffect(factory) {}
+ GrGLLegacyEffect(const GrProgramStageFactory& factory) : GrGLEffect(factory) {}
virtual void setupVariables(GrGLShaderBuilder* builder) {};
virtual void emitVS(GrGLShaderBuilder* builder,
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 18:09:33 +0000