From 4b62aed9736f2f4c664e9ee947bd896c74739a59 Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Tue, 15 Jan 2019 11:53:00 -0700 Subject: Return GrProcessorSet::Analysis from GrDrawOp::finalize Bug: skia:8671 Change-Id: Ib35d1642659021419f408bf19b1b0dc0066e8df2 Reviewed-on: https://skia-review.googlesource.com/c/184160 Reviewed-by: Brian Salomon Commit-Queue: Chris Dalton --- gm/beziereffects.cpp | 7 +++---- gm/clockwise.cpp | 4 ++-- gm/convexpolyeffect.cpp | 7 +++---- gm/fwidth_squircle.cpp | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) (limited to 'gm') diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index ff4ea00ec5..c3e4c71b30 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -28,10 +28,9 @@ class BezierTestOp : public GrMeshDrawOp { public: FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } - RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override { - auto analysis = fProcessorSet.finalize(fColor, GrProcessorAnalysisCoverage::kSingleChannel, - clip, false, caps, &fColor); - return analysis.requiresDstTexture() ? RequiresDstTexture::kYes : RequiresDstTexture::kNo; + GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip) override { + return fProcessorSet.finalize(fColor, GrProcessorAnalysisCoverage::kSingleChannel, clip, + false, caps, &fColor); } void visitProxies(const VisitProxyFunc& func, VisitorType) const override { diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp index 7769c7e9e8..df1dcf1e55 100644 --- a/gm/clockwise.cpp +++ b/gm/clockwise.cpp @@ -104,8 +104,8 @@ private: const char* name() const override { return "ClockwiseTestOp"; } FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } - RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override { - return RequiresDstTexture::kNo; + GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*) override { + return GrProcessorSet::EmptySetAnalysis(); } void onPrepare(GrOpFlushState*) override {} void onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) override { diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 22aa69dab8..62d95d3191 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -57,10 +57,9 @@ public: FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } - RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override { - auto analysis = fProcessors.finalize(fColor, GrProcessorAnalysisCoverage::kNone, clip, - false, caps, &fColor); - return analysis.requiresDstTexture() ? RequiresDstTexture::kYes : RequiresDstTexture::kNo; + GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip) override { + return fProcessors.finalize(fColor, GrProcessorAnalysisCoverage::kNone, clip, false, caps, + &fColor); } private: diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp index 4c565cbac3..0d140e9619 100644 --- a/gm/fwidth_squircle.cpp +++ b/gm/fwidth_squircle.cpp @@ -129,8 +129,8 @@ private: const char* name() const override { return "ClockwiseTestOp"; } FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } - RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override { - return RequiresDstTexture::kNo; + GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*) override { + return GrProcessorSet::EmptySetAnalysis(); } void onPrepare(GrOpFlushState*) override {} void onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) override { -- cgit v1.2.3