commit 6609cb6452d473d86ec780f7091826cb388117f9
author John Stiles <johnstiles@google.com> Fri Jul 17 14:52:12 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 17 19:41:34 2020 +0000
tree 99efd6aa1eb3c53a5c7f6a04a65d1842ccedb93f
parent d0c9d0cb7ffa5e562c6554546b9d012c520323f7

Update existing TestCreate methods to honor the inputFP in the TestData.

This can be leveraged to build chains of test FPs in a controlled way.
At present, `inputFP` it is never set to anything other than null; as
such, all calls to TestCreate continue to set a null inputFP
(exactly as they do already).

Change-Id: I0d74f37a076ca338e44ff734816299beb1667c26
Bug: skia:10384
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302668
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

src/gpu/effects/generated/GrEllipseEffect.cpp

diff --git a/src/gpu/effects/generated/GrEllipseEffect.cpp b/src/gpu/effects/generated/GrEllipseEffect.cpp
index fbf4728..b5dd0ae 100644
--- a/src/gpu/effects/generated/GrEllipseEffect.cpp
+++ b/src/gpu/effects/generated/GrEllipseEffect.cpp
@@ -169,12 +169,11 @@
     SkScalar rx = testData->fRandom->nextRangeF(0.f, 1000.f);
     SkScalar ry = testData->fRandom->nextRangeF(0.f, 1000.f);
     bool success;
-    std::unique_ptr<GrFragmentProcessor> fp;
+    std::unique_ptr<GrFragmentProcessor> fp = testData->inputFP();
     do {
         GrClipEdgeType et = (GrClipEdgeType)testData->fRandom->nextULessThan(kGrClipEdgeTypeCnt);
-        std::tie(success, fp) =
-                GrEllipseEffect::Make(/*inputFP=*/nullptr, et, center, SkPoint::Make(rx, ry),
-                                      *testData->caps()->shaderCaps());
+        std::tie(success, fp) = GrEllipseEffect::Make(
+                std::move(fp), et, center, SkPoint::Make(rx, ry), *testData->caps()->shaderCaps());
     } while (!success);
     return fp;
 }