From 83d081ae1d731b5039e99823620f5e287542ee39 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 8 Jul 2014 09:56:10 -0700 Subject: Goodbye GrEffectRef. Also, reworked some var names and comments around SkShader::asNewEffect. R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/374923002 --- src/gpu/GrOvalRenderer.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/gpu/GrOvalRenderer.cpp') diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 8a76646b5b..fe4c03e0e8 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -61,7 +61,7 @@ inline bool circle_stays_circle(const SkMatrix& m) { class CircleEdgeEffect : public GrVertexEffect { public: - static GrEffectRef* Create(bool stroke) { + static GrEffect* Create(bool stroke) { GR_CREATE_STATIC_EFFECT(gCircleStrokeEdge, CircleEdgeEffect, (true)); GR_CREATE_STATIC_EFFECT(gCircleFillEdge, CircleEdgeEffect, (false)); @@ -153,10 +153,10 @@ private: GR_DEFINE_EFFECT_TEST(CircleEdgeEffect); -GrEffectRef* CircleEdgeEffect::TestCreate(SkRandom* random, - GrContext* context, - const GrDrawTargetCaps&, - GrTexture* textures[]) { +GrEffect* CircleEdgeEffect::TestCreate(SkRandom* random, + GrContext* context, + const GrDrawTargetCaps&, + GrTexture* textures[]) { return CircleEdgeEffect::Create(random->nextBool()); } @@ -172,7 +172,7 @@ GrEffectRef* CircleEdgeEffect::TestCreate(SkRandom* random, class EllipseEdgeEffect : public GrVertexEffect { public: - static GrEffectRef* Create(bool stroke) { + static GrEffect* Create(bool stroke) { GR_CREATE_STATIC_EFFECT(gEllipseStrokeEdge, EllipseEdgeEffect, (true)); GR_CREATE_STATIC_EFFECT(gEllipseFillEdge, EllipseEdgeEffect, (false)); @@ -284,10 +284,10 @@ private: GR_DEFINE_EFFECT_TEST(EllipseEdgeEffect); -GrEffectRef* EllipseEdgeEffect::TestCreate(SkRandom* random, - GrContext* context, - const GrDrawTargetCaps&, - GrTexture* textures[]) { +GrEffect* EllipseEdgeEffect::TestCreate(SkRandom* random, + GrContext* context, + const GrDrawTargetCaps&, + GrTexture* textures[]) { return EllipseEdgeEffect::Create(random->nextBool()); } @@ -306,7 +306,7 @@ class DIEllipseEdgeEffect : public GrVertexEffect { public: enum Mode { kStroke = 0, kHairline, kFill }; - static GrEffectRef* Create(Mode mode) { + static GrEffect* Create(Mode mode) { GR_CREATE_STATIC_EFFECT(gEllipseStrokeEdge, DIEllipseEdgeEffect, (kStroke)); GR_CREATE_STATIC_EFFECT(gEllipseHairlineEdge, DIEllipseEdgeEffect, (kHairline)); GR_CREATE_STATIC_EFFECT(gEllipseFillEdge, DIEllipseEdgeEffect, (kFill)); @@ -440,10 +440,10 @@ private: GR_DEFINE_EFFECT_TEST(DIEllipseEdgeEffect); -GrEffectRef* DIEllipseEdgeEffect::TestCreate(SkRandom* random, - GrContext* context, - const GrDrawTargetCaps&, - GrTexture* textures[]) { +GrEffect* DIEllipseEdgeEffect::TestCreate(SkRandom* random, + GrContext* context, + const GrDrawTargetCaps&, + GrTexture* textures[]) { return DIEllipseEdgeEffect::Create((Mode)(random->nextRangeU(0,2))); } @@ -541,7 +541,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target, } } - GrEffectRef* effect = CircleEdgeEffect::Create(isStrokeOnly && innerRadius > 0); + GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly && innerRadius > 0); static const int kCircleEdgeAttrIndex = 1; drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref(); @@ -681,8 +681,8 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target, EllipseVertex* verts = reinterpret_cast(geo.vertices()); - GrEffectRef* effect = EllipseEdgeEffect::Create(isStrokeOnly && - innerXRadius > 0 && innerYRadius > 0); + GrEffect* effect = EllipseEdgeEffect::Create(isStrokeOnly && + innerXRadius > 0 && innerYRadius > 0); static const int kEllipseCenterAttrIndex = 1; static const int kEllipseEdgeAttrIndex = 2; @@ -800,7 +800,7 @@ bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target, DIEllipseVertex* verts = reinterpret_cast(geo.vertices()); - GrEffectRef* effect = DIEllipseEdgeEffect::Create(mode); + GrEffect* effect = DIEllipseEdgeEffect::Create(mode); static const int kEllipseOuterOffsetAttrIndex = 1; static const int kEllipseInnerOffsetAttrIndex = 2; @@ -898,7 +898,7 @@ bool GrOvalRenderer::drawDRRect(GrDrawTarget* target, GrContext* context, bool u } GrEffectEdgeType edgeType = applyAA ? kInverseFillAA_GrEffectEdgeType : kInverseFillBW_GrEffectEdgeType; - GrEffectRef* effect = GrRRectEffect::Create(edgeType, *inner); + GrEffect* effect = GrRRectEffect::Create(edgeType, *inner); if (NULL == effect) { return false; } @@ -920,7 +920,7 @@ bool GrOvalRenderer::drawDRRect(GrDrawTarget* target, GrContext* context, bool u } GrEffectEdgeType edgeType = applyAA ? kFillAA_GrEffectEdgeType : kFillBW_GrEffectEdgeType; - GrEffectRef* effect = GrRRectEffect::Create(edgeType, *outer); + GrEffect* effect = GrRRectEffect::Create(edgeType, *outer); if (NULL == effect) { return false; } @@ -1051,7 +1051,7 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us isStrokeOnly = (isStrokeOnly && innerRadius >= 0); - GrEffectRef* effect = CircleEdgeEffect::Create(isStrokeOnly); + GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly); static const int kCircleEdgeAttrIndex = 1; drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref(); @@ -1155,7 +1155,7 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us } EllipseVertex* verts = reinterpret_cast(geo.vertices()); - GrEffectRef* effect = EllipseEdgeEffect::Create(isStrokeOnly); + GrEffect* effect = EllipseEdgeEffect::Create(isStrokeOnly); static const int kEllipseOffsetAttrIndex = 1; static const int kEllipseRadiiAttrIndex = 2; drawState->addCoverageEffect(effect, -- cgit v1.2.3