diff options
| author |  rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-23 18:09:54 +0000 |
|---|---|---|
| committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-23 18:09:54 +0000 |
| commit | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch) | |
| tree | d8b4815d15946c32ee9d254e932411e93be942bb /src/gpu/GrAAHairLinePathRenderer.cpp | |
| parent | 2abed834789bb64c7da740df4c47efc142b7311a (diff) | |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrAAHairLinePathRenderer.cpp')
| -rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 43e87d61e6..94b607ce12 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -139,7 +139,7 @@ int get_float_exp(float x) { // 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 = + static const SkScalar gDegenerateToLineTolSqd = SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol); if (p[0].distanceToSqd(p[1]) < gDegenerateToLineTolSqd || @@ -177,7 +177,7 @@ int num_quad_subdivs(const SkPoint p[3]) { return log; #else SkScalar log = SkScalarLog( - SkScalarDiv(dsqd, + SkScalarDiv(dsqd, SkScalarMul(gSubdivTol, gSubdivTol))); static const SkScalar conv = SkScalarInvert(SkScalarLog(2)); log = SkScalarMul(log, conv); @@ -269,7 +269,7 @@ int generate_lines_and_quads(const SkPath& path, // We convert cubics to quadratics (for now). // In perspective have to do conversion in src space. if (persp) { - SkScalar tolScale = + SkScalar tolScale = GrPathUtils::scaleToleranceToSrc(SK_Scalar1, m, path.getBounds()); GrPathUtils::convertCubicToQuads(pts, tolScale, false, kDummyDir, &q); @@ -351,7 +351,7 @@ void intersect_lines(const SkPoint& ptA, const SkVector& normA, result->fX = SkScalarMul(normA.fY, lineBW) - SkScalarMul(lineAW, normB.fY); result->fX = SkScalarMul(result->fX, wInv); - + result->fY = SkScalarMul(lineAW, normB.fX) - SkScalarMul(normA.fX, lineBW); result->fY = SkScalarMul(result->fY, wInv); } @@ -512,7 +512,7 @@ bool GrAAHairLinePathRenderer::createGeom( int rtHeight = drawState.getRenderTarget()->height(); GrIRect devClipBounds; - target->getClip()->getConservativeBounds(drawState.getRenderTarget(), + target->getClip()->getConservativeBounds(drawState.getRenderTarget(), &devClipBounds); GrVertexLayout layout = GrDrawTarget::kEdge_VertexLayoutBit; @@ -611,7 +611,7 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path, } drawState->viewMatrix()->reset(); } - + // TODO: See whether rendering lines as degenerate quads improves perf // when we have a mix |