commit fc2fdf025e9fa01b5eeb61491d4a7c1d9ed74396
author Michael Ludwig <michaelludwig@google.com> Mon Jun 29 17:20:13 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 30 15:18:03 2020 +0000
tree cc0ea10841d234535645c02725b96c39dcb0cad2
parent ad2484520d5dad391a76127cc227ed070be26ede

Support sample coords in .fp main()

This removes the code generation support for @coordTransform and sk_TransformedCoords2D
when processing .fp files. Instead, the main() function can optionally add a float2
parameter. This is marked as the SK_MAIN_COORDS builtin, just like the main function
for a runtime pipeline stage.

Bug: skia:10416
Change-Id: I0c192d890bb798a1167bc445003f6ddffe6118f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299687
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

src/gpu/effects/generated/GrMagnifierEffect.cpp

diff --git a/src/gpu/effects/generated/GrMagnifierEffect.cpp b/src/gpu/effects/generated/GrMagnifierEffect.cpp
index b447b1a..118e1b6 100644
--- a/src/gpu/effects/generated/GrMagnifierEffect.cpp
+++ b/src/gpu/effects/generated/GrMagnifierEffect.cpp
@@ -48,9 +48,8 @@
         offsetVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
                                                      kHalf2_GrSLType, "offset");
         fragBuilder->codeAppendf(
-                R"SkSL(float2 coord = %s;
-float2 zoom_coord = float2(%s) + coord * float2(%s, %s);
-float2 delta = (coord - %s.xy) * %s.zw;
+                R"SkSL(float2 zoom_coord = float2(%s) + %s * float2(%s, %s);
+float2 delta = (%s - %s.xy) * %s.zw;
 delta = min(delta, float2(half2(1.0, 1.0)) - delta);
 delta *= float2(%s, %s);
 float weight = 0.0;
@@ -63,21 +62,21 @@
     float2 delta_squared = delta * delta;
     weight = min(min(delta_squared.x, delta_squared.y), 1.0);
 })SkSL",
-                args.fSampleCoord, args.fUniformHandler->getUniformCStr(offsetVar),
+                args.fUniformHandler->getUniformCStr(offsetVar), args.fSampleCoord,
                 args.fUniformHandler->getUniformCStr(xInvZoomVar),
-                args.fUniformHandler->getUniformCStr(yInvZoomVar),
+                args.fUniformHandler->getUniformCStr(yInvZoomVar), args.fSampleCoord,
                 args.fUniformHandler->getUniformCStr(boundsUniformVar),
                 args.fUniformHandler->getUniformCStr(boundsUniformVar),
                 args.fUniformHandler->getUniformCStr(xInvInsetVar),
                 args.fUniformHandler->getUniformCStr(yInvInsetVar));
-        SkString _coords1077("mix(coord, zoom_coord, weight)");
-        SkString _sample1077;
-        _sample1077 = this->invokeChild(_outer.src_index, args, _coords1077.c_str());
+        SkString _coords1043 = SkStringPrintf("mix(%s, zoom_coord, weight)", args.fSampleCoord);
+        SkString _sample1043;
+        _sample1043 = this->invokeChild(_outer.src_index, args, _coords1043.c_str());
         fragBuilder->codeAppendf(
                 R"SkSL(
 %s = %s;
 )SkSL",
-                args.fOutputColor, _sample1077.c_str());
+                args.fOutputColor, _sample1043.c_str());
     }
 
 private: