diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 21:42:05 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 21:42:05 +0000 |
| commit | 46fba0d79335f17429bb71d87a04d93fb2ee992b (patch) | |
| tree | ba0a11312408578eeea662a47f249a6248081e74 /src/effects/SkMorphologyImageFilter.cpp | |
| parent | 0e363109199198e21237fa4e8314094917e62640 (diff) | |
Rename StageKey and related stuff.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785049
git-svn-id: http://skia.googlecode.com/svn/trunk@6130 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkMorphologyImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index d623c6f059..1d243b9d36 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -279,7 +279,7 @@ public: const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - static inline StageKey GenKey(const GrEffect& s, const GrGLCaps& caps); + static inline EffectKey GenKey(const GrEffect& s, const GrGLCaps& caps); virtual void setData(const GrGLUniformManager&, const GrEffect&) SK_OVERRIDE; @@ -341,10 +341,10 @@ void GrGLMorphologyEffect::emitFS(GrGLShaderBuilder* builder, GrGLSLMulVarBy4f(code, 2, outputColor, inputColor); } -GrGLEffect::StageKey GrGLMorphologyEffect::GenKey(const GrEffect& s, +GrGLEffect::EffectKey GrGLMorphologyEffect::GenKey(const GrEffect& s, const GrGLCaps& caps) { const GrMorphologyEffect& m = static_cast<const GrMorphologyEffect&>(s); - StageKey key = static_cast<StageKey>(m.radius()); + EffectKey key = static_cast<EffectKey>(m.radius()); key |= (m.type() << 8); return key; } |