commit bf5c0c0c999c221345010aafe04993e6b1ccbbe0
author Brian Salomon <bsalomon@google.com> Mon Nov 11 14:55:28 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 14 17:46:18 2019 +0000
tree 71c9204644ee3c43bdf5ec4912686f9ff1e9eef4
parent e57ca49319522930e1342be90362ccf7cb4e9214

Fixed sampling non-SkSL FPs with coordinates

This fixes an issue where fragment processors which were not written
in pure SkSL did not interact properly with coordinate overrides.

Change-Id: I960173986fd8d6be7322f55ab0d81a533b6b89e5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252916
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp

diff --git a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
index 804a42c..235a137 100644
--- a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
@@ -52,9 +52,8 @@
                 "0:\n        {\n            half r0 = %s.x;\n            @if (%s) {\n              "
                 "  t = length(p) - float(r0);\n            } else {\n                t = "
                 "-length(p) - float(r0);\n       ",
-                _outer.computeLocalCoordsInVertexShader() ? sk_TransformedCoords2D_0.c_str()
-                                                          : "_coords",
-                (int)_outer.type, args.fUniformHandler->getUniformCStr(focalParamsVar),
+                sk_TransformedCoords2D_0.c_str(), (int)_outer.type,
+                args.fUniformHandler->getUniformCStr(focalParamsVar),
                 args.fUniformHandler->getUniformCStr(focalParamsVar),
                 (_outer.isRadiusIncreasing ? "true" : "false"));
         fragBuilder->codeAppendf(