commit 54867de4bf3130b7be92df8293590fc9217744f4
author Brian Osman <brianosman@google.com> Fri Jul 10 14:22:57 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 10 19:54:49 2020 +0000
tree 1ad9842085063d6508b58b99122c7bf364db3b63
parent 2b54e8352a1dc91bd756ffb515af22a33cb117d5

Make GrFP::registerChild just return -1 for null children

Null children are becoming more common, so this centralizes the logic
that's currently handled via code-gen and manual checks.

Change-Id: Id8f4f4219b02690c2071ac29b36926dd50da23e9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301979
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/effects/GrMatrixConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 6fb6b42..7cece42 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -293,9 +293,7 @@
         , fBias(SkScalarToFloat(bias) / 255.0f)
         , fConvolveAlpha(convolveAlpha) {
     this->registerChild(std::move(child), SkSL::SampleUsage::Explicit());
-    if (kernelFP) {
-        this->registerChild(std::move(kernelFP), SkSL::SampleUsage::Explicit());
-    }
+    this->registerChild(std::move(kernelFP), SkSL::SampleUsage::Explicit());
     fKernelOffset = {static_cast<float>(kernelOffset.x()),
                      static_cast<float>(kernelOffset.y())};
     this->setUsesSampleCoordsDirectly();