GrGLGradientStage->GrGLGradientEffect
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6774046
git-svn-id: http://skia.googlecode.com/svn/trunk@6131 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index dfef878..f9bdf2f 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -675,19 +675,19 @@
#include "effects/GrTextureStripAtlas.h"
#include "SkGr.h"
-GrGLGradientStage::GrGLGradientStage(const GrBackendEffectFactory& factory)
+GrGLGradientEffect::GrGLGradientEffect(const GrBackendEffectFactory& factory)
: INHERITED(factory)
, fCachedYCoord(GR_ScalarMax)
, fFSYUni(GrGLUniformManager::kInvalidUniformHandle) { }
-GrGLGradientStage::~GrGLGradientStage() { }
+GrGLGradientEffect::~GrGLGradientEffect() { }
-void GrGLGradientStage::setupVariables(GrGLShaderBuilder* builder) {
+void GrGLGradientEffect::setupVariables(GrGLShaderBuilder* builder) {
fFSYUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
kFloat_GrSLType, "GradientYCoordFS");
}
-void GrGLGradientStage::setData(const GrGLUniformManager& uman, const GrEffect& effect) {
+void GrGLGradientEffect::setData(const GrGLUniformManager& uman, const GrEffect& effect) {
GrScalar yCoord = static_cast<const GrGradientEffect&>(effect).getYCoord();
if (yCoord != fCachedYCoord) {
uman.set1f(fFSYUni, yCoord);
@@ -695,11 +695,11 @@
}
}
-void GrGLGradientStage::emitColorLookup(GrGLShaderBuilder* builder,
- const char* gradientTValue,
- const char* outputColor,
- const char* inputColor,
- const GrGLShaderBuilder::TextureSampler& sampler) {
+void GrGLGradientEffect::emitColorLookup(GrGLShaderBuilder* builder,
+ const char* gradientTValue,
+ const char* outputColor,
+ const char* inputColor,
+ const GrGLShaderBuilder::TextureSampler& sampler) {
SkString* code = &builder->fFSCode;
code->appendf("\tvec2 coord = vec2(%s, %s);\n",
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 04f1aa1..6bb0a60 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -271,11 +271,11 @@
///////////////////////////////////////////////////////////////////////////////
// Base class for GL gradient effects
-class GrGLGradientStage : public GrGLLegacyEffect {
+class GrGLGradientEffect : public GrGLLegacyEffect {
public:
- GrGLGradientStage(const GrBackendEffectFactory& factory);
- virtual ~GrGLGradientStage();
+ GrGLGradientEffect(const GrBackendEffectFactory& factory);
+ virtual ~GrGLGradientEffect();
virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE;
virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE;
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 740f66f..71003cf 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -476,7 +476,7 @@
/////////////////////////////////////////////////////////////////////
-class GrGLLinearGradient : public GrGLGradientStage {
+class GrGLLinearGradient : public GrGLGradientEffect {
public:
GrGLLinearGradient(const GrBackendEffectFactory& factory,
@@ -495,7 +495,7 @@
private:
- typedef GrGLGradientStage INHERITED;
+ typedef GrGLGradientEffect INHERITED;
};
/////////////////////////////////////////////////////////////////////
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index ee1ce66..fa36fcc 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -473,7 +473,7 @@
#if SK_SUPPORT_GPU
-class GrGLRadialGradient : public GrGLGradientStage {
+class GrGLRadialGradient : public GrGLGradientEffect {
public:
GrGLRadialGradient(const GrBackendEffectFactory& factory,
@@ -491,7 +491,7 @@
private:
- typedef GrGLGradientStage INHERITED;
+ typedef GrGLGradientEffect INHERITED;
};
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 726ccbf..190da59 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -382,7 +382,7 @@
#if SK_SUPPORT_GPU
-class GrGLSweepGradient : public GrGLGradientStage {
+class GrGLSweepGradient : public GrGLGradientEffect {
public:
GrGLSweepGradient(const GrBackendEffectFactory& factory,
@@ -400,7 +400,7 @@
private:
- typedef GrGLGradientStage INHERITED;
+ typedef GrGLGradientEffect INHERITED;
};
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 6e09772..84ad087 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -319,7 +319,7 @@
typedef GrGLUniformManager::UniformHandle UniformHandle;
static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidUniformHandle;
-class GrGLConical2Gradient : public GrGLGradientStage {
+class GrGLConical2Gradient : public GrGLGradientEffect {
public:
GrGLConical2Gradient(const GrBackendEffectFactory& factory,
@@ -358,7 +358,7 @@
private:
- typedef GrGLGradientStage INHERITED;
+ typedef GrGLGradientEffect INHERITED;
};
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index a9f81f6..9d2245c 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -353,7 +353,7 @@
typedef GrGLUniformManager::UniformHandle UniformHandle;
static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidUniformHandle;
-class GrGLRadial2Gradient : public GrGLGradientStage {
+class GrGLRadial2Gradient : public GrGLGradientEffect {
public:
@@ -393,7 +393,7 @@
private:
- typedef GrGLGradientStage INHERITED;
+ typedef GrGLGradientEffect INHERITED;
};