diff options
| author |  Mike Klein <mtklein@google.com> | 2017-09-08 22:18:58 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-08 22:19:08 +0000 |
| commit | acc8d2e11a7e076cce3a4d0be2f062a2c1f23b54 (patch) | |
| tree | b41b00e551ff1c8f2e7906c7c74e14902a062985 /src/gpu/ops/GrSmallPathRenderer.cpp | |
| parent | e1e47b70e0c55265815c6235d14b493e8e75fdf7 (diff) | |
Revert "Revert "Revert "Add multitexture support to text and path shaders"""
This reverts commit 6c251d24cf90a5c4c091bb7b7373e72705f716d2.
Reason for revert: crashes Fuchsia.
Original change's description:
> Revert "Revert "Add multitexture support to text and path shaders""
>
> This does not add additional textures to the atlases, just adds the
> ability to access those textures in the shaders.
>
> Bug: skia:3550
> Change-Id: I552e2c2e4713a5ea68801fdb8e3bab3867e77988
> Reviewed-on: https://skia-review.googlesource.com/44261
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=jvanverth@google.com,robertphillips@google.com
Change-Id: I25cc5f11a1fa76ca7b2cf24920ae3a2a15aac723
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:3550
Reviewed-on: https://skia-review.googlesource.com/44540
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/ops/GrSmallPathRenderer.cpp')
| -rw-r--r-- | src/gpu/ops/GrSmallPathRenderer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp index ec63e9ec7d..1b0648615d 100644 --- a/src/gpu/ops/GrSmallPathRenderer.cpp +++ b/src/gpu/ops/GrSmallPathRenderer.cpp @@ -485,12 +485,10 @@ private: shapeData->fBounds.fRight /= scale; shapeData->fBounds.fBottom /= scale; - shapeData->fTextureCoords.set((atlasLocation.fX+SK_DistanceFieldPad) << 1, - (atlasLocation.fY+SK_DistanceFieldPad) << 1, - (atlasLocation.fX+SK_DistanceFieldPad+ - devPathBounds.width()) << 1, - (atlasLocation.fY+SK_DistanceFieldPad+ - devPathBounds.height()) << 1); + shapeData->fTextureCoords.set(atlasLocation.fX+SK_DistanceFieldPad, + atlasLocation.fY+SK_DistanceFieldPad, + atlasLocation.fX+SK_DistanceFieldPad+devPathBounds.width(), + atlasLocation.fY+SK_DistanceFieldPad+devPathBounds.height()); fShapeCache->add(shapeData); fShapeList->addToTail(shapeData); @@ -578,9 +576,8 @@ private: shapeData->fBounds = SkRect::Make(devPathBounds); shapeData->fBounds.offset(-translateX, -translateY); - shapeData->fTextureCoords.set(atlasLocation.fX << 1, atlasLocation.fY << 1, - (atlasLocation.fX+width) << 1, - (atlasLocation.fY+height) << 1); + shapeData->fTextureCoords.set(atlasLocation.fX, atlasLocation.fY, + atlasLocation.fX+width, atlasLocation.fY+height); fShapeCache->add(shapeData); fShapeList->addToTail(shapeData); |