Remove VisitorType from GrOp::visitProxies
We are planning to start detecting mipmaps and MSAA resolves during
the "gather" step now, so all visits should behave the same at this
point. (And it appears there might not have been any GrOps that
actually changed their behavior based on this flag at the moment.)
Bug: skia:
Change-Id: I7a7a1c9c47cbe03683c42025bf6d0ecb32a57ba1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/215145
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index ffba9ca..3e519e8 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -688,7 +688,7 @@
const char* name() const override { return "AAConvexPathOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index b6a5964..21db430 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -821,7 +821,7 @@
const char* name() const override { return "AAHairlineOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 5fee494..692022a 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -164,7 +164,7 @@
const char* name() const override { return "AAFlatteningConvexPathOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 4f10fb3..646c9ea 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -113,7 +113,7 @@
this->setBounds(bounds, HasAABloat::kNo, IsZeroArea::kNo);
}
-void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func, VisitorType) const {
+void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func) const {
fProcessors.visitProxies(func);
}
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 6a8d5d6..2e42389 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -67,7 +67,7 @@
const char* name() const override { return "AtlasTextOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override;
+ void visitProxies(const VisitProxyFunc& func) const override;
#ifdef SK_DEBUG
SkString dumpInfo() const override;
diff --git a/src/gpu/ops/GrCopySurfaceOp.h b/src/gpu/ops/GrCopySurfaceOp.h
index 3c6194d..0b7f532 100644
--- a/src/gpu/ops/GrCopySurfaceOp.h
+++ b/src/gpu/ops/GrCopySurfaceOp.h
@@ -25,7 +25,7 @@
const char* name() const override { return "CopySurface"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override { func(fSrc.get()); }
+ void visitProxies(const VisitProxyFunc& func) const override { func(fSrc.get()); }
#ifdef SK_DEBUG
SkString dumpInfo() const override {
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index bb80057..eae40a1 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -223,7 +223,7 @@
const char* name() const override { return "DashOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fProcessorSet.visitProxies(func);
}
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 9e369a4..a314ae7 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -352,7 +352,7 @@
const char* name() const override { return "DefaultPathOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index c8f453b..34bea07 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -34,7 +34,7 @@
const char* name() const override { return "DrawAtlasOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index 53fcd03..95d266c 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -34,7 +34,7 @@
return this->doProcessorAnalysis(caps, clip, fsaaType, clampType);
}
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fProcessorSet.visitProxies(func);
}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index efa2640..580edd6 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -28,7 +28,7 @@
const char* name() const override { return "DrawVerticesOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrFillRRectOp.h b/src/gpu/ops/GrFillRRectOp.h
index 1686321..4bd2a23 100644
--- a/src/gpu/ops/GrFillRRectOp.h
+++ b/src/gpu/ops/GrFillRRectOp.h
@@ -29,7 +29,7 @@
GrProcessorSet::Analysis finalize(
const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override;
CombineResult onCombineIfPossible(GrOp*, const GrCaps&) override;
- void visitProxies(const VisitProxyFunc& fn, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& fn) const override {
fProcessors.visitProxies(fn);
}
void onPrepare(GrOpFlushState*) override;
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index ece0791..1889b0b 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -97,7 +97,7 @@
const char* name() const override { return "FillRectOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
return fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 21da22a..79cbc61 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -170,7 +170,7 @@
const char* name() const override { return "NonAALatticeOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
func(fProxy.get());
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index c617dc6..1c6f6e0 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -71,22 +71,7 @@
typedef std::function<void(GrSurfaceProxy*)> VisitProxyFunc;
- /**
- * Knowning the type of visitor may enable an op to be more efficient by skipping irrelevant
- * proxies on visitProxies.
- */
- enum class VisitorType : unsigned {
- /**
- * Ops *may* skip proxy visitation for allocation for proxies that have the
- * canSkipResourceAllocator() property.
- */
- kAllocatorGather,
- /**
- * Ops should visit all proxies.
- */
- kOther,
- };
- virtual void visitProxies(const VisitProxyFunc&, VisitorType = VisitorType::kOther) const {
+ virtual void visitProxies(const VisitProxyFunc&) const {
// This default implementation assumes the op has no proxies
}
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index f463431..5afd1d1 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1199,7 +1199,7 @@
const char* name() const override { return "CircleOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -1528,7 +1528,7 @@
const char* name() const override { return "ButtCappedDashedCircleOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -1826,7 +1826,7 @@
const char* name() const override { return "EllipseOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -2068,7 +2068,7 @@
const char* name() const override { return "DIEllipseOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -2392,7 +2392,7 @@
const char* name() const override { return "CircularRRectOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -2733,7 +2733,7 @@
const char* name() const override { return "EllipticalRRectOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index da575b6..b1556fd 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -66,7 +66,7 @@
const char* name() const override { return "GrRegionOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 642f6d2..e7f6a5a 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -272,7 +272,7 @@
const char* name() const override { return "SmallPathOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
const sk_sp<GrTextureProxy>* proxies = fAtlas->getProxies();
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 36489a5..6b516f7 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -89,7 +89,7 @@
const char* name() const override { return "NonAAStrokeRectOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
@@ -383,7 +383,7 @@
const char* name() const override { return "AAStrokeRect"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index 1539760..135260c 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -191,7 +191,7 @@
const char* name() const override { return "TessellatingPathOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
fHelper.visitProxies(func);
}
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 0d00080..15e73a0 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -195,7 +195,7 @@
const char* name() const override { return "TextureOp"; }
- void visitProxies(const VisitProxyFunc& func, VisitorType visitor) const override {
+ void visitProxies(const VisitProxyFunc& func) const override {
for (unsigned p = 0; p < fProxyCnt; ++p) {
func(fProxies[p].fProxy);
}