diff options
author | 2017-08-09 16:02:19 -0400 | |
---|---|---|
committer | 2017-08-09 20:42:45 +0000 | |
commit | 91326c34ee1f1531d62caa153746821b58e6e55d (patch) | |
tree | 0d5ca763efa6807b1f352d9ae9bc0537f9ed12f1 /gm | |
parent | 6a14edc8d8762a54a174c2df1bee5715fc0a0526 (diff) |
Move GrProcessorSet into GrPipeline
Change-Id: Ibfa5e1adda3c32140590aa62a31d35654cef79dd
Reviewed-on: https://skia-review.googlesource.com/28187
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/beziereffects.cpp | 10 | ||||
-rw-r--r-- | gm/convexpolyeffect.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 77f86c5ea4..b4225db0b4 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -43,8 +43,8 @@ protected: this->setBounds(rect, HasAABloat::kYes, IsZeroArea::kNo); } - const GrPipeline* makePipeline(Target* target) const { - return target->makePipeline(0, &fProcessorSet); + const GrPipeline* makePipeline(Target* target) { + return target->makePipeline(0, std::move(fProcessorSet)); } const GrGeometryProcessor* gp() const { return fGeometryProcessor.get(); } @@ -78,7 +78,7 @@ private: BezierCubicTestOp(sk_sp<GrGeometryProcessor> gp, const SkRect& rect, GrColor color) : INHERITED(std::move(gp), rect, color, ClassID()) {} - void onPrepareDraws(Target* target) const override { + void onPrepareDraws(Target* target) override { QuadHelper helper; size_t vertexStride = this->gp()->getVertexStride(); SkASSERT(vertexStride == sizeof(SkPoint)); @@ -253,7 +253,7 @@ private: float fKLM[4]; // The last value is ignored. The effect expects a vec4f. }; - void onPrepareDraws(Target* target) const override { + void onPrepareDraws(Target* target) override { QuadHelper helper; size_t vertexStride = this->gp()->getVertexStride(); SkASSERT(vertexStride == sizeof(Vertex)); @@ -467,7 +467,7 @@ private: float fKLM[4]; // The last value is ignored. The effect expects a vec4f. }; - void onPrepareDraws(Target* target) const override { + void onPrepareDraws(Target* target) override { QuadHelper helper; size_t vertexStride = this->gp()->getVertexStride(); SkASSERT(vertexStride == sizeof(Vertex)); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 0d05d10487..9c437e2ffa 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -65,7 +65,7 @@ private: this->setBounds(sorted_rect(fRect), HasAABloat::kNo, IsZeroArea::kNo); } - void onPrepareDraws(Target* target) const override { + void onPrepareDraws(Target* target) override { using namespace GrDefaultGeoProcFactory; Color color(fColor); @@ -82,7 +82,7 @@ private: fRect.toQuad(verts); - helper.recordDraw(target, gp.get(), target->makePipeline(0, &fProcessors)); + helper.recordDraw(target, gp.get(), target->makePipeline(0, std::move(fProcessors))); } bool onCombineIfPossible(GrOp* op, const GrCaps& caps) override { return false; } |