diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-09-08 14:43:47 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-08 14:43:54 +0000 |
| commit | e7492fe49c61915b70bde648b75f9b6fc60b4bef (patch) | |
| tree | 0b8502ef3047f553e2427ee71f0e8c1508b2a6f6 /src/gpu/ops | |
| parent | 336ce7babc1c6c9184a69e39fd4ee877ae4a067b (diff) | |
Revert "Add multitexture support to text and path shaders"
This reverts commit 7f754260f7fc2ae0326a072dd2f0429e584f8ca0.
Reason for revert: Bot failures.
Original change's description:
> 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: I636b329a6f748b6753f5f92a70066fb412623df2
> Reviewed-on: https://skia-review.googlesource.com/43000
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I5c28ea48ed9bdde2cd936ef4f96fc720d5e4b4a5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:3550
Reviewed-on: https://skia-review.googlesource.com/44162
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/ops')
| -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); |