diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2014-07-30 00:04:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-30 00:04:16 -0700 |
| commit | 7510b224e52b9518a8ddf7418db0e9c258f79539 (patch) | |
| tree | 179bdfba91742718ee02d1f39d5da856894abf29 /src/gpu/effects/GrOvalEffect.cpp | |
| parent | a97e2702f42765775784d6d0f48b82356e1f6309 (diff) | |
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
Diffstat (limited to 'src/gpu/effects/GrOvalEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrOvalEffect.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index ebeb288c97..d915250fe5 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -110,12 +110,12 @@ public: static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); - virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; + virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE; private: - GrGLUniformManager::UniformHandle fCircleUniform; - SkPoint fPrevCenter; - SkScalar fPrevRadius; + GrGLProgramDataManager::UniformHandle fCircleUniform; + SkPoint fPrevCenter; + SkScalar fPrevRadius; typedef GrGLEffect INHERITED; }; @@ -167,7 +167,7 @@ void GLCircleEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, b->add32(ce.getEdgeType()); } -void GLCircleEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { +void GLCircleEffect::setData(const GrGLProgramDataManager& pdman, const GrDrawEffect& drawEffect) { const CircleEffect& ce = drawEffect.castEffect<CircleEffect>(); if (ce.getRadius() != fPrevRadius || ce.getCenter() != fPrevCenter) { SkScalar radius = ce.getRadius(); @@ -176,7 +176,7 @@ void GLCircleEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& } else { radius += 0.5f; } - uman.set3f(fCircleUniform, ce.getCenter().fX, ce.getCenter().fY, radius); + pdman.set3f(fCircleUniform, ce.getCenter().fX, ce.getCenter().fY, radius); fPrevCenter = ce.getCenter(); fPrevRadius = ce.getRadius(); } @@ -282,12 +282,12 @@ public: static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); - virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; + virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE; private: - GrGLUniformManager::UniformHandle fEllipseUniform; - SkPoint fPrevCenter; - SkVector fPrevRadii; + GrGLProgramDataManager::UniformHandle fEllipseUniform; + SkPoint fPrevCenter; + SkVector fPrevRadii; typedef GrGLEffect INHERITED; }; @@ -352,12 +352,12 @@ void GLEllipseEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, b->add32(ee.getEdgeType()); } -void GLEllipseEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { +void GLEllipseEffect::setData(const GrGLProgramDataManager& pdman, const GrDrawEffect& drawEffect) { const EllipseEffect& ee = drawEffect.castEffect<EllipseEffect>(); if (ee.getRadii() != fPrevRadii || ee.getCenter() != fPrevCenter) { SkScalar invRXSqd = 1.f / (ee.getRadii().fX * ee.getRadii().fX); SkScalar invRYSqd = 1.f / (ee.getRadii().fY * ee.getRadii().fY); - uman.set4f(fEllipseUniform, ee.getCenter().fX, ee.getCenter().fY, invRXSqd, invRYSqd); + pdman.set4f(fEllipseUniform, ee.getCenter().fX, ee.getCenter().fY, invRXSqd, invRYSqd); fPrevCenter = ee.getCenter(); fPrevRadii = ee.getRadii(); } |