diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/ops/GrAAFillRectOp.cpp | 2 | ||||
-rw-r--r-- | src/gpu/ops/GrAAHairLinePathRenderer.cpp | 9 | ||||
-rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 5 | ||||
-rw-r--r-- | src/gpu/ops/GrDashOp.cpp | 3 | ||||
-rw-r--r-- | src/gpu/ops/GrLatticeOp.cpp | 5 |
5 files changed, 14 insertions, 10 deletions
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp index 5f352ac12b..b1e89af7a8 100644 --- a/src/gpu/ops/GrAAFillRectOp.cpp +++ b/src/gpu/ops/GrAAFillRectOp.cpp @@ -88,7 +88,7 @@ static void generate_aa_fill_rect_geometry(intptr_t verts, // create the rotated rect SkPointPriv::SetRectFan(fan0Pos, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, vertexStride); - viewMatrix.mapPointsWithStride(fan0Pos, vertexStride, 4); + SkMatrixPriv::MapPointsWithStride(viewMatrix, fan0Pos, vertexStride, 4); // Now create the inset points and then outset the original // rotated points diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp index 2dcee7a4c5..1502b80a50 100644 --- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp @@ -18,6 +18,7 @@ #include "GrResourceProvider.h" #include "GrSimpleMeshDrawOpHelper.h" #include "SkGeometry.h" +#include "SkMatrixPriv.h" #include "SkPoint3.h" #include "SkPointPriv.h" #include "SkStroke.h" @@ -581,7 +582,8 @@ static void bloat_quad(const SkPoint qpts[3], const SkMatrix* toDevice, intersect_lines(a0.fPos, abN, c0.fPos, cbN, &b0.fPos); if (toSrc) { - toSrc->mapPointsWithStride(&verts[0].fPos, sizeof(BezierVertex), kQuadNumVertices); + SkMatrixPriv::MapPointsWithStride(*toSrc, &verts[0].fPos, sizeof(BezierVertex), + kQuadNumVertices); } } @@ -683,9 +685,8 @@ static void add_line(const SkPoint p[2], (*vert)[5].fCoverage = 0; if (toSrc) { - toSrc->mapPointsWithStride(&(*vert)->fPos, - sizeof(LineVertex), - kLineSegNumVertices); + SkMatrixPriv::MapPointsWithStride(*toSrc, &(*vert)->fPos, sizeof(LineVertex), + kLineSegNumVertices); } } else { // just make it degenerate and likely offscreen diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index 8285d60ee3..e33b67b411 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -286,8 +286,9 @@ void GrAtlasTextOp::onPrepareDraws(Target* target) { pos, pos, vertexStride, result.fGlyphsRegenerated * kVerticesPerGlyph); } else { auto* pos = reinterpret_cast<SkPoint*>(currVertex); - args.fViewMatrix.mapPointsWithStride( - pos, vertexStride, result.fGlyphsRegenerated * kVerticesPerGlyph); + SkMatrixPriv::MapPointsWithStride( + args.fViewMatrix, pos, vertexStride, + result.fGlyphsRegenerated * kVerticesPerGlyph); } } flushInfo.fGlyphsToFlush += result.fGlyphsRegenerated; diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp index 583f7b2caf..9728aa98b5 100644 --- a/src/gpu/ops/GrDashOp.cpp +++ b/src/gpu/ops/GrDashOp.cpp @@ -17,6 +17,7 @@ #include "GrProcessor.h" #include "GrStyle.h" #include "SkGr.h" +#include "SkMatrixPriv.h" #include "SkPointPriv.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLGeometryProcessor.h" @@ -181,7 +182,7 @@ void setup_dashed_rect_common(const SkRect& rect, const SkMatrix& matrix, T* ver vertices[idx + 2].fPos = SkPoint::Make(rect.fRight, rect.fTop); vertices[idx + 3].fPos = SkPoint::Make(rect.fRight, rect.fBottom); - matrix.mapPointsWithStride(&vertices[idx].fPos, sizeof(T), 4); + SkMatrixPriv::MapPointsWithStride(matrix, &vertices[idx].fPos, sizeof(T), 4); } static void setup_dashed_rect(const SkRect& rect, void* vertices, int idx, diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp index 7438eb2c0a..45081a02fd 100644 --- a/src/gpu/ops/GrLatticeOp.cpp +++ b/src/gpu/ops/GrLatticeOp.cpp @@ -14,6 +14,7 @@ #include "GrSimpleMeshDrawOpHelper.h" #include "SkBitmap.h" #include "SkLatticeIter.h" +#include "SkMatrixPriv.h" #include "SkPointPriv.h" #include "SkRect.h" @@ -152,8 +153,8 @@ private: // If we didn't handle it above, apply the matrix here. if (!isScaleTranslate) { SkPoint* positions = reinterpret_cast<SkPoint*>(patchVerts); - patch.fViewMatrix.mapPointsWithStride( - positions, vertexStride, kVertsPerRect * patch.fIter->numRectsToDraw()); + SkMatrixPriv::MapPointsWithStride(patch.fViewMatrix, positions, vertexStride, + kVertsPerRect * patch.fIter->numRectsToDraw()); } } helper.recordDraw(target, gp.get(), fHelper.makePipeline(target)); |