commit 1f5ee0d00c7f999d777d06dab9290be2c35e3496
author Brian Osman <brianosman@google.com> Thu Jun 10 14:40:40 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 10 20:40:54 2021 +0000
tree c5908ce25724e3d3f940ba9b4e445a29fc2d0b9e
parent ecc8e3bc043e5d51655bc027a4f618b985a81d61

Remove extra GrSkSLFP constructor

Both Make() factories have a similar pattern now (sharing the simpler
constructor, and appending uniforms in the factory).

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

src/gpu/effects/GrSkSLFP.cpp

diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 97b5527..8cbf561 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -190,8 +190,9 @@
         return nullptr;
     }
     size_t uniformSize = uniforms->size();
-    return std::unique_ptr<GrSkSLFP>(
-            new (uniformSize) GrSkSLFP(std::move(effect), name, std::move(uniforms)));
+    std::unique_ptr<GrSkSLFP> fp(new (uniformSize) GrSkSLFP(std::move(effect), name));
+    sk_careful_memcpy(fp->uniformData(), uniforms->data(), uniformSize);
+    return fp;
 }
 
 GrSkSLFP::GrSkSLFP(sk_sp<SkRuntimeEffect> effect, const char* name)
@@ -207,21 +208,6 @@
     }
 }
 
-GrSkSLFP::GrSkSLFP(sk_sp<SkRuntimeEffect> effect, const char* name, sk_sp<SkData> uniforms)
-        : INHERITED(kGrSkSLFP_ClassID,
-                    effect->getFilterColorProgram()
-                            ? kConstantOutputForConstantInput_OptimizationFlag
-                            : kNone_OptimizationFlags)
-        , fEffect(std::move(effect))
-        , fName(name)
-        , fUniformSize(uniforms->size()) {
-    sk_careful_memcpy(this->uniformData(), uniforms->data(), fUniformSize);
-
-    if (fEffect->usesSampleCoords()) {
-        this->setUsesSampleCoordsDirectly();
-    }
-}
-
 GrSkSLFP::GrSkSLFP(const GrSkSLFP& other)
         : INHERITED(kGrSkSLFP_ClassID, other.optimizationFlags())
         , fEffect(other.fEffect)

src/gpu/effects/GrSkSLFP.h

diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/effects/GrSkSLFP.h
index 159b7c4..fa9f548 100644
--- a/src/gpu/effects/GrSkSLFP.h
+++ b/src/gpu/effects/GrSkSLFP.h
@@ -106,7 +106,6 @@
 
 private:
     GrSkSLFP(sk_sp<SkRuntimeEffect> effect, const char* name);
-    GrSkSLFP(sk_sp<SkRuntimeEffect> effect, const char* name, sk_sp<SkData> uniforms);
     GrSkSLFP(const GrSkSLFP& other);
 
     std::unique_ptr<GrGLSLFragmentProcessor> onMakeProgramImpl() const override;