commit 8d1dcd7d9847b22329d29eea5c3b615dc89ec0f0
author Brian Salomon <bsalomon@google.com> Fri Mar 20 21:06:41 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 23 15:00:33 2020 +0000
tree adba923fc85d3a418b8955f9c7ec99034b78cf7c
parent 973236fcd48334f557bd6d588e733fd12f33e5a9

Specialize scale+translate transforms for explicitly sampled FPs.

This is to support using YUV->RGB in more places where we would incur a
full 3x3 matrix multiply for each plane in the fragment shader without
this.

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

src/gpu/glsl/GrGLSLGeometryProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
index 0c493d0..45b1d6f 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -80,6 +80,7 @@
         return std::make_tuple(localCoords, localCoordLength);
     };
 
+    GrShaderVar transformVar;
     for (int i = 0; *handler; ++*handler, ++i) {
         auto [coordTransform, fp] = handler->get();
         // Add uniform for coord transform matrix.
@@ -89,10 +90,16 @@
             strUniName.printf("CoordTransformMatrix_%d", i);
             auto flag = fp.isSampledWithExplicitCoords() ? kFragment_GrShaderFlag
                                                          : kVertex_GrShaderFlag;
-            fInstalledTransforms.push_back().fHandle =
-                    uniformHandler
-                            ->addUniform(flag, kFloat3x3_GrSLType, strUniName.c_str(), &matrixName)
-                            .toIndex();
+            auto& uni = fInstalledTransforms.push_back();
+            if (fp.isSampledWithExplicitCoords() && coordTransform.matrix().isScaleTranslate() &&
+                localMatrix.isScaleTranslate()) {
+                uni.fType = kFloat4_GrSLType;
+            } else {
+                uni.fType = kFloat3x3_GrSLType;
+            }
+            uni.fHandle =
+                    uniformHandler->addUniform(flag, uni.fType, strUniName.c_str(), &matrixName);
+            transformVar = uniformHandler->getUniformVariable(uni.fHandle);
         } else {
             // Install a coord transform that will be skipped.
             fInstalledTransforms.push_back();
@@ -100,6 +107,7 @@
             continue;
         }
 
+        GrShaderVar fsVar;
         // Add varying if required and register varying and matrix uniform.
         if (!fp.isSampledWithExplicitCoords()) {
             auto [localCoordsStr, localCoordLength] = getLocalCoords();
@@ -112,19 +120,16 @@
             strVaryingName.printf("TransformedCoords_%d", i);
             varyingHandler->addVarying(strVaryingName.c_str(), &v);
 
+            SkASSERT(fInstalledTransforms.back().fType == kFloat3x3_GrSLType);
             if (v.type() == kFloat2_GrSLType) {
                 vb->codeAppendf("%s = (%s * %s).xy;", v.vsOut(), matrixName,
                                 localCoordsStr.c_str());
             } else {
                 vb->codeAppendf("%s = %s * %s;", v.vsOut(), matrixName, localCoordsStr.c_str());
             }
-            GrShaderVar fsVar(SkString(v.fsIn()), v.type(), GrShaderVar::kIn_TypeModifier);
-            handler->specifyCoordsForCurrCoordTransform(SkString(matrixName),
-                                                        fInstalledTransforms.back().fHandle, fsVar);
-        } else {
-            handler->specifyCoordsForCurrCoordTransform(SkString(matrixName),
-                                                        fInstalledTransforms.back().fHandle);
+            fsVar = GrShaderVar(SkString(v.fsIn()), v.type(), GrShaderVar::kIn_TypeModifier);
         }
+        handler->specifyCoordsForCurrCoordTransform(transformVar, fsVar);
     }
 }
 
@@ -141,7 +146,14 @@
                 m = GetTransformMatrix(transform, localMatrix);
             }
             if (!SkMatrixPriv::CheapEqual(fInstalledTransforms[i].fCurrentValue, m)) {
-                pdman.setSkMatrix(fInstalledTransforms[i].fHandle.toIndex(), m);
+                if (fInstalledTransforms[i].fType == kFloat4_GrSLType) {
+                    float values[4] = {m.getScaleX(), m.getTranslateX(),
+                                       m.getScaleY(), m.getTranslateY()};
+                    pdman.set4fv(fInstalledTransforms[i].fHandle.toIndex(), 1, values);
+                } else {
+                    SkASSERT(fInstalledTransforms[i].fType == kFloat3x3_GrSLType);
+                    pdman.setSkMatrix(fInstalledTransforms[i].fHandle.toIndex(), m);
+                }
                 fInstalledTransforms[i].fCurrentValue = m;
             }
         }