commit 02b6f6fdc3a778f22ff1faafea67bccae9c59c1b
author John Stiles <johnstiles@google.com> Fri Jul 30 11:06:55 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Jul 30 16:10:48 2021 +0000
tree 86480ea6c1100085d7a39445b72e744a28dcdd25
parent ab7ff17156a3dc68ed630239a3a8594e09ad5610

Fix cloning of Runtime Blend fragment processors.

Previously, a cloned Runtime Blend FP would lose its
kIsBlendFunction_Flag, causing invalid code to be generated.

This broke the `filltypespersp` slide when "Force Runtime Blends" is on.

Change-Id: I9a140bc6467536e5ebeb2ca47eca6f013462dd58
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/434919
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/effects/GrSkSLFP.cpp

diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 49bc7a4..290a2be 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -270,14 +270,11 @@
     size_t uniformSize = uniforms->size();
     size_t uniformFlagSize = effect->uniforms().count() * sizeof(UniformFlags);
     std::unique_ptr<GrSkSLFP> fp(new (uniformSize + uniformFlagSize)
-                                         GrSkSLFP(effect, name, OptFlags::kNone));
+                                         GrSkSLFP(std::move(effect), name, OptFlags::kNone));
     sk_careful_memcpy(fp->uniformData(), uniforms->data(), uniformSize);
     for (auto& childFP : childFPs) {
         fp->addChild(std::move(childFP), /*mergeOptFlags=*/true);
     }
-    if (effect->allowBlender()) {
-        fp->setIsBlendFunction();
-    }
     if (inputFP) {
         fp->setInput(std::move(inputFP));
     }
@@ -300,6 +297,9 @@
     if (fEffect->usesSampleCoords()) {
         this->setUsesSampleCoordsDirectly();
     }
+    if (fEffect->allowBlender()) {
+        this->setIsBlendFunction();
+    }
 }
 
 GrSkSLFP::GrSkSLFP(const GrSkSLFP& other)
@@ -316,6 +316,9 @@
     if (fEffect->usesSampleCoords()) {
         this->setUsesSampleCoordsDirectly();
     }
+    if (fEffect->allowBlender()) {
+        this->setIsBlendFunction();
+    }
 
     this->cloneAndRegisterAllChildProcessors(other);
 }

src/gpu/effects/GrSkSLFP.h

diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/effects/GrSkSLFP.h
index 67c262a..b7affa6 100644
--- a/src/gpu/effects/GrSkSLFP.h
+++ b/src/gpu/effects/GrSkSLFP.h
@@ -147,11 +147,9 @@
 #endif
 
         size_t uniformPayloadSize = UniformPayloadSize(effect.get());
-        std::unique_ptr<GrSkSLFP> fp(new (uniformPayloadSize) GrSkSLFP(effect, name, optFlags));
+        std::unique_ptr<GrSkSLFP> fp(new (uniformPayloadSize)
+                                             GrSkSLFP(std::move(effect), name, optFlags));
         fp->appendArgs(fp->uniformData(), fp->uniformFlags(), std::forward<Args>(args)...);
-        if (effect->allowBlender()) {
-            fp->setIsBlendFunction();
-        }
         if (inputFP) {
             fp->setInput(std::move(inputFP));
         }