| Index: src/effects/SkAlphaThresholdFilter.cpp
|
| diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
|
| index 76e1bc8ec7b88c62d3a32a104011abdb45d5f058..31bd3f42e9ce968b23f78ee4a66a8c0b66d8f55e 100644
|
| --- a/src/effects/SkAlphaThresholdFilter.cpp
|
| +++ b/src/effects/SkAlphaThresholdFilter.cpp
|
| @@ -124,12 +124,12 @@ public:
|
| const TransformedCoordsArray&,
|
| const TextureSamplerArray&) SK_OVERRIDE;
|
|
|
| - virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
|
| + virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;
|
|
|
| private:
|
|
|
| - GrGLUniformManager::UniformHandle fInnerThresholdVar;
|
| - GrGLUniformManager::UniformHandle fOuterThresholdVar;
|
| + GrGLProgramResourceManager::UniformHandle fInnerThresholdVar;
|
| + GrGLProgramResourceManager::UniformHandle fOuterThresholdVar;
|
|
|
| typedef GrGLEffect INHERITED;
|
| };
|
| @@ -186,12 +186,12 @@ void GrGLAlphaThresholdEffect::emitCode(GrGLShaderBuilder* builder,
|
| (GrGLSLExpr4(inputColor) * GrGLSLExpr4("color")).c_str());
|
| }
|
|
|
| -void GrGLAlphaThresholdEffect::setData(const GrGLUniformManager& uman,
|
| +void GrGLAlphaThresholdEffect::setData(const GrGLProgramResourceManager& prman,
|
| const GrDrawEffect& drawEffect) {
|
| const AlphaThresholdEffect& alpha_threshold =
|
| drawEffect.castEffect<AlphaThresholdEffect>();
|
| - uman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
|
| - uman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
|
| + prman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
|
| + prman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
|
| }
|
|
|
| /////////////////////////////////////////////////////////////////////
|
|
|