diff options
author | Brian Salomon <bsalomon@google.com> | 2016-12-16 09:35:49 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-16 16:13:59 +0000 |
commit | 6b316e9e20d67f0f13021ca62f4270105c6151b1 (patch) | |
tree | 64db076f0415ef4afb23ffb5a4513e56ce661d6a /gm/beziereffects.cpp | |
parent | 99ad164886ba39f688ebabecd5fe20dd5d923ba0 (diff) |
Rename GrTestBatch and subclasses to Op
Change-Id: Ideab66b7ca227057a767be48aba3ea69a0a19115
Reviewed-on: https://skia-review.googlesource.com/6161
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/beziereffects.cpp')
-rw-r--r-- | gm/beziereffects.cpp | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 73af7e45b8..61ad64af5a 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -18,7 +18,7 @@ #include "SkColorPriv.h" #include "SkGeometry.h" -#include "batches/GrTestBatch.h" +#include "batches/GrTestMeshDrawOp.h" #include "effects/GrBezierEffect.h" @@ -28,24 +28,26 @@ static inline SkScalar eval_line(const SkPoint& p, const SkScalar lineEq[3], SkS namespace skiagm { -class BezierCubicOrConicTestBatch : public GrTestBatch { +class BezierCubicOrConicTestOp : public GrTestMeshDrawOp { public: DEFINE_OP_CLASS_ID - const char* name() const override { return "BezierCubicOrConicTestBatch"; } + const char* name() const override { return "BezierCubicOrConicTestOp"; } - BezierCubicOrConicTestBatch(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, - GrColor color, const SkScalar klmEqs[9], SkScalar sign) - : INHERITED(ClassID(), bounds, color) - , fGeometryProcessor(std::move(gp)) { + static sk_sp<GrDrawOp> Make(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, GrColor color, + const SkScalar klmEqs[9], SkScalar sign) { + return sk_sp<GrDrawOp>(new BezierCubicOrConicTestOp(gp, bounds, color, klmEqs, sign)); + } + +private: + BezierCubicOrConicTestOp(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, GrColor color, + const SkScalar klmEqs[9], SkScalar sign) + : INHERITED(ClassID(), bounds, color), fGeometryProcessor(std::move(gp)) { for (int i = 0; i < 9; i++) { fKlmEqs[i] = klmEqs[i]; } fSign = sign; } - -private: - struct Vertex { SkPoint fPosition; float fKLM[4]; // The last value is ignored. The effect expects a vec4f. @@ -77,7 +79,7 @@ private: static constexpr int kVertsPerCubic = 4; static constexpr int kIndicesPerCubic = 6; - typedef GrTestBatch INHERITED; + typedef GrTestMeshDrawOp INHERITED; }; /** @@ -192,9 +194,8 @@ protected: GrPaint grPaint; grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); - sk_sp<GrDrawOp> op = sk_make_sp<BezierCubicOrConicTestBatch>(gp, bounds, color, - klmEqs, - klmSigns[c]); + sk_sp<GrDrawOp> op = + BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, klmSigns[c]); renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, std::move(op)); @@ -326,8 +327,8 @@ protected: GrPaint grPaint; grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); - sk_sp<GrDrawOp> op(new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, - 1.f)); + sk_sp<GrDrawOp> op = + BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, 1.f); renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, std::move(op)); @@ -387,19 +388,22 @@ private: ////////////////////////////////////////////////////////////////////////////// -class BezierQuadTestBatch : public GrTestBatch { +class BezierQuadTestOp : public GrTestMeshDrawOp { public: DEFINE_OP_CLASS_ID - const char* name() const override { return "BezierQuadTestBatch"; } + const char* name() const override { return "BezierQuadTestOp"; } - BezierQuadTestBatch(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, GrColor color, - const GrPathUtils::QuadUVMatrix& devToUV) - : INHERITED(ClassID(), bounds, color) - , fDevToUV(devToUV) - , fGeometryProcessor(std::move(gp)) { + static sk_sp<GrDrawOp> Make(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, GrColor color, + const GrPathUtils::QuadUVMatrix& devToUV) { + return sk_sp<GrDrawOp>(new BezierQuadTestOp(gp, bounds, color, devToUV)); } private: + BezierQuadTestOp(sk_sp<GrGeometryProcessor> gp, const SkRect& bounds, GrColor color, + const GrPathUtils::QuadUVMatrix& devToUV) + : INHERITED(ClassID(), bounds, color) + , fDevToUV(devToUV) + , fGeometryProcessor(std::move(gp)) {} struct Vertex { SkPoint fPosition; @@ -427,7 +431,7 @@ private: static constexpr int kVertsPerCubic = 4; static constexpr int kIndicesPerCubic = 6; - typedef GrTestBatch INHERITED; + typedef GrTestMeshDrawOp INHERITED; }; /** @@ -539,7 +543,7 @@ protected: GrPathUtils::QuadUVMatrix DevToUV(pts); - sk_sp<GrDrawOp> op(new BezierQuadTestBatch(gp, bounds, color, DevToUV)); + sk_sp<GrDrawOp> op = BezierQuadTestOp::Make(gp, bounds, color, DevToUV); renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, std::move(op)); |