aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects/GrBitmapTextGeoProc.cpp
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-12-08 13:34:21 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-08 20:57:28 +0000
commit27372888a5c7698f51069bd5b5beea3e85b66668 (patch)
tree2fb60b65f286fe7da33467918198ad731cef708d /src/gpu/effects/GrBitmapTextGeoProc.cpp
parentbe4ffab4e208ec47b4298621b9c9e8456f31717e (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/GrBitmapTextGeoProc.cpp')
-rw-r--r--src/gpu/effects/GrBitmapTextGeoProc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index df71f70a1c..ae1340badc 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -37,8 +37,8 @@ public:
"AtlasSizeInv",
&atlasSizeInvName);
- GrGLSLVertToFrag uv(kFloat2_GrSLType);
- GrGLSLVertToFrag texIdx(kHalf_GrSLType);
+ GrGLSLVarying uv(kFloat2_GrSLType);
+ GrGLSLVarying texIdx(kHalf_GrSLType);
append_index_uv_varyings(args, btgp.inTextureCoords()->fName, atlasSizeInvName,
&uv, &texIdx, nullptr);