Make result of GrOp::combineIfPossible be an enum.

This is to prepare for a third value that requests that ops be linked
together so that the first op may do the work for multiple linked ops
without actually merging the GrOp objects.

Change-Id: Ib6e012a89be5edd054aee69d8475bea612331852
Reviewed-on: https://skia-review.googlesource.com/145522
Commit-Queue: Brian Salomon <[email protected]>
Reviewed-by: Brian Osman <[email protected]>
Auto-Submit: Brian Salomon <[email protected]>

Author: bsalomon

bench/VertexColorSpaceBench.cpp

@@ -152,8 +152,6 @@ class Op : public GrMeshDrawOp {
 private:
     friend class ::GrOpMemoryPool;
 
-    bool onCombineIfPossible(GrOp*, const GrCaps&) override { return false; }
-
     void onPrepareDraws(Target* target) override {
         sk_sp<GrGeometryProcessor> gp(new GP(fMode, fColorSpaceXform));
 

gm/beziereffects.cpp

@@ -60,8 +60,6 @@ class BezierTestOp : public GrMeshDrawOp {
     GrColor color() const { return fColor; }
 
 private:
-    bool onCombineIfPossible(GrOp* op, const GrCaps& caps) override { return false; }
-
     SkRect fRect;
     GrColor fColor;
     sk_sp<const GrGeometryProcessor> fGeometryProcessor;

gm/clockwise.cpp

@@ -108,7 +108,6 @@ class ClockwiseTestOp : public GrDrawOp {
     RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override {
         return RequiresDstTexture::kNo;
     }
-    bool onCombineIfPossible(GrOp* other, const GrCaps& caps) override { return false; }
     void onPrepare(GrOpFlushState*) override {}
     void onExecute(GrOpFlushState* flushState) override {
         SkPoint vertices[4] = {

gm/convexpolyeffect.cpp

@@ -99,8 +99,6 @@ class PolyBoundsOp : public GrMeshDrawOp {
         helper.recordDraw(target, std::move(gp), pipe.fPipeline, pipe.fFixedDynamicState);
     }
 
-    bool onCombineIfPossible(GrOp* op, const GrCaps& caps) override { return false; }
-
     GrColor fColor;
     GrProcessorSet fProcessors;
     SkRect fRect;

samplecode/SampleCCPRGeometry.cpp

@@ -89,7 +89,6 @@ class CCPRGeometryView::DrawCoverageCountOp : public GrDrawOp {
     RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override {
         return RequiresDstTexture::kNo;
     }
-    bool onCombineIfPossible(GrOp* other, const GrCaps& caps) override { return false; }
     void onPrepare(GrOpFlushState*) override {}
     void onExecute(GrOpFlushState*) override;
 

src/atlastext/SkAtlasTextTarget.cpp

@@ -181,7 +181,7 @@ void SkInternalAtlasTextTarget::addDrawOp(const GrClip& clip, std::unique_ptr<Gr
     int n = SkTMin(kMaxBatchLookBack, fOps.count());
     for (int i = 0; i < n; ++i) {
         GrAtlasTextOp* other = fOps.fromBack(i).get();
-        if (other->combineIfPossible(op.get(), caps)) {
+        if (other->combineIfPossible(op.get(), caps) == GrOp::CombineResult::kMerged) {
             fOpMemoryPool->release(std::move(op));
             return;
         }

src/gpu/GrRenderTargetOpList.cpp

@@ -339,7 +339,7 @@ bool GrRenderTargetOpList::combineIfPossible(const RecordedOp& a, GrOp* b,
     } else if (a.fDstProxy.proxy()) {
         return false;
     }
-    return a.fOp->combineIfPossible(b, caps);
+    return a.fOp->combineIfPossible(b, caps) == GrOp::CombineResult::kMerged;
 }
 
 uint32_t GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op,

src/gpu/ccpr/GrCCDrawPathsOp.cpp

@@ -117,7 +117,7 @@ GrDrawOp::RequiresDstTexture GrCCDrawPathsOp::finalize(const GrCaps& caps,
     return RequiresDstTexture(analysis.requiresDstTexture());
 }
 
-bool GrCCDrawPathsOp::onCombineIfPossible(GrOp* op, const GrCaps&) {
+GrOp::CombineResult GrCCDrawPathsOp::onCombineIfPossible(GrOp* op, const GrCaps&) {
     GrCCDrawPathsOp* that = op->cast<GrCCDrawPathsOp>();
     SkASSERT(fOwningPerOpListPaths);
     SkASSERT(fNumDraws);
@@ -126,15 +126,15 @@ bool GrCCDrawPathsOp::onCombineIfPossible(GrOp* op, const GrCaps&) {
 
     if (fProcessors != that->fProcessors ||
         fViewMatrixIfUsingLocalCoords != that->fViewMatrixIfUsingLocalCoords) {
-        return false;
+        return CombineResult::kCannotCombine;
     }
 
     fDraws.append(std::move(that->fDraws), &fOwningPerOpListPaths->fAllocator);
     this->joinBounds(*that);
 
     SkDEBUGCODE(fNumDraws += that->fNumDraws);
     SkDEBUGCODE(that->fNumDraws = 0);
-    return true;
+    return CombineResult::kMerged;
 }
 
 void GrCCDrawPathsOp::wasRecorded(GrCCPerOpListPaths* owningPerOpListPaths) {

src/gpu/ccpr/GrCCDrawPathsOp.h

@@ -37,7 +37,7 @@ class GrCCDrawPathsOp : public GrDrawOp {
     const char* name() const override { return "GrCCDrawPathsOp"; }
     FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
     RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override;
-    bool onCombineIfPossible(GrOp*, const GrCaps&) override;
+    CombineResult onCombineIfPossible(GrOp*, const GrCaps&) override;
     void visitProxies(const VisitProxyFunc& fn) const override { fProcessors.visitProxies(fn); }
     void onPrepare(GrOpFlushState*) override {}
 

src/gpu/ccpr/GrCCPerFlushResources.cpp

@@ -27,9 +27,9 @@ class AtlasOp : public GrDrawOp {
     RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override {
         return RequiresDstTexture::kNo;
     }
-    bool onCombineIfPossible(GrOp* other, const GrCaps&) override {
+    CombineResult onCombineIfPossible(GrOp* other, const GrCaps&) override {
         SK_ABORT("Only expected one Op per CCPR atlas.");
-        return true;
+        return CombineResult::kMerged;
     }
     void onPrepare(GrOpFlushState*) override {}