commit 354147a23c1a7654c9d9641e38e3805078a12eca
author Brian Salomon <bsalomon@google.com> Wed Apr 14 11:15:05 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 14 18:40:18 2021 +0000
tree f4d59d5ed78d239293c15e4f219c8a5a5880d463
parent 3c1ed9cbe23d0c3175d3a935b6bdf767e0701728

Replace GrConstColorProcessor with a runtime FP

Change-Id: Ie36ea4d5186f6cca341efc6300b813ec8255bdbb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388457
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrProcessorUnitTest.cpp

diff --git a/src/gpu/GrProcessorUnitTest.cpp b/src/gpu/GrProcessorUnitTest.cpp
index 10204e3..ffcc3be 100644
--- a/src/gpu/GrProcessorUnitTest.cpp
+++ b/src/gpu/GrProcessorUnitTest.cpp
@@ -12,7 +12,6 @@
 #include "include/gpu/GrRecordingContext.h"
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/effects/generated/GrConstColorProcessor.h"
 
 #if GR_TEST_UTILS
 
@@ -147,7 +146,7 @@
  * we verify the count is as expected.  If a new factory is added, then these numbers must be
  * manually adjusted.
  */
-static constexpr int kFPFactoryCount = 35;
+static constexpr int kFPFactoryCount = 34;
 static constexpr int kGPFactoryCount = 14;
 static constexpr int kXPFactoryCount = 4;
 
@@ -183,7 +182,7 @@
         // We've gone too deep, but we can't necessarily return null without risking an assertion.
         // Instead, return a known-simple zero-child FP. This limits the recursion, and the
         // generated FP will be rejected by the numNonNullChildProcessors check below.
-        fp = GrConstColorProcessor::Make(SK_PMColor4fTRANSPARENT);
+        fp = GrFragmentProcessor::MakeColor(SK_PMColor4fTRANSPARENT);
     } else {
         for (;;) {
             fp = GrFragmentProcessorTestFactory::Make(data);