commit 92b9ccf53ede99a7b483586757f85ab5175a4af6
author Brian Salomon <bsalomon@google.com> Wed Jun 17 14:19:19 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 18 20:18:33 2020 +0000
tree 84401805bb0015e8068af56a4a7dd7656c9fe4a7
parent 3890d3d76511f53726f04c705b8a657ce8bc38e3

Use child texture effects in ProcessorRefTest

Also remove unused buffers. FPs no longer support reading from buffers.

Bug: skia:10139

Change-Id: Id1e2d7ef2cfa7f11a95cb0ce448c69af755c2b65
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297176
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/ProcessorTest.cpp

diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index e4fa193..19c5dee 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -91,9 +91,8 @@
     static std::unique_ptr<GrFragmentProcessor> Make(std::unique_ptr<GrFragmentProcessor> child) {
         return std::unique_ptr<GrFragmentProcessor>(new TestFP(std::move(child)));
     }
-    static std::unique_ptr<GrFragmentProcessor> Make(const SkTArray<GrSurfaceProxyView>& views,
-                                                     const SkTArray<sk_sp<GrGpuBuffer>>& buffers) {
-        return std::unique_ptr<GrFragmentProcessor>(new TestFP(views, buffers));
+    static std::unique_ptr<GrFragmentProcessor> Make(const SkTArray<GrSurfaceProxyView>& views) {
+        return std::unique_ptr<GrFragmentProcessor>(new TestFP(views));
     }
 
     const char* name() const override { return "test"; }
@@ -108,29 +107,20 @@
     }
 
 private:
-    TestFP(const SkTArray<GrSurfaceProxyView>& views,
-           const SkTArray<sk_sp<GrGpuBuffer>>& buffers)
-            : INHERITED(kTestFP_ClassID, kNone_OptimizationFlags), fSamplers(4) {
+    TestFP(const SkTArray<GrSurfaceProxyView>& views)
+            : INHERITED(kTestFP_ClassID, kNone_OptimizationFlags) {
         for (const auto& view : views) {
-            fSamplers.emplace_back(view);
+            this->registerChildProcessor(GrTextureEffect::Make(view, kUnknown_SkAlphaType));
         }
-        this->setTextureSamplerCnt(fSamplers.count());
     }
 
     TestFP(std::unique_ptr<GrFragmentProcessor> child)
-            : INHERITED(kTestFP_ClassID, kNone_OptimizationFlags), fSamplers(4) {
+            : INHERITED(kTestFP_ClassID, kNone_OptimizationFlags) {
         this->registerChildProcessor(std::move(child));
     }
 
-    explicit TestFP(const TestFP& that)
-            : INHERITED(kTestFP_ClassID, that.optimizationFlags()), fSamplers(4) {
-        for (int i = 0; i < that.fSamplers.count(); ++i) {
-            fSamplers.emplace_back(that.fSamplers[i]);
-        }
-        for (int i = 0; i < that.numChildProcessors(); ++i) {
-            this->registerChildProcessor(that.childProcessor(i).clone());
-        }
-        this->setTextureSamplerCnt(fSamplers.count());
+    explicit TestFP(const TestFP& that) : INHERITED(kTestFP_ClassID, that.optimizationFlags()) {
+        this->cloneAndRegisterAllChildProcessors(that);
     }
 
     virtual GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
@@ -148,9 +138,7 @@
     }
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return false; }
-    const TextureSampler& onTextureSampler(int i) const override { return fSamplers[i]; }
 
-    SkSTArray<4, TextureSampler> fSamplers;
     typedef GrFragmentProcessor INHERITED;
 };
 }
@@ -177,9 +165,8 @@
 
                 {
                     SkTArray<GrSurfaceProxyView> views;
-                    SkTArray<sk_sp<GrGpuBuffer>> buffers;
                     views.push_back({proxy, kTopLeft_GrSurfaceOrigin, swizzle});
-                    auto fp = TestFP::Make(std::move(views), std::move(buffers));
+                    auto fp = TestFP::Make(std::move(views));
                     for (int i = 0; i < parentCnt; ++i) {
                         fp = TestFP::Make(std::move(fp));
                     }