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/GrDistanceFieldGeoProc.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/GrDistanceFieldGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index fda2f9d5c2..2747f55119 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -76,9 +76,9 @@ public: args.fFPCoordTransformHandler); // add varyings - GrGLSLVertToFrag uv(kFloat2_GrSLType); - GrGLSLVertToFrag texIdx(kHalf_GrSLType); - GrGLSLVertToFrag st(kFloat2_GrSLType); + GrGLSLVarying uv(kFloat2_GrSLType); + GrGLSLVarying texIdx(kHalf_GrSLType); + GrGLSLVarying st(kFloat2_GrSLType); append_index_uv_varyings(args, dfTexEffect.inTextureCoords()->fName, atlasSizeInvName, &uv, &texIdx, &st); @@ -342,9 +342,9 @@ public: "AtlasSizeInv", &atlasSizeInvName); - GrGLSLVertToFrag uv(kFloat2_GrSLType); - GrGLSLVertToFrag texIdx(kHalf_GrSLType); - GrGLSLVertToFrag st(kFloat2_GrSLType); + GrGLSLVarying uv(kFloat2_GrSLType); + GrGLSLVarying texIdx(kHalf_GrSLType); + GrGLSLVarying st(kFloat2_GrSLType); append_index_uv_varyings(args, dfTexEffect.inTextureCoords()->fName, atlasSizeInvName, &uv, &texIdx, &st); @@ -634,13 +634,13 @@ public: args.fFPCoordTransformHandler); // set up varyings - GrGLSLVertToFrag uv(kFloat2_GrSLType); - GrGLSLVertToFrag texIdx(kHalf_GrSLType); - GrGLSLVertToFrag st(kFloat2_GrSLType); + GrGLSLVarying uv(kFloat2_GrSLType); + GrGLSLVarying texIdx(kHalf_GrSLType); + GrGLSLVarying st(kFloat2_GrSLType); append_index_uv_varyings(args, dfTexEffect.inTextureCoords()->fName, atlasSizeInvName, &uv, &texIdx, &st); - GrGLSLVertToFrag delta(kFloat_GrSLType); + GrGLSLVarying delta(kFloat_GrSLType); varyingHandler->addVarying("Delta", &delta); if (dfTexEffect.getFlags() & kBGR_DistanceFieldEffectFlag) { vertBuilder->codeAppendf("%s = -%s.x/3.0;", delta.vsOut(), atlasSizeInvName); |