Index: src/effects/SkArithmeticMode.cpp |
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp |
index e43603ac1e1f6b8d8348e899b823ac82520218ba..7d9997a1dfebfd47a2d8ac887d0e55429fc2d16b 100644 |
--- a/src/effects/SkArithmeticMode.cpp |
+++ b/src/effects/SkArithmeticMode.cpp |
@@ -248,12 +248,12 @@ public: |
const TransformedCoordsArray&, |
const TextureSamplerArray&) SK_OVERRIDE; |
- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; |
+ virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE; |
static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b); |
private: |
- GrGLUniformManager::UniformHandle fKUni; |
+ GrGLProgramDataManager::UniformHandle fKUni; |
bool fEnforcePMColor; |
typedef GrGLEffect INHERITED; |
@@ -395,9 +395,9 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder, |
} |
} |
-void GrGLArithmeticEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { |
+void GrGLArithmeticEffect::setData(const GrGLProgramDataManager& pdman, const GrDrawEffect& drawEffect) { |
const GrArithmeticEffect& arith = drawEffect.castEffect<GrArithmeticEffect>(); |
- uman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4()); |
+ pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4()); |
fEnforcePMColor = arith.enforcePMColor(); |
} |