diff options
author | Brian Salomon <bsalomon@google.com> | 2018-01-08 09:47:57 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-08 15:14:39 +0000 |
commit | 7c2192b33635d3e72bb455aeddeac71267ee63df (patch) | |
tree | 9004a4cddd969bed2992b5d5a4cc7150381b426d /src/gpu | |
parent | 549be4aa184d445ef66b1934582ca6f07e83b31e (diff) |
Make SkMatrixPriv stride mapping functions take separate src and dst strides
Change-Id: Ib7600a7611e3ca78f6a8ca091fa383ceddb751cf
Reviewed-on: https://skia-review.googlesource.com/91402
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/ops/GrAAFillRectOp.cpp | 3 | ||||
-rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp index b1e89af7a8..d32b858037 100644 --- a/src/gpu/ops/GrAAFillRectOp.cpp +++ b/src/gpu/ops/GrAAFillRectOp.cpp @@ -120,7 +120,8 @@ static void generate_aa_fill_rect_geometry(intptr_t verts, SkMatrix localCoordMatrix; localCoordMatrix.setConcat(*localMatrix, invViewMatrix); SkPoint* fan0Loc = reinterpret_cast<SkPoint*>(verts + sizeof(SkPoint) + sizeof(GrColor)); - SkMatrixPriv::MapPointsWithStride(localCoordMatrix, fan0Loc, fan0Pos, vertexStride, 8); + SkMatrixPriv::MapPointsWithStride(localCoordMatrix, fan0Loc, vertexStride, fan0Pos, + vertexStride, 8); } // Make verts point to vertex color and then set all the color and coverage vertex attrs diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index e33b67b411..b5f4d45152 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -282,8 +282,9 @@ void GrAtlasTextOp::onPrepareDraws(Target* target) { // arbitrary transformations would be complicated and accumulate error. if (args.fViewMatrix.hasPerspective()) { auto* pos = reinterpret_cast<SkPoint3*>(currVertex); - SkMatrixPriv::MapHomogeneousPointsWithStride(args.fViewMatrix, - pos, pos, vertexStride, result.fGlyphsRegenerated * kVerticesPerGlyph); + SkMatrixPriv::MapHomogeneousPointsWithStride( + args.fViewMatrix, pos, vertexStride, pos, vertexStride, + result.fGlyphsRegenerated * kVerticesPerGlyph); } else { auto* pos = reinterpret_cast<SkPoint*>(currVertex); SkMatrixPriv::MapPointsWithStride( |