diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2016-02-22 11:10:33 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-22 11:10:33 -0800 |
| commit | 01e583807618038a578a3b07cfad3101d24115c7 (patch) | |
| tree | 6f9e7fb3787bdfc7df448607eab10c56699e8989 /src/gpu/batches | |
| parent | f47b9a3b88a037a481eb70f01a4cf9f5be34dc28 (diff) | |
Simplify calculations in AADistanceFieldPathBatch::writePathVertices.
No API changes.
BUG=skia:4632
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1715063002
TBR=reed
Review URL: https://codereview.chromium.org/1715063002
Diffstat (limited to 'src/gpu/batches')
| -rw-r--r-- | src/gpu/batches/GrAADistanceFieldPathRenderer.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp index d48649cd27..8525eb2fde 100644 --- a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp @@ -461,11 +461,6 @@ private: width *= invScale; height *= invScale; - SkFixed tx = SkIntToFixed(pathData->fAtlasLocation.fX); - SkFixed ty = SkIntToFixed(pathData->fAtlasLocation.fY); - SkFixed tw = SkScalarToFixed(pathData->fBounds.width()); - SkFixed th = SkScalarToFixed(pathData->fBounds.height()); - SkPoint* positions = reinterpret_cast<SkPoint*>(offset); // vertex positions @@ -479,12 +474,15 @@ private: *colorPtr = color; } + const SkScalar tx = SkIntToScalar(pathData->fAtlasLocation.fX); + const SkScalar ty = SkIntToScalar(pathData->fAtlasLocation.fY); + // vertex texture coords SkPoint* textureCoords = (SkPoint*)(offset + sizeof(SkPoint) + sizeof(GrColor)); - textureCoords->setRectFan(SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx)), - SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty)), - SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx + tw)), - SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty + th)), + textureCoords->setRectFan(tx / texture->width(), + ty / texture->height(), + (tx + pathData->fBounds.width()) / texture->width(), + (ty + pathData->fBounds.height()) / texture->height(), vertexStride); } |