commit 27372888a5c7698f51069bd5b5beea3e85b66668
author Chris Dalton <csmartdalton@google.com> Fri Dec 08 13:34:21 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 08 20:57:28 2017 +0000
tree 2fb60b65f286fe7da33467918198ad731cef708d
parent be4ffab4e208ec47b4298621b9c9e8456f31717e

Don't force GrGLSLVarying's scope to be compile-time constant

Bug: skia:
Change-Id: I70a191949fd26a39257a8a59a0a4c6448ec1fa37
Reviewed-on: https://skia-review.googlesource.com/82462
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/ccpr/GrCCPRPathProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRPathProcessor.cpp b/src/gpu/ccpr/GrCCPRPathProcessor.cpp
index be9f67a..c99a010 100644
--- a/src/gpu/ccpr/GrCCPRPathProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRPathProcessor.cpp
@@ -122,8 +122,8 @@
 
     varyingHandler->emitAttributes(proc);
 
-    GrGLSLVertToFrag texcoord(kFloat2_GrSLType);
-    GrGLSLVertToFrag color(kHalf4_GrSLType);
+    GrGLSLVarying texcoord(kFloat2_GrSLType);
+    GrGLSLVarying color(kHalf4_GrSLType);
     varyingHandler->addVarying("texcoord", &texcoord);
     varyingHandler->addFlatPassThroughAttribute(&proc.getInstanceAttrib(InstanceAttribs::kColor),
                                                 args.fOutputColor);