src/gpu/effects/GrOvalEffect.cpp - Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager

Unified Diff: src/gpu/effects/GrOvalEffect.cpp

Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager (Closed) Base URL: https://skia.googlesource.com/skia.git@02-path-program-fragment

Patch Set: rebase Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« src/gpu/effects/GrDistanceFieldTextureEffect.cpp ('K') | « src/gpu/effects/GrMatrixConvolutionEffect.cpp ('k') | src/gpu/effects/GrRRectEffect.cpp » ('j') | src/gpu/effects/GrRRectEffect.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/effects/GrOvalEffect.cpp

diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp

index ebeb288c975ea3e865d56a2ca112d11b13ef5967..908c75574252632ef93e5e74740d237a0110311b 100644

--- a/src/gpu/effects/GrOvalEffect.cpp

+++ b/src/gpu/effects/GrOvalEffect.cpp

@@ -110,10 +110,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 fCircleUniform;

+ GrGLProgramResourceManager::UniformHandle fCircleUniform;

SkPoint fPrevCenter;

SkScalar fPrevRadius;

@@ -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 GrGLProgramResourceManager& prman, 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);

+ prman.set3f(fCircleUniform, ce.getCenter().fX, ce.getCenter().fY, radius);

fPrevCenter = ce.getCenter();

fPrevRadius = ce.getRadius();

}

@@ -282,10 +282,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 fEllipseUniform;

+ GrGLProgramResourceManager::UniformHandle fEllipseUniform;

SkPoint fPrevCenter;

SkVector fPrevRadii;

@@ -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 GrGLProgramResourceManager& prman, 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);

+ prman.set4f(fEllipseUniform, ee.getCenter().fX, ee.getCenter().fY, invRXSqd, invRYSqd);

fPrevCenter = ee.getCenter();

fPrevRadii = ee.getRadii();

}