diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-05-18 12:52:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-18 18:11:14 +0000 |
| commit | ec42e15c4d087431535443952c41696b69573b13 (patch) | |
| tree | 3406a9c8a367bb8b3b8abec2785a537a27ca3ad8 /src | |
| parent | ec79c39a770205910f0abd762de7e19a96c986ca (diff) | |
Add convenience overload of SkPointPriv::SetRectTriStrip that takes SkRect
Change-Id: Idf5bfafaf19c20f074f12d706b8b8984c5935e6d
Reviewed-on: https://skia-review.googlesource.com/129185
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPointPriv.h | 5 | ||||
| -rw-r--r-- | src/gpu/ops/GrLatticeOp.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/ops/GrRegionOp.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/ops/GrSmallPathRenderer.cpp | 7 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/core/SkPointPriv.h b/src/core/SkPointPriv.h index 6c8fd480a7..40c7e1043c 100644 --- a/src/core/SkPointPriv.h +++ b/src/core/SkPointPriv.h @@ -9,6 +9,7 @@ #define SkPointPriv_DEFINED #include "SkPoint.h" +#include "SkRect.h" class SkPointPriv { public: @@ -127,7 +128,9 @@ public: ((SkPoint*)((intptr_t)v + 2 * stride))->set(r, t); ((SkPoint*)((intptr_t)v + 3 * stride))->set(r, b); } - + static void SetRectTriStrip(SkPoint v[], const SkRect& rect, size_t stride) { + SetRectTriStrip(v, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, stride); + } }; #endif diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp index f1359c62fd..0d600ed305 100644 --- a/src/gpu/ops/GrLatticeOp.cpp +++ b/src/gpu/ops/GrLatticeOp.cpp @@ -239,8 +239,7 @@ private: static const Sk4f kFlipMuls(1.f, -1.f, 1.f, -1.f); while (patch.fIter->next(&srcR, &dstR)) { auto vertices = reinterpret_cast<LatticeGP::Vertex*>(verts); - SkPointPriv::SetRectTriStrip(&vertices->fPosition, dstR.fLeft, dstR.fTop, - dstR.fRight, dstR.fBottom, vertexStride); + SkPointPriv::SetRectTriStrip(&vertices->fPosition, dstR, vertexStride); Sk4f coords(SkIntToScalar(srcR.fLeft), SkIntToScalar(srcR.fTop), SkIntToScalar(srcR.fRight), SkIntToScalar(srcR.fBottom)); Sk4f domain = coords + kDomainOffsets; diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp index c8d82daa40..5f63f09988 100644 --- a/src/gpu/ops/GrRegionOp.cpp +++ b/src/gpu/ops/GrRegionOp.cpp @@ -35,8 +35,7 @@ static void tesselate_region(intptr_t vertices, while (!iter.done()) { SkRect rect = SkRect::Make(iter.rect()); SkPoint* position = (SkPoint*)verts; - SkPointPriv::SetRectTriStrip(position, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, - vertexStride); + SkPointPriv::SetRectTriStrip(position, rect, vertexStride); static const int kColorOffset = sizeof(SkPoint); GrColor* vertColor = reinterpret_cast<GrColor*>(verts + kColorOffset); diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp index 3e21348918..48de75aab4 100644 --- a/src/gpu/ops/GrSmallPathRenderer.cpp +++ b/src/gpu/ops/GrSmallPathRenderer.cpp @@ -758,12 +758,7 @@ private: position = (SkPoint*)positionOffset; *position = quad.point(3); } else { - SkPointPriv::SetRectTriStrip(positions, - translatedBounds.left(), - translatedBounds.top(), - translatedBounds.right(), - translatedBounds.bottom(), - vertexStride); + SkPointPriv::SetRectTriStrip(positions, translatedBounds, vertexStride); } // colors |