Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: src/effects/SkBlurMaskFilter.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
« no previous file with comments | « src/effects/SkArithmeticMode.cpp ('k') | src/effects/SkColorFilters.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkBlurMaskFilter.cpp
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 3c502f4a6a0498e6a2e585c141347b1683cd206f..9330c5942b818f672915e8291868debd1e9366bf 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -606,10 +606,10 @@ 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;
private:
- typedef GrGLUniformManager::UniformHandle UniformHandle;
+ typedef GrGLProgramDataManager::UniformHandle UniformHandle;
UniformHandle fProxyRectUniform;
UniformHandle fProfileSizeUniform;
@@ -682,13 +682,13 @@ void GrGLRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
builder->fsCodeAppendf("\t%s = src * vec4(final);\n", outputColor );
}
-void GrGLRectBlurEffect::setData(const GrGLUniformManager& uman,
+void GrGLRectBlurEffect::setData(const GrGLProgramDataManager& pdman,
const GrDrawEffect& drawEffect) {
const GrRectBlurEffect& rbe = drawEffect.castEffect<GrRectBlurEffect>();
SkRect rect = rbe.getRect();
- uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
- uman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
+ pdman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+ pdman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
}
bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma,
@@ -967,12 +967,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;
private:
- GrGLUniformManager::UniformHandle fProxyRectUniform;
- GrGLUniformManager::UniformHandle fCornerRadiusUniform;
- GrGLUniformManager::UniformHandle fBlurRadiusUniform;
+ GrGLProgramDataManager::UniformHandle fProxyRectUniform;
+ GrGLProgramDataManager::UniformHandle fCornerRadiusUniform;
+ GrGLProgramDataManager::UniformHandle fBlurRadiusUniform;
typedef GrGLEffect INHERITED;
};
@@ -1036,22 +1036,22 @@ void GrGLRRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
builder->fsCodeAppend(";\n");
}
-void GrGLRRectBlurEffect::setData(const GrGLUniformManager& uman,
+void GrGLRRectBlurEffect::setData(const GrGLProgramDataManager& pdman,
const GrDrawEffect& drawEffect) {
const GrRRectBlurEffect& brre = drawEffect.castEffect<GrRRectBlurEffect>();
SkRRect rrect = brre.getRRect();
float blurRadius = 3.f*SkScalarCeilToScalar(brre.getSigma()-1/6.0f);
- uman.set1f(fBlurRadiusUniform, blurRadius);
+ pdman.set1f(fBlurRadiusUniform, blurRadius);
SkRect rect = rrect.getBounds();
rect.outset(blurRadius, blurRadius);
- uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+ pdman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
SkScalar radius = 0;
SkASSERT(rrect.isSimpleCircular() || rrect.isRect());
radius = rrect.getSimpleRadii().fX;
- uman.set1f(fCornerRadiusUniform, radius);
+ pdman.set1f(fCornerRadiusUniform, radius);
}
« no previous file with comments | « src/effects/SkArithmeticMode.cpp ('k') | src/effects/SkColorFilters.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698