commit afe2c90739e957f1bb6e39eab55910b50ca9d5a6
author Ethan Nicholas <ethannicholas@google.com> Tue Apr 28 13:55:02 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 28 20:37:44 2020 +0000
tree 0960d43727ca8e2356a40821cb91c46dd357a573
parent 3c411f58c40d5a19d8c21ea7800af5262a257d9a

Revert "Revert "Converted texture and runtime effects to use GrMatrixEffect""

This reverts commit 36a3e014e10850ff692e5fd65e8e4d0354505916.

Change-Id: I2bb432ec423a85478adddc6845d5d7aa59d4055b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284918
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/effects/GrSkSLFP.cpp

diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 1df2df1..a2e9b46 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -163,28 +163,23 @@
 };
 
 std::unique_ptr<GrSkSLFP> GrSkSLFP::Make(GrContext_Base* context, sk_sp<SkRuntimeEffect> effect,
-                                         const char* name, sk_sp<SkData> inputs,
-                                         const SkMatrix* matrix) {
+                                         const char* name, sk_sp<SkData> inputs) {
     if (inputs->size() != effect->inputSize()) {
         return nullptr;
     }
     return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(
             context->priv().caps()->refShaderCaps(), context->priv().getShaderErrorHandler(),
-            std::move(effect), name, std::move(inputs), matrix));
+            std::move(effect), name, std::move(inputs)));
 }
 
 GrSkSLFP::GrSkSLFP(sk_sp<const GrShaderCaps> shaderCaps, ShaderErrorHandler* shaderErrorHandler,
-                   sk_sp<SkRuntimeEffect> effect, const char* name, sk_sp<SkData> inputs,
-                   const SkMatrix* matrix)
+                   sk_sp<SkRuntimeEffect> effect, const char* name, sk_sp<SkData> inputs)
         : INHERITED(kGrSkSLFP_ClassID, kNone_OptimizationFlags)
         , fShaderCaps(std::move(shaderCaps))
         , fShaderErrorHandler(shaderErrorHandler)
         , fEffect(std::move(effect))
         , fName(name)
         , fInputs(std::move(inputs)) {
-    if (matrix) {
-        fCoordTransform = GrCoordTransform(*matrix);
-    }
     this->addCoordTransform(&fCoordTransform);
 }
 
@@ -195,8 +190,6 @@
         , fEffect(other.fEffect)
         , fName(other.fName)
         , fInputs(other.fInputs) {
-    SkASSERT(other.numCoordTransforms() == 1);
-    fCoordTransform = other.fCoordTransform;
     this->addCoordTransform(&fCoordTransform);
 }
 
@@ -291,7 +284,7 @@
             auto result = GrSkSLFP::Make(d->context(), effect, "Arithmetic",
                                          SkData::MakeWithCopy(&inputs, sizeof(inputs)));
             result->addChild(GrConstColorProcessor::Make(
-                    SK_PMColor4fWHITE, GrConstColorProcessor::InputMode::kIgnore));
+                                     SK_PMColor4fWHITE, GrConstColorProcessor::InputMode::kIgnore));
             return std::unique_ptr<GrFragmentProcessor>(result.release());
         }
         case 2: {