From de71572f650005e36d4fc2fe95fb5677a25ae4f6 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Mon, 18 Dec 2017 21:13:41 +0000 Subject: Revert "move homogenous with stride to matrixpriv" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2d53d984251a753b9d0fb3adad3be09243cf5c14. Reason for revert: revert needed to revert previous cl Original change's description: > move homogenous with stride to matrixpriv > > this appears to be needed only by Skia > internally, so move it out of the public > includes. > > R=​bsalomon@google.com > Bug: skia:6898 > Change-Id: Iebdda8f2c9a8fd953dd44bac9b74158d7491c21a > Reviewed-on: https://skia-review.googlesource.com/85961 > Commit-Queue: Cary Clark > Commit-Queue: Cary Clark > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,caryclark@google.com,caryclark@skia.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia:6898 Change-Id: Icbd15ee0b524c770a324c490ab0cadf6a045e0d5 Reviewed-on: https://skia-review.googlesource.com/86800 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- src/core/SkMatrix.cpp | 20 +++++++++----------- src/core/SkMatrixPriv.h | 3 --- src/gpu/ops/GrAtlasTextOp.cpp | 3 +-- 3 files changed, 10 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index 23b465277f..4851aeacf6 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -6,7 +6,7 @@ */ #include "SkFloatBits.h" -#include "SkMatrixPriv.h" +#include "SkMatrix.h" #include "SkNx.h" #include "SkPaint.h" #include "SkPoint3.h" @@ -1037,15 +1037,14 @@ const SkMatrix::MapPtsProc SkMatrix::gMapPtsProcs[] = { /////////////////////////////////////////////////////////////////////////////// -void SkMatrixPriv::MapHomogeneousPointsWithStride(const SkMatrix& mx, SkPoint3 dst[], - const SkPoint3 src[], size_t stride, - int count) { +void SkMatrix::mapHomogeneousPointsWithStride(SkPoint3 dst[], const SkPoint3 src[], size_t stride, + int count) const { SkASSERT((dst && src && count > 0) || 0 == count); // no partial overlap SkASSERT(src == dst || &dst[count] <= &src[0] || &src[count] <= &dst[0]); if (count > 0) { - if (mx.isIdentity()) { + if (this->isIdentity()) { if (src != dst) { if (stride == sizeof(SkPoint3)) { memcpy(dst, src, count * sizeof(SkPoint3)); @@ -1065,11 +1064,10 @@ void SkMatrixPriv::MapHomogeneousPointsWithStride(const SkMatrix& mx, SkPoint3 d SkScalar sy = src->fY; SkScalar sw = src->fZ; src = reinterpret_cast(reinterpret_cast(src) + stride); - const SkScalar* mat = mx.fMat; - typedef SkMatrix M; - SkScalar x = sdot(sx, mat[M::kMScaleX], sy, mat[M::kMSkewX], sw, mat[M::kMTransX]); - SkScalar y = sdot(sx, mat[M::kMSkewY], sy, mat[M::kMScaleY], sw, mat[M::kMTransY]); - SkScalar w = sdot(sx, mat[M::kMPersp0], sy, mat[M::kMPersp1], sw, mat[M::kMPersp2]); + + SkScalar x = sdot(sx, fMat[kMScaleX], sy, fMat[kMSkewX], sw, fMat[kMTransX]); + SkScalar y = sdot(sx, fMat[kMSkewY], sy, fMat[kMScaleY], sw, fMat[kMTransY]); + SkScalar w = sdot(sx, fMat[kMPersp0], sy, fMat[kMPersp1], sw, fMat[kMPersp2]); dst->set(x, y, w); dst = reinterpret_cast(reinterpret_cast(dst) + stride); @@ -1078,7 +1076,7 @@ void SkMatrixPriv::MapHomogeneousPointsWithStride(const SkMatrix& mx, SkPoint3 d } void SkMatrix::mapHomogeneousPoints(SkPoint3 dst[], const SkPoint3 src[], int count) const { - SkMatrixPriv::MapHomogeneousPointsWithStride(*this, dst, src, sizeof(SkPoint3), count); + this->mapHomogeneousPointsWithStride(dst, src, sizeof(SkPoint3), count); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkMatrixPriv.h b/src/core/SkMatrixPriv.h index 166981ac5b..8b437c636f 100644 --- a/src/core/SkMatrixPriv.h +++ b/src/core/SkMatrixPriv.h @@ -92,9 +92,6 @@ public: } } - static void MapHomogeneousPointsWithStride(const SkMatrix& mx, SkPoint3 dst[], - const SkPoint3 src[], size_t stride, int count); - static void SetMappedRectTriStrip(const SkMatrix& mx, const SkRect& rect, SkPoint quad[4]) { SkMatrix::TypeMask tm = mx.getType(); SkScalar l = rect.fLeft; diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index c3698b992f..d71cd92fde 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -11,7 +11,6 @@ #include "GrResourceProvider.h" #include "SkGlyphCache.h" #include "SkMathPriv.h" -#include "SkMatrixPriv.h" #include "SkPoint3.h" #include "effects/GrBitmapTextGeoProc.h" #include "effects/GrDistanceFieldGeoProc.h" @@ -282,7 +281,7 @@ 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, + args.fViewMatrix.mapHomogeneousPointsWithStride( pos, pos, vertexStride, result.fGlyphsRegenerated * kVerticesPerGlyph); } else { auto* pos = reinterpret_cast(currVertex); -- cgit v1.2.3