Rename GrGLUniformManager to GrGLProgramDataManager
Rename GrGLUniformManager to GrGLProgramDataManager in anticipation that the
class would be used to manage shader resources that are not uniforms.
This is needed in order to implement NVPR on GLES.
R=bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/365853002
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index 76e1bc8..39a319b 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -124,12 +124,12 @@
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+ virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE;
private:
- GrGLUniformManager::UniformHandle fInnerThresholdVar;
- GrGLUniformManager::UniformHandle fOuterThresholdVar;
+ GrGLProgramDataManager::UniformHandle fInnerThresholdVar;
+ GrGLProgramDataManager::UniformHandle fOuterThresholdVar;
typedef GrGLEffect INHERITED;
};
@@ -186,12 +186,12 @@
(GrGLSLExpr4(inputColor) * GrGLSLExpr4("color")).c_str());
}
-void GrGLAlphaThresholdEffect::setData(const GrGLUniformManager& uman,
+void GrGLAlphaThresholdEffect::setData(const GrGLProgramDataManager& pdman,
const GrDrawEffect& drawEffect) {
const AlphaThresholdEffect& alpha_threshold =
drawEffect.castEffect<AlphaThresholdEffect>();
- uman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
- uman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
+ pdman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
+ pdman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
}
/////////////////////////////////////////////////////////////////////