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/GrCCPRCubicShader.h

diff --git a/src/gpu/ccpr/GrCCPRCubicShader.h b/src/gpu/ccpr/GrCCPRCubicShader.h
index 7b91a49..be7635e 100644
--- a/src/gpu/ccpr/GrCCPRCubicShader.h
+++ b/src/gpu/ccpr/GrCCPRCubicShader.h
@@ -34,9 +34,9 @@
 
     virtual void onEmitVaryings(GrGLSLVaryingHandler*, SkString* code) = 0;
 
-    GrShaderVar       fKLMMatrix{"klm_matrix", kFloat3x3_GrSLType};
-    GrShaderVar       fEdgeDistanceEquation{"edge_distance_equation", kFloat3_GrSLType};
-    GrGLSLGeoToFrag   fKLMD{kFloat4_GrSLType};
+    GrShaderVar fKLMMatrix{"klm_matrix", kFloat3x3_GrSLType};
+    GrShaderVar fEdgeDistanceEquation{"edge_distance_equation", kFloat3_GrSLType};
+    GrGLSLVarying fKLMD{kFloat4_GrSLType, GrGLSLVarying::Scope::kGeoToFrag};
 };
 
 class GrCCPRCubicHullShader : public GrCCPRCubicShader {
@@ -47,7 +47,7 @@
     void onEmitVaryings(GrGLSLVaryingHandler*, SkString* code) override;
     void onEmitFragmentCode(GrGLSLPPFragmentBuilder*, const char* outputCoverage) const override;
 
-    GrGLSLGeoToFrag fGradMatrix{kFloat2x2_GrSLType};
+    GrGLSLVarying fGradMatrix{kFloat2x2_GrSLType, GrGLSLVarying::Scope::kGeoToFrag};
 };
 
 class GrCCPRCubicCornerShader : public GrCCPRCubicShader {
@@ -58,8 +58,8 @@
     void onEmitVaryings(GrGLSLVaryingHandler*, SkString* code) override;
     void onEmitFragmentCode(GrGLSLPPFragmentBuilder*, const char* outputCoverage) const override;
 
-    GrGLSLGeoToFrag    fdKLMDdx{kFloat4_GrSLType};
-    GrGLSLGeoToFrag    fdKLMDdy{kFloat4_GrSLType};
+    GrGLSLVarying fdKLMDdx{kFloat4_GrSLType, GrGLSLVarying::Scope::kGeoToFrag};
+    GrGLSLVarying fdKLMDdy{kFloat4_GrSLType, GrGLSLVarying::Scope::kGeoToFrag};
 };
 
 #endif