From 7c2192b33635d3e72bb455aeddeac71267ee63df Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 8 Jan 2018 09:47:57 -0500 Subject: 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 Reviewed-by: Robert Phillips --- src/gpu/ops/GrAAFillRectOp.cpp | 3 ++- src/gpu/ops/GrAtlasTextOp.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/gpu') 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(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(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(currVertex); SkMatrixPriv::MapPointsWithStride( -- cgit v1.2.3