aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrAAHairLinePathRenderer.cpp
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-02-19 10:25:21 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-19 10:25:21 -0800
commit6364807151ddf51c4197603aa185b3336f325357 (patch)
tree92394f730a2a2515b06b2d7c76729e14170df141 /src/gpu/GrAAHairLinePathRenderer.cpp
parent02a44a488605112aa6683c9d919e13b188112ce1 (diff)
gm to test hairlines which fill RenderTarget
Diffstat (limited to 'src/gpu/GrAAHairLinePathRenderer.cpp')
-rw-r--r--src/gpu/GrAAHairLinePathRenderer.cpp28
1 files changed, 10 insertions, 18 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index fe89b887bd..c1d1291469 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -184,7 +184,7 @@ int chop_conic(const SkPoint src[3], SkConic dst[4], const SkScalar weight) {
// returns 0 if quad/conic is degen or close to it
// in this case approx the path with lines
// otherwise returns 1
-int is_degen_quad_or_conic(const SkPoint p[3]) {
+int is_degen_quad_or_conic(const SkPoint p[3], SkScalar* dsqd) {
static const SkScalar gDegenerateToLineTol = SK_Scalar1;
static const SkScalar gDegenerateToLineTolSqd =
SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol);
@@ -194,8 +194,8 @@ int is_degen_quad_or_conic(const SkPoint p[3]) {
return 1;
}
- SkScalar dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
- if (dsqd < gDegenerateToLineTolSqd) {
+ *dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
+ if (*dsqd < gDegenerateToLineTolSqd) {
return 1;
}
@@ -205,24 +205,16 @@ int is_degen_quad_or_conic(const SkPoint p[3]) {
return 0;
}
+int is_degen_quad_or_conic(const SkPoint p[3]) {
+ SkScalar dsqd;
+ return is_degen_quad_or_conic(p, &dsqd);
+}
+
// we subdivide the quads to avoid huge overfill
// if it returns -1 then should be drawn as lines
int num_quad_subdivs(const SkPoint p[3]) {
- static const SkScalar gDegenerateToLineTol = SK_Scalar1;
- static const SkScalar gDegenerateToLineTolSqd =
- SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol);
-
- if (p[0].distanceToSqd(p[1]) < gDegenerateToLineTolSqd ||
- p[1].distanceToSqd(p[2]) < gDegenerateToLineTolSqd) {
- return -1;
- }
-
- SkScalar dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
- if (dsqd < gDegenerateToLineTolSqd) {
- return -1;
- }
-
- if (p[2].distanceToLineBetweenSqd(p[1], p[0]) < gDegenerateToLineTolSqd) {
+ SkScalar dsqd;
+ if (is_degen_quad_or_conic(p, &dsqd)) {
return -1;
}