Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index 9f6b77d64f3f16ed4281ada81e04d787d361d113..03418a6a9c8defdce18ad4301fb96988dc629fdc 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -478,10 +478,10 @@ public: |
static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); |
- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; |
+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE; |
private: |
- GrGLUniformManager::UniformHandle fParamUniform; |
+ GrGLProgramResourceManager::UniformHandle fParamUniform; |
bsalomon
2014/07/29 13:08:17
align
|
SkScalar fPrevRadius; |
SkScalar fPrevCenterX; |
SkScalar fPrevIntervalLength; |
@@ -536,13 +536,13 @@ void GLDashingCircleEffect::emitCode(GrGLFullShaderBuilder* builder, |
(GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str()); |
} |
-void GLDashingCircleEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { |
+void GLDashingCircleEffect::setData(const GrGLProgramResourceManager& prman, const GrDrawEffect& drawEffect) { |
const DashingCircleEffect& dce = drawEffect.castEffect<DashingCircleEffect>(); |
SkScalar radius = dce.getRadius(); |
SkScalar centerX = dce.getCenterX(); |
SkScalar intervalLength = dce.getIntervalLength(); |
if (radius != fPrevRadius || centerX != fPrevCenterX || intervalLength != fPrevIntervalLength) { |
- uman.set3f(fParamUniform, radius - 0.5f, centerX, intervalLength); |
+ prman.set3f(fParamUniform, radius - 0.5f, centerX, intervalLength); |
fPrevRadius = radius; |
fPrevCenterX = centerX; |
fPrevIntervalLength = intervalLength; |
@@ -683,11 +683,11 @@ public: |
static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); |
- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; |
+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE; |
private: |
- GrGLUniformManager::UniformHandle fRectUniform; |
- GrGLUniformManager::UniformHandle fIntervalUniform; |
+ GrGLProgramResourceManager::UniformHandle fRectUniform; |
+ GrGLProgramResourceManager::UniformHandle fIntervalUniform; |
SkRect fPrevRect; |
SkScalar fPrevIntervalLength; |
typedef GrGLVertexEffect INHERITED; |
@@ -753,14 +753,14 @@ void GLDashingLineEffect::emitCode(GrGLFullShaderBuilder* builder, |
(GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str()); |
} |
-void GLDashingLineEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { |
+void GLDashingLineEffect::setData(const GrGLProgramResourceManager& prman, const GrDrawEffect& drawEffect) { |
const DashingLineEffect& de = drawEffect.castEffect<DashingLineEffect>(); |
const SkRect& rect = de.getRect(); |
SkScalar intervalLength = de.getIntervalLength(); |
if (rect != fPrevRect || intervalLength != fPrevIntervalLength) { |
- uman.set4f(fRectUniform, rect.fLeft + 0.5f, rect.fTop + 0.5f, |
+ prman.set4f(fRectUniform, rect.fLeft + 0.5f, rect.fTop + 0.5f, |
rect.fRight - 0.5f, rect.fBottom - 0.5f); |
- uman.set1f(fIntervalUniform, intervalLength); |
+ prman.set1f(fIntervalUniform, intervalLength); |
fPrevRect = rect; |
fPrevIntervalLength = intervalLength; |
} |