diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-12-08 13:34:21 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 20:57:28 +0000 |
| commit | 27372888a5c7698f51069bd5b5beea3e85b66668 (patch) | |
| tree | 2fb60b65f286fe7da33467918198ad731cef708d /src/gpu/effects/GrBezierEffect.cpp | |
| parent | be4ffab4e208ec47b4298621b9c9e8456f31717e (diff) | |
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>
Diffstat (limited to 'src/gpu/effects/GrBezierEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 5bc04c82ea..25148cde1b 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -77,7 +77,7 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { // emit attributes varyingHandler->emitAttributes(gp); - GrGLSLVertToFrag v(kFloat4_GrSLType); + GrGLSLVarying v(kFloat4_GrSLType); varyingHandler->addVarying("ConicCoeffs", &v); vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inConicCoeffs()->fName); @@ -329,7 +329,7 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { // emit attributes varyingHandler->emitAttributes(gp); - GrGLSLVertToFrag v(kHalf4_GrSLType); + GrGLSLVarying v(kHalf4_GrSLType); varyingHandler->addVarying("HairQuadEdge", &v); vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inHairQuadEdge()->fName); @@ -552,13 +552,13 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { const char* devkLMMatrixName; fDevKLMUniform = uniformHandler->addUniform(kVertex_GrShaderFlag, kFloat3x3_GrSLType, "KLM", &devkLMMatrixName); - GrGLSLVertToFrag v(kFloat3_GrSLType); + GrGLSLVarying v(kFloat3_GrSLType); varyingHandler->addVarying("CubicCoeffs", &v); vertBuilder->codeAppendf("%s = %s * float3(%s, 1);", v.vsOut(), devkLMMatrixName, gpArgs->fPositionVar.c_str()); - GrGLSLVertToFrag gradCoeffs(kFloat4_GrSLType); + GrGLSLVarying gradCoeffs(kFloat4_GrSLType); if (GrClipEdgeType::kFillAA == fEdgeType || GrClipEdgeType::kHairlineAA == fEdgeType) { varyingHandler->addVarying("GradCoeffs", &gradCoeffs); vertBuilder->codeAppendf("float k = %s[0], l = %s[1], m = %s[2];", |