Changes to GrCoordTransform and local coords
*Don't track vertex-shader status per-coord transform, just at FP level
*Remove outdated "in processor" checks
*Adjust "uses local coords" on FP to consider whether coord transforms
actually transform local coords or custom coords
*Remove unused accessMatrix() method
*Don't track normalization and y-flipping separately from proxy
*Rename some things for clarity
*Simplify FPCoordTransformHandler
Change-Id: Ic493afc82bd949bbab177d33111a1942e33f88a9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256101
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
index 706e892..8d6c94d 100644
--- a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
@@ -35,7 +35,7 @@
}
// if the fragment processor is invoked with overridden coordinates, it must *always* be invoked
// with overridden coords
- SkASSERT(args.fFp.computeLocalCoordsInVertexShader() == (skslCoords.length() == 0));
+ SkASSERT(args.fFp.coordTransformsApplyToLocalCoords() == (skslCoords.length() == 0));
fragBuilder->codeAppendf("%s = %s(%s", outputColor, fFunctionNames[childIndex].c_str(),
inputColor ? inputColor : "half4(1)");
if (skslCoords.length()) {
@@ -54,7 +54,7 @@
while (childIndex >= (int) fFunctionNames.size()) {
fFunctionNames.emplace_back();
}
- if (!args.fFp.computeLocalCoordsInVertexShader() && skslCoords.length() == 0) {
+ if (!args.fFp.coordTransformsApplyToLocalCoords() && skslCoords.length() == 0) {
skslCoords = "_coords";
}
if (fFunctionNames[childIndex].size() == 0) {