commit 2fade72a4ea2a6ca635137e7718b7d5ce6eab474
author Brian Salomon <bsalomon@google.com> Fri Mar 20 12:35:32 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 20 17:44:45 2020 +0000
tree 0fda58d952fd124782ef6552cc04f87ba2bad7d4
parent 7b7b78cb9f1bd8b57fb849e5cae7f477e84d3cf6

Set correct coord transform visibility initially rather than update.

Aside from being simpler it also makes the matrix uniforms for
explicitly sampled FPs appear only in the FS and not both VS and FS.

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

src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
index a83277e..914626e1 100644
--- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -166,10 +166,7 @@
     if (args.fFp.isSampledWithExplicitCoords() && args.fTransformedCoords.count() > 0) {
         // we currently only support overriding a single coordinate pair
         SkASSERT(args.fTransformedCoords.count() == 1);
-        const GrGLSLProgramDataManager::UniformHandle& mat =
-                                                          args.fTransformedCoords[0].fUniformMatrix;
-        if (mat.isValid()) {
-            args.fUniformHandler->updateUniformVisibility(mat, kFragment_GrShaderFlag);
+        if (args.fTransformedCoords[0].fUniformMatrix.isValid()) {
             this->codeAppendf("_coords = (%s * float3(_coords, 1)).xy;\n",
                               args.fTransformedCoords[0].fMatrixCode.c_str());
         }