commit e2d67ce86bb5f40ebc221369f38f052211fb8e82
author Michael Ludwig <michaelludwig@google.com> Fri Jun 26 10:11:43 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 26 16:59:50 2020 +0000
tree aa54de25f2c86b2f95aa23f7ed97a1bd39a2c11b
parent 318afe66e699970ebf789718b5a2297f783ed712

Remove explicit matrix from GrDeviceEffect

Bug: skia:10396
Change-Id: I32dd41f4d1a6815cace46d74442f727da848fbfd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299285
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

src/gpu/effects/generated/GrDeviceSpaceEffect.cpp

diff --git a/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp b/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
index 810469b..0472548 100644
--- a/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
+++ b/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
@@ -23,32 +23,20 @@
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         const GrDeviceSpaceEffect& _outer = args.fFp.cast<GrDeviceSpaceEffect>();
         (void)_outer;
-        auto matrix = _outer.matrix;
-        (void)matrix;
-        matrixVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
-                                                     kFloat3x3_GrSLType, "matrix");
+        SkString _input203(args.fInputColor);
+        SkString _coords203("sk_FragCoord.xy");
+        SkString _sample203;
+        _sample203 =
+                this->invokeChild(_outer.fp_index, _input203.c_str(), args, _coords203.c_str());
         fragBuilder->codeAppendf(
-                R"SkSL(float3 p = %s * float3(sk_FragCoord.xy, 1);)SkSL",
-                args.fUniformHandler->getUniformCStr(matrixVar));
-        SkString _input276(args.fInputColor);
-        SkString _coords276("p.xy / p.z");
-        SkString _sample276;
-        _sample276 =
-                this->invokeChild(_outer.fp_index, _input276.c_str(), args, _coords276.c_str());
-        fragBuilder->codeAppendf(
-                R"SkSL(
-%s = %s;
+                R"SkSL(%s = %s;
 )SkSL",
-                args.fOutputColor, _sample276.c_str());
+                args.fOutputColor, _sample203.c_str());
     }
 
 private:
     void onSetData(const GrGLSLProgramDataManager& pdman,
-                   const GrFragmentProcessor& _proc) override {
-        const GrDeviceSpaceEffect& _outer = _proc.cast<GrDeviceSpaceEffect>();
-        { pdman.setSkMatrix(matrixVar, (_outer.matrix)); }
-    }
-    UniformHandle matrixVar;
+                   const GrFragmentProcessor& _proc) override {}
 };
 GrGLSLFragmentProcessor* GrDeviceSpaceEffect::onCreateGLSLInstance() const {
     return new GrGLSLDeviceSpaceEffect();
@@ -58,11 +46,10 @@
 bool GrDeviceSpaceEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrDeviceSpaceEffect& that = other.cast<GrDeviceSpaceEffect>();
     (void)that;
-    if (matrix != that.matrix) return false;
     return true;
 }
 GrDeviceSpaceEffect::GrDeviceSpaceEffect(const GrDeviceSpaceEffect& src)
-        : INHERITED(kGrDeviceSpaceEffect_ClassID, src.optimizationFlags()), matrix(src.matrix) {
+        : INHERITED(kGrDeviceSpaceEffect_ClassID, src.optimizationFlags()) {
     { fp_index = this->cloneAndRegisterChildProcessor(src.childProcessor(src.fp_index)); }
 }
 std::unique_ptr<GrFragmentProcessor> GrDeviceSpaceEffect::clone() const {