From 29e0d3f267a03546f236023347cdb4595ece2fd1 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Wed, 5 Aug 2015 13:18:03 -0700 Subject: Implement caching of stroked paths in the tessellated path renderer. This requires adding the stroke info to the cache key, and doing the stroking and dashing before rendering as triangles. BUG=skia:3755 Review URL: https://codereview.chromium.org/1275553002 --- src/gpu/GrTestUtils.cpp | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'src/gpu/GrTestUtils.cpp') diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp index b690d7e3cd..9e1dbce691 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/GrTestUtils.cpp @@ -5,8 +5,10 @@ * found in the LICENSE file. */ +#include "GrStrokeInfo.h" #include "GrTestUtils.h" #include "SkMatrix.h" +#include "SkPathEffect.h" #include "SkPath.h" #include "SkRRect.h" @@ -216,21 +218,44 @@ const SkPath& TestPathConvex(SkRandom* random) { return gPath[random->nextULessThan(static_cast(SK_ARRAY_COUNT(gPath)))]; } -SkStrokeRec TestStrokeRec(SkRandom* random) { - SkStrokeRec::InitStyle style = - SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_InitStyle + 1)); - SkStrokeRec rec(style); +static void randomize_stroke_rec(SkStrokeRec* rec, SkRandom* random) { bool strokeAndFill = random->nextBool(); SkScalar strokeWidth = random->nextBool() ? 0.f : 1.f; - rec.setStrokeStyle(strokeWidth, strokeAndFill); + rec->setStrokeStyle(strokeWidth, strokeAndFill); SkPaint::Cap cap = SkPaint::Cap(random->nextULessThan(SkPaint::kCapCount)); SkPaint::Join join = SkPaint::Join(random->nextULessThan(SkPaint::kJoinCount)); SkScalar miterLimit = random->nextRangeScalar(1.f, 5.f); - rec.setStrokeParams(cap, join, miterLimit); + rec->setStrokeParams(cap, join, miterLimit); +} + +SkStrokeRec TestStrokeRec(SkRandom* random) { + SkStrokeRec::InitStyle style = + SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_InitStyle + 1)); + SkStrokeRec rec(style); + randomize_stroke_rec(&rec, random); return rec; } +GrStrokeInfo TestStrokeInfo(SkRandom* random) { + SkStrokeRec::InitStyle style = + SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_InitStyle + 1)); + GrStrokeInfo strokeInfo(style); + randomize_stroke_rec(&strokeInfo, random); + SkPathEffect::DashInfo dashInfo; + dashInfo.fCount = random->nextRangeU(1, 100); + dashInfo.fIntervals = SkNEW_ARRAY(SkScalar, dashInfo.fCount); + SkScalar sum = 0; + for (int i = 0; i < dashInfo.fCount; i++) { + dashInfo.fIntervals[i] = random->nextRangeScalar(SkDoubleToScalar(0.01), + SkDoubleToScalar(10.0)); + sum += dashInfo.fIntervals[i]; + } + dashInfo.fPhase = random->nextRangeScalar(0, sum); + strokeInfo.setDashInfo(dashInfo); + return strokeInfo; +} + }; #endif -- cgit v1.2.3