diff options
| author | Jim Van Verth <jvanverth@google.com> | 2018-11-15 16:26:50 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-11-16 16:35:04 +0000 |
| commit | 3a8f345cf5689c6e1f22e852acfde4b8b1e5ba42 (patch) | |
| tree | 983c5190ef681b064face6c43a3bf5cd65ef3983 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
| parent | 68f40d3b0ee0d45b771ea07336d0c733363296fa (diff) | |
| download | platform_external_skqp-3a8f345cf5689c6e1f22e852acfde4b8b1e5ba42.tar.gz platform_external_skqp-3a8f345cf5689c6e1f22e852acfde4b8b1e5ba42.tar.bz2 platform_external_skqp-3a8f345cf5689c6e1f22e852acfde4b8b1e5ba42.zip | |
Remove use of integers for atlas indexing
Bug: skia:
Change-Id: I7c29e90de6531a35c415f0338e23c176a7293040
Reviewed-on: https://skia-review.googlesource.com/c/171233
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index c59ae4aa60..2656fb8859 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -40,8 +40,7 @@ public: &atlasSizeInvName); GrGLSLVarying uv(kFloat2_GrSLType); - GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType; - GrGLSLVarying texIdx(texIdxType); + GrGLSLVarying texIdx(kFloat_GrSLType); append_index_uv_varyings(args, btgp.inTextureCoords().name(), atlasSizeInvName, &uv, &texIdx, nullptr); @@ -144,8 +143,7 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(const GrShaderCaps& caps, fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType}; } - fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType, - caps.integerSupport() ? kUShort2_GrSLType : kFloat2_GrSLType}; + fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType, kFloat2_GrSLType}; this->setVertexAttributes(&fInPosition, 3); if (numActiveProxies) { |