commit 1706cbffc791bf1534313e04db3516c9af245b6c
author Chris Dalton <csmartdalton@google.com> Tue May 21 19:35:29 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 22 15:13:50 2019 +0000
tree de4cad7f14e02f861b66e795a9f45d9fb6d8e0e2
parent 57b177dc9168e157044ba9c5a656f338583baf9e

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>

src/gpu/GrRenderTargetOpList.cpp

diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 84fc9cb..20f625b 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -130,13 +130,12 @@
     fBounds = fList.head()->bounds();
 }
 
-void GrRenderTargetOpList::OpChain::visitProxies(const GrOp::VisitProxyFunc& func,
-                                                 GrOp::VisitorType visitor) const {
+void GrRenderTargetOpList::OpChain::visitProxies(const GrOp::VisitProxyFunc& func) const {
     if (fList.empty()) {
         return;
     }
     for (const auto& op : GrOp::ChainRange<>(fList.head())) {
-        op.visitProxies(func, visitor);
+        op.visitProxies(func);
     }
     if (fDstProxy.proxy()) {
         func(fDstProxy.proxy());
@@ -396,7 +395,7 @@
 
 void GrRenderTargetOpList::visitProxies_debugOnly(const GrOp::VisitProxyFunc& func) const {
     for (const OpChain& chain : fOpChains) {
-        chain.visitProxies(func, GrOp::VisitorType::kOther);
+        chain.visitProxies(func);
     }
 }
 
@@ -601,7 +600,7 @@
     };
     for (OpChain& recordedOp : fOpChains) {
         hasUninstantiatedProxy = false;
-        recordedOp.visitProxies(checkInstantiation, GrOp::VisitorType::kOther);
+        recordedOp.visitProxies(checkInstantiation);
         if (hasUninstantiatedProxy) {
             // When instantiation of the proxy fails we drop the Op
             recordedOp.deleteOps(fOpMemoryPool.get());
@@ -618,7 +617,7 @@
         }
     };
     for (const OpChain& recordedOp : fOpChains) {
-        recordedOp.visitProxies(visit, GrOp::VisitorType::kOther);
+        recordedOp.visitProxies(visit);
     }
 
     return used;
@@ -657,7 +656,7 @@
     };
     for (const OpChain& recordedOp : fOpChains) {
         // only diff from the GrTextureOpList version
-        recordedOp.visitProxies(gather, GrOp::VisitorType::kAllocatorGather);
+        recordedOp.visitProxies(gather);
 
         // Even though the op may have been (re)moved we still need to increment the op count to
         // keep all the math consistent.